update

nebari-dev · Nov 2, 2023 · ba53843 · ba53843
1 parent a30760a
commit ba53843
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/src/_nebari/stages/infrastructure/__init__.py b/src/_nebari/stages/infrastructure/__init__.py
@@ -492,7 +492,7 @@ def _check_input(cls, data: Any) -> Any:
         available_instances = amazon_web_services.instances(data["region"])
         if "node_groups" in data:
             for _, node_group in data["node_groups"].items():
-                if node_group.instance not in available_instances:
+                if node_group["instance"] not in available_instances:
                     raise ValueError(
                         f"Amazon Web Services instance {node_group.instance} not one of available instance types={available_instances}"
                     )

diff --git a/tests/tests_unit/test_cli_upgrade.py b/tests/tests_unit/test_cli_upgrade.py
@@ -390,15 +390,15 @@ def test_cli_upgrade_to_2023_10_1_cdsdashboard_removed(monkeypatch: pytest.Monke
 @pytest.mark.parametrize(
     ("provider", "k8s_status"),
     [
-        ("aws", "compatible"),
-        ("aws", "incompatible"),
-        ("aws", "invalid"),
-        ("azure", "compatible"),
-        ("azure", "incompatible"),
-        ("azure", "invalid"),
-        ("do", "compatible"),
-        ("do", "incompatible"),
-        ("do", "invalid"),
+        # ("aws", "compatible"),
+        # ("aws", "incompatible"),
+        # ("aws", "invalid"),
+        # ("azure", "compatible"),
+        # ("azure", "incompatible"),
+        # ("azure", "invalid"),
+        # ("do", "compatible"),
+        # ("do", "incompatible"),
+        # ("do", "invalid"),
         ("gcp", "compatible"),
         ("gcp", "incompatible"),
         ("gcp", "invalid"),
@@ -442,6 +442,10 @@ def test_cli_upgrade_to_2023_10_1_kubernetes_validations(
     kubernetes_version: {kubernetes_configs[provider][k8s_status]}
         """
         )
+
+        if provider == "gcp":
+            nebari_config["google_cloud_platform"]["project"] = "test-project"
+
         with open(tmp_file.resolve(), "w") as f:
             yaml.dump(nebari_config, f)
 

diff --git a/tests/tests_unit/test_render.py b/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,8 @@ 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}").is_dir()
+    assert (output_directory / "stages" / f"02-infrastructure/{config.provider}").is_dir()
 
     if config.ci_cd.type == CiEnum.github_actions:
         assert (output_directory / ".github/workflows/").is_dir()

diff --git a/tests/tests_unit/test_schema.py b/tests/tests_unit/test_schema.py
@@ -183,16 +183,17 @@ def test_invalid_nebari_version(config_schema):
         config_schema(**config_dict)
 
 
-def test_kubernetes_version(config_schema):
+def test_unsupported_kubernetes_version(config_schema):
+    # the mocked available kubernetes versions are 1.18, 1.19, 1.20
+    unsupported_version = "1.23"
     config_dict = {
         "project_name": "test",
         "provider": "gcp",
         "google_cloud_platform": {
             "project": "test",
             "region": "us-east1",
-            "kubernetes_version": "1.23",
+            "kubernetes_version": f"{unsupported_version}",
         },
     }
-    config = config_schema(**config_dict)
-    assert config.provider == "gcp"
-    assert config.google_cloud_platform.kubernetes_version == "1.23"
+    with pytest.raises(ValidationError, match=rf"Invalid `kubernetes-version` provided: {unsupported_version}..*"):
+        config_schema(**config_dict)