imbi-plugin-github 1.4.0__tar.gz → 2.8.0__tar.gz

{imbi_plugin_github-1.4.0 → imbi_plugin_github-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imbi-plugin-github
-Version: 1.4.0
+Version: 2.8.0
 Summary: GitHub identity plugin for Imbi (github.com / GHEC / GHES)
 Author-email: "Gavin M. Roy" <gavinr@aweber.com>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Requires-Dist: httpx>=0.27
-Requires-Dist: imbi-common>=2.5.5
+Requires-Dist: imbi-common==2.8.0
 Requires-Dist: pydantic>=2
 Description-Content-Type: text/markdown
 

{imbi_plugin_github-1.4.0 → imbi_plugin_github-2.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "imbi-plugin-github"
-version = "1.4.0"
+version = "2.8.0"
 description = "GitHub identity plugin for Imbi (github.com / GHEC / GHES)"
 readme = "README.md"
 requires-python = ">=3.14"
@@ -16,7 +16,7 @@ classifiers = [
 ]
 dependencies = [
   "httpx>=0.27",
-  "imbi-common>=2.5.5",
+  "imbi-common==2.8.0",
   "pydantic>=2",
 ]
 
@@ -35,7 +35,7 @@ github-lifecycle-es = "imbi_plugin_github.lifecycle:GitHubEnterpriseServerLifecy
 dev = [
   "basedpyright",
   "coverage[toml]",
-  "imbi-common[server,databases]",
+  "imbi-common[server,databases]==2.8.0",
   "pre-commit",
   "pytest",
   "pytest-asyncio",

{imbi_plugin_github-1.4.0 → imbi_plugin_github-2.8.0}/src/imbi_plugin_github/_repos.py

@@ -91,7 +91,11 @@ def derive_owner_repo_from_links(
 
 
 def resolve_owner_repo(
-    ctx: PluginContext, host: str, plugin_label: str
+    ctx: PluginContext,
+    host: str,
+    plugin_label: str,
+    *,
+    prefer_previous_slug: bool = False,
 ) -> tuple[str, str]:
     """Resolve the repo for a plugin call from ``ctx``.
 
@@ -100,12 +104,21 @@ def resolve_owner_repo(
     :class:`ValueError` when neither path produces a candidate so the
     caller can surface a clear "set the GitHub Repository link"
     message to the operator.
+
+    ``prefer_previous_slug`` makes the slug fallback prefer
+    ``ctx.previous_project_slug`` (when set) over ``ctx.project_slug``
+    so callers reacting to a slug rename (e.g. ``on_project_updated``)
+    can still locate the pre-rename repo on GitHub.
     """
     derived = derive_owner_repo_from_links(ctx.project_links, host)
     if derived is not None:
         return derived
-    if ctx.project_type_slugs and ctx.project_slug:
-        return ctx.project_type_slugs[0], ctx.project_slug
+    if ctx.project_type_slugs:
+        slug = ctx.project_slug
+        if prefer_previous_slug and ctx.previous_project_slug:
+            slug = ctx.previous_project_slug
+        if slug:
+            return ctx.project_type_slugs[0], slug
     raise ValueError(
         f'{plugin_label} could not determine the target repository: '
         "set the project's GitHub Repository link or tag the project "

{imbi_plugin_github-1.4.0 → imbi_plugin_github-2.8.0}/src/imbi_plugin_github/deployment.py

@@ -25,6 +25,7 @@ from __future__ import annotations
 
 import asyncio
 import collections.abc
+import contextlib
 import datetime
 import hashlib
 import logging
@@ -41,6 +42,7 @@ from imbi_common.plugins.base import (
     DeploymentEventStatus,
     DeploymentPlugin,
     DeploymentRun,
+    LinkWriteback,
     OpsLogTemplate,
     PluginContext,
     PluginEdgeLabel,
@@ -159,6 +161,30 @@ def _parse_iso(value: str | None) -> datetime.datetime | None:
         return None
 
 
+def _repo_root_from_redirect(location: str) -> str | None:
+    """Derive the canonical repo-root URL from a rename redirect target.
+
+    GitHub answers a request to a renamed repo with a ``301`` whose
+    ``Location`` points at the by-id form, e.g.
+    ``https://api.host/repositories/687046/commits``.  Strip the
+    sub-resource path back to ``https://api.host/repositories/687046`` so
+    we can ``GET`` it for the repo's current ``full_name``/``html_url``.
+    Returns ``None`` when ``location`` isn't a ``/repositories/{id}`` URL.
+    """
+    parsed = urllib.parse.urlsplit(location)
+    parts = [segment for segment in parsed.path.split('/') if segment]
+    try:
+        idx = parts.index('repositories')
+    except ValueError:
+        return None
+    if idx + 1 >= len(parts):
+        return None
+    repo_id = parts[idx + 1]
+    return urllib.parse.urlunsplit(
+        (parsed.scheme, parsed.netloc, f'/repositories/{repo_id}', '', '')
+    )
+
+
 def _checks_cache_key(
     credentials: dict[str, str], host: str, owner: str, repo: str
 ) -> str | None:
@@ -318,14 +344,86 @@ class _DeploymentBase(DeploymentPlugin):
             )
         return token
 
-    def _client(
+    @contextlib.asynccontextmanager
+    async def _client(
         self, ctx: PluginContext, credentials: dict[str, str]
-    ) -> httpx.AsyncClient:
-        return httpx.AsyncClient(
+    ) -> collections.abc.AsyncGenerator[httpx.AsyncClient]:
+        """Yield an httpx client that survives — and self-heals — renames.
+
+        ``follow_redirects=True`` means a renamed repo's ``301`` is
+        followed and the request transparently retried against the
+        canonical ``/repositories/{id}`` location instead of crashing in
+        ``raise_for_status``.  A response hook records that redirect; once
+        the caller's request succeeds we resolve the repo's new
+        ``full_name``/``html_url`` and stash a
+        :class:`~imbi_common.plugins.base.LinkWriteback` on ``ctx`` so the
+        host can persist the project's updated stored link.  This is the
+        single chokepoint for every deployment call.
+        """
+        captured: list[str] = []
+
+        async def _capture_redirect(response: httpx.Response) -> None:
+            if response.is_redirect:
+                location = response.headers.get('location') or ''
+                if '/repositories/' in location:
+                    captured.append(location)
+
+        client = httpx.AsyncClient(
             timeout=_HTTP_TIMEOUT_SECONDS,
             headers=_auth_headers(self._token(credentials)),
             base_url=self._repo_url(ctx),
-            event_hooks={'response': [_raise_on_401]},
+            follow_redirects=True,
+            event_hooks={'response': [_capture_redirect, _raise_on_401]},
+        )
+        async with client:
+            yield client
+            # Only after the caller's request succeeded: a captured
+            # redirect means the repo was renamed out from under the
+            # stored link.  Resolve the new name once and report it.
+            if captured and ctx.link_writeback is None:
+                await self._record_relocation(client, ctx, captured[-1])
+
+    async def _record_relocation(
+        self,
+        client: httpx.AsyncClient,
+        ctx: PluginContext,
+        redirect_location: str,
+    ) -> None:
+        """Resolve a renamed repo's canonical name and stash it on ``ctx``.
+
+        Best-effort: any failure to resolve the repo root leaves
+        ``ctx.link_writeback`` unset so the user-facing call (which
+        already succeeded via the followed redirect) is never disturbed.
+        """
+        repo_root = _repo_root_from_redirect(redirect_location)
+        if repo_root is None:
+            return
+        try:
+            resp = await client.get(repo_root)
+        except (httpx.HTTPError, PluginAuthenticationFailed):
+            # The user-facing request already succeeded; a probe failure
+            # (network, or a 401 surfaced by the response hook) must not
+            # turn that success into an error during teardown.
+            return
+        if resp.status_code != 200:
+            return
+        try:
+            payload = typing.cast(dict[str, typing.Any], resp.json())
+        except ValueError:
+            return
+        full_name = str(payload.get('full_name') or '')
+        html_url = str(payload.get('html_url') or '')
+        if not full_name or not html_url:
+            return
+        old_owner, old_repo = self._owner_repo(ctx)
+        old_owner_repo = f'{old_owner}/{old_repo}'
+        if full_name.lower() == old_owner_repo.lower():
+            return
+        ctx.link_writeback = LinkWriteback(
+            link_key='github-repository',
+            new_url=html_url,
+            old_owner_repo=old_owner_repo,
+            new_owner_repo=full_name,
         )
 
     # -- Refs ---------------------------------------------------------------