refactor(catalog): explicit org/repo terminology; npm targets coulomb Gitea registry
Gitea's "project/package/release" terms are overloaded, so the catalog now uses the most explicit words: - org = coulomb (the Gitea organisation) - repo = whynot-design (the Gitea repository/product) — not an org, not a scope - npm scope @whynot and package @whynot/design are distinct from both Changes: - catalog schema: replace conflated `owner` with required `org` + `repo`; `owner` is now a derived `org/repo` slug property - npm-config delivery is data-driven: registry + scope live in delivery_config.npm and are validated; engine no longer hardcodes a registry - exec delivery writes `<scope>:registry=<url>` + scoped `:_authToken` for the configured Gitea registry (token still env-expanded, never written to disk) - pilot lane points at https://gitea.coulomb.social/api/packages/coulomb/npm/, scope @whynot, KV path coulomb/whynot-design/npm/publish - npm-publish-demo uses @whynot scope so dry-run resolves the Gitea registry - docs: terminology table; routing owner shown as coulomb/whynot-design - tests: org/repo required, npm-config validation, registry authkey mapping Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
147cf8acda
commit
f87f4e5e4d
9 changed files with 153 additions and 17 deletions
|
|
@ -8,7 +8,8 @@ from secrets_engine.errors import CatalogError
|
|||
|
||||
VALID = {
|
||||
"id": "test-lane",
|
||||
"owner": "team",
|
||||
"org": "coulomb",
|
||||
"repo": "team-repo",
|
||||
"stage": "test",
|
||||
"mount": "secret",
|
||||
"path": "test/team/thing",
|
||||
|
|
@ -28,6 +29,26 @@ def test_valid_entry_parses():
|
|||
assert e.id == "test-lane"
|
||||
assert e.policy_name == "se-test-test-lane"
|
||||
assert not e.approval_required()
|
||||
# owner is the explicit org/repo slug, not a bare name
|
||||
assert e.owner == "coulomb/team-repo"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("field", ["org", "repo"])
|
||||
def test_missing_org_or_repo_rejected(field):
|
||||
data = copy.deepcopy(VALID)
|
||||
data.pop(field)
|
||||
with pytest.raises(CatalogError):
|
||||
validate_entry(data)
|
||||
|
||||
|
||||
def test_npm_config_requires_registry_and_scope():
|
||||
data = copy.deepcopy(VALID)
|
||||
data["delivery_modes"] = ["npm-config"]
|
||||
with pytest.raises(CatalogError):
|
||||
validate_entry(data) # no delivery_config.npm
|
||||
data["delivery_config"] = {"npm": {"registry": "https://x/", "scope": "@s"}}
|
||||
e = validate_entry(data)
|
||||
assert e.npm["scope"] == "@s"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("field", ["stage", "mount", "path", "fields", "approval", "delivery_modes"])
|
||||
|
|
@ -72,6 +93,11 @@ def test_repo_catalog_loads_and_has_pilot():
|
|||
pilot = entries["whynot-design-npm-publish"]
|
||||
assert pilot.stage == "prod"
|
||||
assert pilot.approval_required()
|
||||
# org=coulomb, repo=whynot-design (not conflated); npm targets Gitea registry
|
||||
assert pilot.org == "coulomb"
|
||||
assert pilot.repo == "whynot-design"
|
||||
assert pilot.npm["registry"].startswith("https://gitea.coulomb.social/")
|
||||
assert pilot.npm["scope"] == "@whynot"
|
||||
# build/test/prod stage separation is representable
|
||||
stages = {e.stage for e in entries.values()}
|
||||
assert {"build", "prod"} <= stages
|
||||
|
|
|
|||
24
tests/test_exec_delivery.py
Normal file
24
tests/test_exec_delivery.py
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
from secrets_engine.exec_delivery import _npm_userconfig, _registry_authkey
|
||||
|
||||
|
||||
def test_registry_authkey_strips_scheme_and_trails_slash():
|
||||
assert (
|
||||
_registry_authkey("https://gitea.coulomb.social/api/packages/coulomb/npm/")
|
||||
== "//gitea.coulomb.social/api/packages/coulomb/npm/"
|
||||
)
|
||||
# missing trailing slash is added
|
||||
assert _registry_authkey("https://host/api/npm") == "//host/api/npm/"
|
||||
|
||||
|
||||
def test_npm_userconfig_writes_registry_and_token_ref_not_value():
|
||||
registry = "https://gitea.coulomb.social/api/packages/coulomb/npm/"
|
||||
with _npm_userconfig(registry, "@whynot") as path:
|
||||
body = path.read_text()
|
||||
assert f"@whynot:registry={registry}" in body
|
||||
# token is referenced via env expansion, never written literally
|
||||
assert "${SE_NPM_TOKEN}" in body
|
||||
assert "//gitea.coulomb.social/api/packages/coulomb/npm/:_authToken" in body
|
||||
# file is mode 0600
|
||||
assert (path.stat().st_mode & 0o077) == 0
|
||||
# cleaned up on context exit
|
||||
assert not path.exists()
|
||||
Loading…
Add table
Add a link
Reference in a new issue