Merge branch 'develop' into pydantic2

.pre-commit-config.yaml

@@ -51,13 +51,13 @@ repos:
 
   # python
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.3.0
     hooks:
       - id: black
         args: ["--line-length=88", "--exclude=/src/_nebari/template/"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.3.5
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -73,7 +73,7 @@ repos:
 
   # terraform
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.86.0
+    rev: v1.88.4
     hooks:
       - id: terraform_fmt
         args:

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf

@@ -238,6 +238,28 @@ resource "kubernetes_manifest" "jupyterhub" {
               port = 80
             }
           ]
+          middlewares = [
+            {
+              name      = kubernetes_manifest.jupyterhub-proxy-add-slash.manifest.metadata.name
+              namespace = var.namespace
+            }
+          ]
+        },
+        {
+          kind  = "Rule"
+          match = "Host(`${var.external-url}`) && (PathPrefix(`/home`) || PathPrefix(`/token`) || PathPrefix(`/admin`))"
+          middlewares = [
+            {
+              name      = kubernetes_manifest.jupyterhub-middleware-addprefix.manifest.metadata.name
+              namespace = var.namespace
+            }
+          ]
+          services = [
+            {
+              name = "proxy-public"
+              port = 80
+            }
+          ]
         }
       ]
     }

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/middleware.tf

@@ -0,0 +1,33 @@
+resource "kubernetes_manifest" "jupyterhub-middleware-addprefix" {
+  manifest = {
+    apiVersion = "traefik.containo.us/v1alpha1"
+    kind       = "Middleware"
+    metadata = {
+      name      = "nebari-jupyterhub-add-prefix"
+      namespace = var.namespace
+    }
+    spec = {
+      addPrefix = {
+        prefix = "/hub"
+      }
+    }
+  }
+}
+
+resource "kubernetes_manifest" "jupyterhub-proxy-add-slash" {
+  manifest = {
+    apiVersion = "traefik.containo.us/v1alpha1"
+    kind       = "Middleware"
+    metadata = {
+      name      = "nebari-jupyterhub-proxy-add-slash"
+      namespace = var.namespace
+    }
+    spec = {
+      redirectRegex = {
+        regex       = "^https://${var.external-url}/user/([^/]+)/proxy/(\\d+)$"
+        replacement = "https://${var.external-url}/user/$${1}/proxy/$${2}/"
+        permanent   = true
+      }
+    }
+  }
+}

src/_nebari/subcommands/init.py

@@ -75,6 +75,15 @@
 
 LATEST = "latest"
 
+CLOUD_PROVIDER_FULL_NAME = {
+    "Local": ProviderEnum.local.name,
+    "Existing": ProviderEnum.existing.name,
+    "Digital Ocean": ProviderEnum.do.name,
+    "Amazon Web Services": ProviderEnum.aws.name,
+    "Google Cloud Platform": ProviderEnum.gcp.name,
+    "Microsoft Azure": ProviderEnum.azure.name,
+}
+
 
 class GitRepoEnum(str, enum.Enum):
     github = "github.com"
@@ -647,12 +656,14 @@ def guided_init_wizard(ctx: typer.Context, guided_init: str):
             )
         )
         # try:
-        inputs.cloud_provider = questionary.select(
+        cloud_provider: str = questionary.select(
             "Where would you like to deploy your Nebari cluster?",
-            choices=enum_to_list(ProviderEnum),
+            choices=CLOUD_PROVIDER_FULL_NAME.keys(),
             qmark=qmark,
         ).unsafe_ask()
 
+        inputs.cloud_provider = CLOUD_PROVIDER_FULL_NAME.get(cloud_provider)
+
         if not disable_checks:
             check_cloud_provider_creds(
                 cloud_provider=inputs.cloud_provider,

tests/tests_unit/test_render.py

@@ -1,7 +1,6 @@
 import os
 
 from _nebari.stages.bootstrap import CiEnum
-from nebari import schema
 from nebari.plugins import nebari_plugin_manager
 
 
@@ -22,18 +21,12 @@ def test_render_config(nebari_render):
         "03-kubernetes-initialize",
     }.issubset(os.listdir(output_directory / "stages"))
 
-    if config.provider == schema.ProviderEnum.do:
-        assert (output_directory / "stages" / "01-terraform-state/do").is_dir()
-        assert (output_directory / "stages" / "02-infrastructure/do").is_dir()
-    elif config.provider == schema.ProviderEnum.aws:
-        assert (output_directory / "stages" / "01-terraform-state/aws").is_dir()
-        assert (output_directory / "stages" / "02-infrastructure/aws").is_dir()
-    elif config.provider == schema.ProviderEnum.gcp:
-        assert (output_directory / "stages" / "01-terraform-state/gcp").is_dir()
-        assert (output_directory / "stages" / "02-infrastructure/gcp").is_dir()
-    elif config.provider == schema.ProviderEnum.azure:
-        assert (output_directory / "stages" / "01-terraform-state/azure").is_dir()
-        assert (output_directory / "stages" / "02-infrastructure/azure").is_dir()
+    assert (
+        output_directory / "stages" / f"01-terraform-state/{config.provider.value}"
+    ).is_dir()
+    assert (
+        output_directory / "stages" / f"02-infrastructure/{config.provider.value}"
+    ).is_dir()
 
     if config.ci_cd.type == CiEnum.github_actions:
         assert (output_directory / ".github/workflows/").is_dir()