Skip to content

fix(OMN-20682): grant the PR watcher its CI-bus topics and consumer group #4737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonahgabriel merged 1 commit into from
Oct 8, 2026
Merged

fix(OMN-20682): grant the PR watcher its CI-bus topics and consumer group #4737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions docker/docker-compose.ci-bus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ services:
# serve` per host in a group <prefix>.<host>), on the same login.
# OMN-20604 adds the lab job supervisor's submitted command topic
# (omnimarket node_lab_job_submit_effect), on the same login, for fourteen total.
# OMN-20682 adds the operator-host PR watcher's four topics (omnibase_internal
# node_pr_watcher_effect: its tick command, tick completed and failed, and
# pr-state-observed), on the same login, for eighteen lab topics in total.
ci-bus-topics:
image: redpandadata/redpanda:v24.2.7
container_name: omninode-ci-bus-topics
Expand All @@ -251,7 +254,7 @@ services:
# addition does not hit the Redpanda default of 1000 (OMN-7302).
/usr/bin/rpk cluster config set topic_partitions_per_shard 7000 $$ADMIN
CI_TOPICS="onex.cmd.omnimarket.occ-autobind.v1 onex.cmd.omnimarket.occ-companion-effect-requested.v1 onex.evt.github.pr-merged.v1 onex.cmd.omnimarket.redeploy-start.v1 onex.evt.deploy.rebuild-completed.v1"
LAB_TOPICS="onex.cmd.omnimarket.lab-work-unit-requested.v1 onex.evt.omnimarket.lab-work-unit-completed.v1 onex.evt.omnimarket.lab-work-unit-failed.v1 onex.evt.omnimarket.lab-host-capacity-advertised.v1 onex.cmd.omnimarket.focused-test-run-requested.v1 onex.evt.omnimarket.focused-test-run-completed.v1 onex.evt.omnimarket.focused-test-run-failed.v1 onex.cmd.omnimarket.push-validation-requested.v1 onex.evt.omnimarket.push-validation-completed.v1 onex.evt.omnimarket.push-validation-failed.v1 onex.dlq.omnimarket.push-validation.v1 onex.evt.omnimarket.repo-merged.v1 onex.evt.omnimarket.canonical-clone-refreshed.v1 onex.cmd.omnimarket.lab-job-submitted.v1"
LAB_TOPICS="onex.cmd.omnimarket.lab-work-unit-requested.v1 onex.evt.omnimarket.lab-work-unit-completed.v1 onex.evt.omnimarket.lab-work-unit-failed.v1 onex.evt.omnimarket.lab-host-capacity-advertised.v1 onex.cmd.omnimarket.focused-test-run-requested.v1 onex.evt.omnimarket.focused-test-run-completed.v1 onex.evt.omnimarket.focused-test-run-failed.v1 onex.cmd.omnimarket.push-validation-requested.v1 onex.evt.omnimarket.push-validation-completed.v1 onex.evt.omnimarket.push-validation-failed.v1 onex.dlq.omnimarket.push-validation.v1 onex.evt.omnimarket.repo-merged.v1 onex.evt.omnimarket.canonical-clone-refreshed.v1 onex.cmd.omnimarket.lab-job-submitted.v1 onex.cmd.omnibase_internal.pr-watcher-tick-requested.v1 onex.evt.omnibase_internal.pr-watcher-tick-completed.v1 onex.evt.omnibase_internal.pr-watcher-tick-failed.v1 onex.evt.omnimarket.pr-state-observed.v1"
TOPICS="$$CI_TOPICS $$LAB_TOPICS"
for t in $$TOPICS; do
if /usr/bin/rpk topic list $$BROKER | awk '{print $$1}' | grep -qx "$$t"; then
Expand All @@ -270,7 +273,7 @@ services:
for t in $$TOPICS; do
/usr/bin/rpk topic list $$BROKER | awk '{print $$1}' | grep -qx "$$t"
done
echo "OMN-18691 + OMN-20213: readback confirms all sixteen topics exist"
echo "OMN-18691 + OMN-20213: readback confirms all twenty-three topics exist"
depends_on:
redpanda:
condition: service_healthy
Expand Down Expand Up @@ -469,7 +472,7 @@ services:
fi
echo "OMN-20213: lab-work principal is not a superuser"
# Kafka ACL creation is idempotent: an identical binding is a no-op.
LAB_TOPICS="onex.cmd.omnimarket.lab-work-unit-requested.v1 onex.evt.omnimarket.lab-work-unit-completed.v1 onex.evt.omnimarket.lab-work-unit-failed.v1 onex.evt.omnimarket.lab-host-capacity-advertised.v1 onex.cmd.omnimarket.focused-test-run-requested.v1 onex.evt.omnimarket.focused-test-run-completed.v1 onex.evt.omnimarket.focused-test-run-failed.v1 onex.cmd.omnimarket.push-validation-requested.v1 onex.evt.omnimarket.push-validation-completed.v1 onex.evt.omnimarket.push-validation-failed.v1 onex.dlq.omnimarket.push-validation.v1 onex.evt.omnimarket.repo-merged.v1 onex.evt.omnimarket.canonical-clone-refreshed.v1 onex.cmd.omnimarket.lab-job-submitted.v1"
LAB_TOPICS="onex.cmd.omnimarket.lab-work-unit-requested.v1 onex.evt.omnimarket.lab-work-unit-completed.v1 onex.evt.omnimarket.lab-work-unit-failed.v1 onex.evt.omnimarket.lab-host-capacity-advertised.v1 onex.cmd.omnimarket.focused-test-run-requested.v1 onex.evt.omnimarket.focused-test-run-completed.v1 onex.evt.omnimarket.focused-test-run-failed.v1 onex.cmd.omnimarket.push-validation-requested.v1 onex.evt.omnimarket.push-validation-completed.v1 onex.evt.omnimarket.push-validation-failed.v1 onex.dlq.omnimarket.push-validation.v1 onex.evt.omnimarket.repo-merged.v1 onex.evt.omnimarket.canonical-clone-refreshed.v1 onex.cmd.omnimarket.lab-job-submitted.v1 onex.cmd.omnibase_internal.pr-watcher-tick-requested.v1 onex.evt.omnibase_internal.pr-watcher-tick-completed.v1 onex.evt.omnibase_internal.pr-watcher-tick-failed.v1 onex.evt.omnimarket.pr-state-observed.v1"
for t in $$LAB_TOPICS; do
su_rpk security acl create --allow-principal "User:$$CI_BUS_LABWORK_SASL_USERNAME" \
--resource-pattern-type literal --topic "$$t" \
Expand All @@ -480,7 +483,10 @@ services:
# random suffix, and EventBusKafka appends .__t.<topic>. These must be
# prefixed grants rather than literal group names.
# The host drift sync hub reads repo-merged in its own group prefix (OMN-20689).
GROUP_PREFIXES="local.omnimarket.node_lab_work_unit_effect.consume.v1. local.omnimarket.lab_work_client.consume.v1. local.omnimarket.node_focused_test_run_effect.consume.v1 local.omnimarket.delegated_test_loop_client.consume.v1. local.omnimarket.node_canonical_clone_refresh_effect.consume.v1. local.omnibase_internal.host_drift_sync.hub."
# The PR watcher (omnibase_internal node_pr_watcher_effect) subscribes with its
# contract's literal group_id; EventBusKafka appends .__t.<topic> (and .__i.<instance>
# when KAFKA_INSTANCE_ID is set), so the prefix ends in a dot (OMN-20682).
GROUP_PREFIXES="local.omnimarket.node_lab_work_unit_effect.consume.v1. local.omnimarket.lab_work_client.consume.v1. local.omnimarket.node_focused_test_run_effect.consume.v1 local.omnimarket.delegated_test_loop_client.consume.v1. local.omnimarket.node_canonical_clone_refresh_effect.consume.v1. local.omnibase_internal.host_drift_sync.hub. onex.omnibase_internal.node_pr_watcher_effect."
for g in $$GROUP_PREFIXES; do
su_rpk security acl create --allow-principal "User:$$CI_BUS_LABWORK_SASL_USERNAME" \
--resource-pattern-type prefixed --group "$$g" \
Expand All @@ -495,7 +501,7 @@ services:
for t in $$LAB_TOPICS; do
printf '%s\n' "$$ACLS" | grep -q "$$t"
done
echo "OMN-20213 + OMN-20496: ACL readback confirms all fourteen lab topics"
echo "OMN-20213 + OMN-20496 + OMN-20682: ACL readback confirms all eighteen lab topics"
# A down broker also hides topics, so the negative alone proves nothing.
# Capture once as the lab-work login: the positive proves authentication
# and authorization, and the negative proves a CI topic is invisible.
Expand Down
50 changes: 43 additions & 7 deletions tests/unit/docker/test_ci_bus_broker_isolation_omn18691.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ def test_ci_bus_topics_are_exactly_the_ci_bus_set(ci_bus: dict[str, Any]) -> Non
lab-work units, host capacity, focused test runs and push validation (OMN-20213),
and two more carry merge events and each host's canonical-clone refresh receipt
(OMN-20496). OMN-20604 adds the lab job supervisor's submitted command topic,
for fourteen lab topics in total.
and OMN-20682 adds the operator-host PR watcher's four topics, for eighteen
lab topics in total.
"""
expected = {
"onex.cmd.omnimarket.occ-autobind.v1", # onex-topic-allow: OMN-18691 CI-bus provisioning set
Expand All @@ -417,10 +418,14 @@ def test_ci_bus_topics_are_exactly_the_ci_bus_set(ci_bus: dict[str, Any]) -> Non
"onex.evt.omnimarket.repo-merged.v1", # onex-topic-allow: OMN-20496
"onex.evt.omnimarket.canonical-clone-refreshed.v1", # onex-topic-allow: OMN-20496
"onex.cmd.omnimarket.lab-job-submitted.v1", # onex-topic-allow: OMN-20604
"onex.cmd.omnibase_internal.pr-watcher-tick-requested.v1", # onex-topic-allow: OMN-20682
"onex.evt.omnibase_internal.pr-watcher-tick-completed.v1", # onex-topic-allow: OMN-20682
"onex.evt.omnibase_internal.pr-watcher-tick-failed.v1", # onex-topic-allow: OMN-20682
"onex.evt.omnimarket.pr-state-observed.v1", # onex-topic-allow: OMN-20682
}

raw = CI_BUS_COMPOSE.read_text(encoding="utf-8")
found = set(re.findall(r"onex\.[a-z]+\.[a-z0-9.-]+\.v\d+", raw))
found = set(re.findall(r"onex\.[a-z]+\.[a-z0-9._-]+\.v\d+", raw))
assert found == expected, (
"the CI-bus bring-up one-shot provisions a different topic set than this "
f"test pins: compose-only={sorted(found - expected)}, "
Expand All @@ -431,8 +436,9 @@ def test_ci_bus_topics_are_exactly_the_ci_bus_set(ci_bus: dict[str, Any]) -> Non
)

# Cross-check the one name this repo owns a canonical constant for. The other
# eighteen are declared in omnimarket's topic registry, which this repo does not
# import -- stated rather than left as an apparent omission.
# twenty-two are declared in omnimarket's and omnibase_internal's topic
# registries, which this repo does not import -- stated rather than left as
# an apparent omission.
from omnibase_infra.topics.platform_topic_suffixes import SUFFIX_GITHUB_PR_MERGED

assert SUFFIX_GITHUB_PR_MERGED in expected, (
Expand Down Expand Up @@ -472,16 +478,46 @@ def test_ci_bus_labwork_principal_is_scoped_not_superuser(
lab_topics = re.search(r'LAB_TOPICS="([^"]+)"', command)
assert lab_topics is not None, "the lab-work ACL grant set must be explicit"
granted = lab_topics.group(1).split()
assert len(granted) == 14
assert len(granted) == 18
assert '--resource-pattern-type literal --topic "$$t"' in command
topics_command = "\n".join(services["ci-bus-topics"]["command"])
declared = set(re.findall(r"onex\.[a-z]+\.[a-z0-9.-]+\.v\d+", topics_command))
declared = set(re.findall(r"onex\.[a-z]+\.[a-z0-9._-]+\.v\d+", topics_command))
assert set(granted) <= declared, "every lab-work grant must name a declared topic"
# Include any separately added literal grant, not just the LAB_TOPICS loop.
referenced = set(re.findall(r"onex\.[a-z]+\.[a-z0-9.-]+\.v\d+", command))
referenced = set(re.findall(r"onex\.[a-z]+\.[a-z0-9._-]+\.v\d+", command))
assert referenced <= declared, "lab-work ACLs and controls must use declared topics"


def test_ci_bus_labwork_grants_the_pr_watcher_group_and_counts_match(
ci_bus: dict[str, Any],
) -> None:
"""OMN-20682: the PR watcher serve process subscribes with the contract group_id
onex.omnibase_internal.node_pr_watcher_effect, which EventBusKafka suffixes
with .__t.<topic>, so the lab-work login needs that prefix; the readback echoes
must state the real counts.
"""
services = ci_bus.get("services") or {}
command = "\n".join(services["ci-bus-labwork-user"]["command"])
topics_command = "\n".join(services["ci-bus-topics"]["command"])
prefixes = re.search(r'GROUP_PREFIXES="([^"]+)"', command)
assert prefixes is not None
assert "onex.omnibase_internal.node_pr_watcher_effect." in prefixes.group(1).split()

words = {18: "eighteen", 23: "twenty-three"}
lab_topics = re.search(r'LAB_TOPICS="([^"]+)"', command)
assert lab_topics is not None
granted = lab_topics.group(1).split()
assert f"ACL readback confirms all {words[len(granted)]} lab topics" in command

ci_topics = re.search(r'CI_TOPICS="([^"]+)"', topics_command)
lab = re.search(r'LAB_TOPICS="([^"]+)"', topics_command)
assert ci_topics is not None
assert lab is not None
total = len(ci_topics.group(1).split()) + len(lab.group(1).split())
assert total == 23
assert f"readback confirms all {words[total]} topics exist" in topics_command


def test_ci_bus_topics_one_shot_authenticates_once_sasl_is_on(
ci_bus: dict[str, Any],
) -> None:
Expand Down
Loading