Skip to content

fix(governance): match RFC #520 directories under infra_and_tooling i… - #87

Merged
damaz91 merged 1 commit into
mainfrom
fix/conformance-rules-rfc520-dirs
Nov 5, 2026
Merged

damaz91 merged 1 commit into
mainfrom
fix/conformance-rules-rfc520-dirs

Conversation

@carolinerg1

Copy link
Copy Markdown
Contributor

Description

The conformance restructure from RFC #520 adds new top-level directories to conformance. None of them match a rule in conformance-rules.yml, so they fall through to the fallback requirement (2 approvals from governance-council). The current infra_and_tooling pattern ".py" only matches root-level files, because the governance glob engine maps * to [^/].

As a result, conformance#120 (framework + runner) can't pass Governance / Approvals with devops/maintainer approvals alone, even though it's the same kind of test-tooling change that infra_and_tooling already covers. I confirmed this by running PullRequestValidator against #120's 14 files: with 2 devops-maintainers approvals, infra_and_tooling is satisfied (2/2) but governance-council is still 0/2. The next PRs in the series hit the same problem: #121
adds shopping/ and common/, and PR 3/3 adds core/.

This PR adds the five RFC #520 directories to infra_and_tooling in org-tools/governance/rules/conformance-rules.yml:

  • framework/**: shared conformance framework (BaseIntegrationTest, discovery, capability gating, mock servers), from #120
  • platforms/**: platform certification profiles (e.g. platforms/google.yaml), from #120
  • shopping/**: shopping test suite and fixtures, from #121
  • common/**: cross-vertical tests, from #121
  • core/**: core protocol tests, from PR 3/3

This keeps the same approval bar the repo already uses for test code (*.py, test_data/**): 2 approvals from devops-maintainers or higher. It also adds a regression test (test_conformance_rules_suite_directory_globs) that asserts representative files in each directory resolve to infra_and_tooling rather than fallback, following the pattern from #82.

Category (Required)

Please select one or more categories that apply to this change.

  • Core Protocol: Changes to the base communication layer, global context, or breaking refactors. (Requires Technical Council approval)
  • Governance/Contributing: Updates to GOVERNANCE.md, CONTRIBUTING.md, or CODEOWNERS. (Requires Governance Council approval)
  • Capability: New schemas (Discovery, Cart, etc.) or extensions. (Requires Maintainer approval)
  • Documentation: Updates to README, or documentations regarding schema or capabilities. (Requires Maintainer approval)
  • Infrastructure: CI/CD, Linters, or build scripts. (Requires DevOps Maintainer approval)
  • Maintenance: Version bumps, lockfile updates, or minor bug fixes. (Requires DevOps Maintainer approval)
  • SDK: Language-specific SDK updates and releases. (Requires DevOps Maintainer approval)
  • Samples / Conformance: Maintaining samples and the conformance suite. (Requires Maintainer approval)
  • UCP Schema: Changes to the ucp-schema tool (resolver, linter, validator). (Requires Maintainer approval)
  • Community Health (.github): Updates to templates, workflows, or org-level configs. (Requires DevOps Maintainer approval)

Related Issues

Unblocks Universal-Commerce-Protocol/conformance#120 and Universal-Commerce-Protocol/conformance#121 (RFC Universal-Commerce-Protocol/ucp#520).

Checklist

  • I have followed the Contributing Guide (including Conventional Commits title requirements and ! for breaking changes).
  • I have updated the documentation (if applicable).
  • My changes pass all local linting and formatting checks.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • (For Core/Capability) I have included/updated the relevant JSON schemas.
  • I have regenerated Python Pydantic models by running generate_models.sh under python_sdk.

Screenshots / Logs (if applicable)

@ptiper ptiper left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving given refactoring, but please update down the line to the proper governance enforcement please.

@damaz91
damaz91 merged commit 9cad07d into main Nov 5, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants