orchestra-cli 0.5.1__tar.gz → 0.5.2__tar.gz

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestra-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: Orchestra CLI. Perform operations with Orchestra locally.
 Author-email: Orchestra Technologies <support@getorchestra.io>
 Requires-Python: >=3.10

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/orchestra_cli/src/migrate_pipeline.py

@@ -364,7 +364,8 @@ def migrate_pipeline(
         typer.echo(red("Could not detect repository URL from git"))
         raise typer.Exit(code=1)
 
-    storage_provider_value = detect_storage_provider(get_remote_url(repo_root))
+    remote_url = get_remote_url(repo_root)
+    storage_provider_value = detect_storage_provider(remote_url)
     if not storage_provider_value:
         typer.echo(red("Could not detect storage provider - no matching host"))
         raise typer.Exit(code=1)
@@ -437,6 +438,7 @@ def migrate_pipeline(
             repository_slug,
             default_branch,
             pushed_branch,
+            remote_url,
         )
         if compare_link:
             typer.echo(yellow(f"Open PR / compare link: {compare_link}"))

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/orchestra_cli/tests/test_import_pipeline.py

@@ -36,6 +36,8 @@ def mock_env(monkeypatch):
     [
         ("https://github.com/org/repo.git", "GITHUB", "org/repo"),
         ("git@github.com:org/repo.git", "GITHUB", "org/repo"),
+        ("https://acme.ghe.com/org/repo.git", "GITHUB", "org/repo"),
+        ("git@acme.ghe.com:org/repo.git", "GITHUB", "org/repo"),
         ("https://gitlab.com/org/repo.git", "GITLAB", "org/repo"),
         ("git@gitlab.com:org/repo.git", "GITLAB", "org/repo"),
         ("https://dev.azure.com/org/project/_git/repo", "AZURE_DEVOPS", "project/repo"),

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/orchestra_cli/tests/utils/test_git.py

@@ -114,3 +114,46 @@ def test_require_repo_root_walks_up_from_nonexistent_parent(monkeypatch, tmp_pat
     monkeypatch.setattr(subprocess, "run", make_git_subprocess_mock(mapping))
 
     assert git_module.require_repo_root(target_file, git_module.GitAction.MIGRATE) == tmp_path
+
+
+@pytest.mark.parametrize(
+    "remote_url, expected",
+    [
+        ("https://github.com/org/repo.git", "GITHUB"),
+        ("git@github.com:org/repo.git", "GITHUB"),
+        ("https://acme.ghe.com/org/repo.git", "GITHUB"),
+        ("https://user:token@acme.ghe.com/org/repo.git", "GITHUB"),
+        ("git@acme.ghe.com:org/repo.git", "GITHUB"),
+        ("ssh://git@acme.ghe.com/org/repo.git", "GITHUB"),
+        ("https://gitlab.com/org/repo.git", "GITLAB"),
+        ("https://git.example.com/org/repo.git", None),
+        ("https://example.com/ghe.com/repo.git", None),
+        ("https://[malformed/org/repo.git", None),
+        (None, None),
+    ],
+)
+def test_detect_storage_provider(remote_url: str | None, expected: str | None):
+    assert git_module.detect_storage_provider(remote_url) == expected
+
+
+@pytest.mark.parametrize(
+    "remote_url, expected",
+    [
+        (
+            "git@github.com:org/repo.git",
+            "https://github.com/org/repo/compare/main...feature?expand=1",
+        ),
+        (
+            "git@acme.ghe.com:org/repo.git",
+            "https://acme.ghe.com/org/repo/compare/main...feature?expand=1",
+        ),
+        (
+            "https://user:token@acme.ghe.com/org/repo.git",
+            "https://acme.ghe.com/org/repo/compare/main...feature?expand=1",
+        ),
+        (None, "https://github.com/org/repo/compare/main...feature?expand=1"),
+    ],
+)
+def test_build_compare_link_github(remote_url: str | None, expected: str):
+    link = git_module.build_compare_link("GITHUB", "org/repo", "main", "feature", remote_url)
+    assert link == expected

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/orchestra_cli/utils/git.py

@@ -4,11 +4,14 @@ import string
 import subprocess
 from enum import StrEnum
 from pathlib import Path
+from urllib.parse import urlsplit
 
 import typer
 
 from .styling import bold, red, yellow
 
+GHE_COM_HOST_SUFFIX = ".ghe.com"
+
 
 class GitAction(StrEnum):
     BUILD = "Build"
@@ -84,12 +87,30 @@ def detect_current_branch(repo_root: Path, allow_detached: bool = True) -> str |
     return out
 
 
+def _remote_host(remote_url: str) -> str | None:
+    """The host of a URL remote, or of the SSH shorthand ``[user@]host:path``."""
+    remote_url = remote_url.strip()
+    if "://" in remote_url:
+        try:
+            return urlsplit(remote_url).hostname
+        except ValueError:
+            return None
+    user_and_host, separator, _ = remote_url.partition(":")
+    return user_and_host.rpartition("@")[2].lower() if separator else None
+
+
+def _ghe_com_host(remote_url: str | None) -> str | None:
+    """The remote's host if it's on GitHub Enterprise Cloud with data residency."""
+    host = _remote_host(remote_url) if remote_url else None
+    return host if host and host.endswith(GHE_COM_HOST_SUFFIX) else None
+
+
 def detect_storage_provider(repository_url: str | None) -> str | None:
     if not repository_url:
         return None
 
     url = repository_url.lower()
-    if "github.com" in url:
+    if "github.com" in url or _ghe_com_host(repository_url):
         return "GITHUB"
     if "gitlab.com" in url:
         return "GITLAB"
@@ -103,10 +124,12 @@ def build_compare_link(
     repository_slug: str,
     default_branch: str,
     branch_name: str,
+    remote_url: str | None,
 ) -> str | None:
     provider = storage_provider.upper()
     if provider == "GITHUB":
-        return f"https://github.com/{repository_slug}/compare/{default_branch}...{branch_name}?expand=1"
+        host = _ghe_com_host(remote_url) or "github.com"
+        return f"https://{host}/{repository_slug}/compare/{default_branch}...{branch_name}?expand=1"
     if provider == "GITLAB":
         return f"https://gitlab.com/{repository_slug}/-/compare/{default_branch}...{branch_name}"
     return None

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/orchestra_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchestra-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: Orchestra CLI. Perform operations with Orchestra locally.
 Author-email: Orchestra Technologies <support@getorchestra.io>
 Requires-Python: >=3.10

{orchestra_cli-0.5.1 → orchestra_cli-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "orchestra-cli"
-version = "0.5.1"
+version = "0.5.2"
 description = "Orchestra CLI. Perform operations with Orchestra locally."
 readme = "README.md"
 authors = [