Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Model secrets as baseline plus per-mechanism additions - #238

Merged
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms
Jul 5, 2026
Merged

Model secrets as baseline plus per-mechanism additions#238
ptr727 merged 8 commits into
developfrom
feature/secrets-baseline-and-mechanisms

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Restructures spec/secrets.json into generic baseline + domain-specific per-mechanism additions (directive 4), fixing the secret-model gaps the audits surfaced.

  • baseline - the App-token secrets (CODEGEN_APP_*) the fleet-wide App-signed merge-bot needs on every repo; implicit, no longer repeated per-repo or tied only to codegen. Forbids CODEGEN_APP_ID.
  • nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); codecov mechanism added (CODECOV_TOKEN); featureMechanisms map for non-publish features.
  • validate.py premise fix: an OIDC mechanism may require a non-secret stored value (a username); the forbids list - not an empty requires - is what enforces "no static key". (The old check hard-failed any OIDC mechanism with a non-empty requires.)
  • Normalized registryrequiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; dropped the now-baseline App secrets) + the codegen type; schema updated (baseline required, featureMechanisms, shared secretSet def).

Validated locally: jq empty + python3 spec/validate.py -> 8 cataloged / 14 backlog classify cleanly.

🤖 Generated with Claude Code

Add a baseline set - the App-token secrets the fleet-wide App-signed merge-bot needs on every repo (forbids CODEGEN_APP_ID) - so they are implicit, not repeated per-repo or tied only to codegen. nuget-oidc now requires NUGET_USERNAME (the NuGet/login profile name); add a codecov mechanism (CODECOV_TOKEN) and a featureMechanisms map.
Relax validate.py: an OIDC mechanism may require a non-secret stored value (username); the forbids list, not an empty requires, enforces "no static key". Normalize registry requiredSecrets (Utilities/LanguageTags -> NUGET_USERNAME; drop the now-baseline App secrets) and the codegen type's requiredSecrets. Update the schema (baseline required, featureMechanisms, shared secretSet def). Validated with jq + spec/validate.py.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 5, 2026 13:59

CopilotAI 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.

Pull request overview

Updates the secrets specification to separate fleet-wide baseline secrets from per-target/per-feature additions, aligning the registry and validation logic with the audit findings about OIDC mechanisms and non-secret stored values.

Changes:

  • Introduces a required baseline secret set in spec/secrets.json and updates the schema to support shared secretSet definitions plus featureMechanisms.
  • Updates nuget-oidc to require NUGET_USERNAME, adds a codecov mechanism, and normalizes how registries list only domain-specific additions.
  • Adjusts spec/validate.py to stop rejecting OIDC mechanisms solely because they have non-empty requires.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
FileDescription
spec/validate.pyRelaxes OIDC validation around requires to allow non-secret stored values.
spec/secrets.schema.jsonAdds baseline and $defs.secretSet, plus optional featureMechanisms.
spec/secrets.jsonRestructures secrets into baseline + per-mechanism sets; adds Codecov and NuGet username requirement.
spec/project-types.jsonRemoves codegen’s per-type required secrets now that baseline applies fleet-wide.
registry/repos.jsonUpdates NuGet repos to list NUGET_USERNAME as the required domain-specific addition.

Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Add the correct OIDC guarantee to validate.py: an oidc-labeled publish entry must have a non-empty forbids (it must block its static-credential counterpart), replacing the removed empty-requires proxy. Use the action slug actions/create-github-app-token in baseline.workflowNeeds (consistent with the other mechanisms' slugs); move the client-id-not-app-id detail to the note.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
Add a (oidc | static-secret) to each publish mechanism and check the repo's publish label against it directly, instead of inferring from requires-emptiness (which broke once OIDC mechanisms could require NUGET_USERNAME) - so a nuget target mislabeled static-secret is now caught. Keep the spec-integrity check that an oidc-kind mechanism forbids a static credential.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py Outdated
Comment threadspec/secrets.json
Comment threadspec/secrets.schema.json
validate.py now treats baseline as a required top-level key and reads forbids via get() so a malformed mechanism reports an error instead of crashing. codecov gains an explicit static-secret kind, and the schema requires kind for every entry under mechanisms (a new mechanism def = secretSet plus required kind) while keeping it optional for baseline.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
…bids
The validator asserts every mechanism has a recognized kind (oidc or static-secret) before the kind-based label check relies on it, and reads requires/forbids via get() so a malformed secrets.json reports a clear error instead of raising KeyError (CI runs jq empty plus this script, no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Comment threadspec/validate.py Outdated
Comment threadspec/validate.py
One structural check verifies baseline and each mechanism are objects with list requires/forbids, a recognized kind, and the oidc-forbids integrity, returning a clear error before the cross-reference loops. Since CI runs no JSON-schema validation, a malformed secrets.json now reports a message instead of raising AttributeError/TypeError.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Comment threadspec/validate.py Outdated
…anisms
A shared helper now validates baseline and every mechanism have array requires/forbids (and mechanisms a valid kind), and targetMechanisms is an object mapping to a string or null, so any malformed secrets.json reports a clear error before the cross-reference loops.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Comment threadspec/validate.py
Comment threadspec/validate.py
Comment threadspec/validate.py Outdated
…n comment
check_secret_set now requires requires/forbids to be arrays of strings (a non-string element would break set membership downstream), and the shape check validates the optional featureMechanisms map like targetMechanisms. Shorten the block comment to the load-bearing why (CI runs no JSON-schema validation).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
@ptr727
ptr727 requested a review from CopilotJuly 5, 2026 14:36

CopilotAI 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.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

@ptr727
ptr727 merged commit c61804f into developJul 5, 2026
7 checks passed
@ptr727
ptr727 deleted the feature/secrets-baseline-and-mechanisms branch July 5, 2026 14:39
Sign up for freeto 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.

2 participants

@ptr727