Refactor GitOps approach prompt flow in guided init

src/_nebari/initialize.py

@@ -23,7 +23,7 @@
 from _nebari.stages.terraform_state import TerraformStateEnum
 from _nebari.utils import get_latest_kubernetes_version, random_secure_string
 from _nebari.version import __version__
-from nebari.schema import ProviderEnum, github_url_regex
+from nebari.schema import ProviderEnum, git_url_regex
 
 logger = logging.getLogger(__name__)
 
@@ -194,10 +194,10 @@ def render_config(
         print(str(e))
 
     if repository_auto_provision:
-        match = re.search(github_url_regex, repository)
+        match = re.search(git_url_regex, repository)
         if match:
             git_repository = github_auto_provision(
-                config_model, match.group(2), match.group(3)
+                config_model, match.group(5), match.group(6)
             )
             git_repository_initialize(git_repository)
         else:

src/_nebari/subcommands/init.py

@@ -88,7 +88,7 @@ class InitInputs(schema.Base):
     namespace: Optional[schema.namespace_pydantic] = "dev"
     auth_provider: AuthenticationEnum = AuthenticationEnum.password
     auth_auto_provision: bool = False
-    repository: Optional[schema.github_url_pydantic] = None
+    repository: Optional[schema.git_url_pydantic] = None
     repository_auto_provision: bool = False
     ci_provider: CiEnum = CiEnum.none
     terraform_state: TerraformStateEnum = TerraformStateEnum.remote
@@ -519,7 +519,7 @@ def init(
             None,
             help="Github repository URL to be initialized with --repository-auto-provision",
             callback=typer_validate_regex(
-                schema.github_url_regex,
+                schema.git_url_regex,
                 "Must be a fully qualified GitHub repository URL.",
             ),
         ),

src/nebari/schema.py

@@ -17,8 +17,8 @@
 email_regex = "^[^ @]+@[^ @]+\\.[^ @]+$"
 email_pydantic = pydantic.constr(regex=email_regex)
 
-github_url_regex = "^(https://)?github.com/([^/]+)/([^/]+)/?$"
-github_url_pydantic = pydantic.constr(regex=github_url_regex)
+git_url_regex = "^(https://)?(git)(hub|lab)(.com)/([^/]+)/([^/]+)/*$"
+git_url_pydantic = pydantic.constr(regex=git_url_regex)
 
 
 class Base(pydantic.BaseModel):

tests/tests_unit/test_cli_init_repository.py

@@ -174,21 +174,45 @@ def test_cli_init_error_repository_missing_env(monkeypatch: pytest.MonkeyPatch):
         assert tmp_file.exists() is False
 
 
-def test_cli_init_error_invalid_repo(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.setenv("GITHUB_USERNAME", TEST_GITHUB_USERNAME)
-    monkeypatch.setenv("GITHUB_TOKEN", TEST_GITHUB_TOKEN)
+@pytest.mark.parametrize(
+    "url",
+    [
+        "https://github.com/user/repository",
+        "https://gitlab.com/user/repository/",
+    ],
+)
+def test_cli_init_valid_repo(url):
+    app = create_cli()
+
+    args = ["init", "local", "--project-name", "test", "--repository", url]
+
+    with tempfile.TemporaryDirectory() as tmp:
+        tmp_file = Path(tmp).resolve() / "nebari-config.yaml"
+        assert tmp_file.exists() is False
 
+        result = runner.invoke(app, args + ["--output", tmp_file.resolve()])
+
+        assert 0 == result.exit_code
+        assert not result.exception
+        assert tmp_file.exists() is True
+
+
+@pytest.mark.parametrize(
+    "url",
+    [
+        "https://github.com",
+        "https://gitlab.com/user/",
+        "https://gitlab.com/user",
+        "http://github.com/user/",
+        "gitlab.com/user/",
+        "github.com",
+        "https://notgithub.com/user/repository",
+    ],
+)
+def test_cli_init_error_invalid_repo(url):
     app = create_cli()
 
-    args = [
-        "init",
-        "local",
-        "--project-name",
-        "test",
-        "--repository-auto-provision",
-        "--repository",
-        "https://notgithub.com",
-    ]
+    args = ["init", "local", "--project-name", "test", "--repository", url]
 
     with tempfile.TemporaryDirectory() as tmp:
         tmp_file = Path(tmp).resolve() / "nebari-config.yaml"