Skip to content

refactor(secret-leak): delete duplicate betterleaks/default.toml; dependabot drop-in header#103

Merged
dkastl merged 1 commit into
mainfrom
feat/betterleaks-dedup-dependabot-header
Jul 24, 2026
Merged

refactor(secret-leak): delete duplicate betterleaks/default.toml; dependabot drop-in header#103
dkastl merged 1 commit into
mainfrom
feat/betterleaks-dedup-dependabot-header

Conversation

@dkastl

@dkastl dkastl commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Phase 4 of the Security Suite single-source-of-truth consolidation (tracking issue: geolonia-operations#236).

Changes

Delete betterleaks/default.toml. It duplicated the per-PR allowlists and differed only by disabling generic-api-key. After the weekly audit switches to the canonical .betterleaks.toml base + a generated one-line [extend] overlay, this file is unused. Deleting it leaves one betterleaks config in the repo, resolving the "two similar TOMLs" confusion. The stale Org default.toml note in reusable-secret-leak-check.yml now names the canonical base. betterleaks/ retains only the pre-commit example.

pinact/dependabot.yml: drop-in header. The Backstage scaffolder now fetches this file directly into repos (geolonia-backstage#274, merged), so its header no longer reads as "copy this file to ..." instructions. Adoption/merge guidance stays in docs/github-actions-pinning.md.

GATED - merge order

The deletion depends on the weekly audit no longer fetching betterleaks/default.toml:

  1. Merge the audit PR first: geolonia-operations#237.
  2. Then merge this.

Merging this before #237 would 404 the audit's config fetch on its next run. Holding as draft until #237 lands.

Not included: drift-check (deferred, see below)

Summary by CodeRabbit

  • Security

    • Updated the secret-scanning workflow to use a newly pinned scanner image.
    • Removed the organization-wide audit configuration and its associated exceptions.
  • Documentation

    • Clarified comments explaining dependency update freshness, cooldown timing, and adoption guidance.

…endabot drop-in header

- Delete betterleaks/default.toml. Its ruleset is now the single canonical
  .betterleaks.toml base; the weekly org audit's one divergence (disabling
  generic-api-key) is expressed as a generated [extend] overlay on the audit
  side. Update the stale "Org default.toml" note in reusable-secret-leak-check.yml
  to name the canonical base. betterleaks/ now holds only the pre-commit example.
- pinact/dependabot.yml: rewrite the header as a drop-in config. The Backstage
  scaffolder now fetches this file into repos, so it should not read as copy-me
  instructions; adoption and merge guidance stay in docs/github-actions-pinning.md.

GATED: merge only after the weekly audit (geolonia-operations) stops fetching
betterleaks/default.toml. Deleting it before that lands would 404 the audit's
config fetch.
@coderabbitai

coderabbitai Bot commented Jul 24, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 073a71aa-099d-4407-90b2-7e395d248f6f

📥 Commits

Reviewing files that changed from the base of the PR and between b6b8240 and cb929c1.

📒 Files selected for processing (3)
  • .github/workflows/reusable-secret-leak-check.yml
  • betterleaks/default.toml
  • pinact/dependabot.yml
💤 Files with no reviewable changes (1)
  • betterleaks/default.toml

Walkthrough

The reusable secret-leak workflow now references a new pinned Betterleaks image digest, the obsolete Betterleaks default configuration is removed, and Dependabot configuration comments are updated without changing operational settings.

Changes

Betterleaks scanning

Layer / File(s) Summary
Betterleaks image and configuration
.github/workflows/reusable-secret-leak-check.yml, betterleaks/default.toml
The workflow’s default Betterleaks image digest is replaced, and the former org-wide Betterleaks configuration is deleted.

Dependabot guidance

Layer / File(s) Summary
Dependabot configuration documentation
pinact/dependabot.yml
Opening comments now describe SHA-pinning freshness, cooldown timing, and adoption guidance; the YAML settings remain unchanged.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Possibly related PRs

  • geolonia/.github#102: Updates canonical Betterleaks configuration and reusable workflow config-resolution behavior.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed It concisely summarizes the main changes: removing the duplicate Betterleaks config and updating the Dependabot header.
Description check ✅ Passed It covers the changes, merge dependency, and related issue context; the content is complete even though the template headings are not used verbatim.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/betterleaks-dedup-dependabot-header

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown
Contributor

🛡️ Security suite

Check Result
✅ Supply chain · bumblebee No exposure matches
✅ Secrets · betterleaks No secrets in diff
✅ Action pinning · pinact All actions pinned
✅ Actions audit · zizmor No findings

Note

All security checks passed.

Updated for cb929c1 · workflow run

@dkastl
dkastl marked this pull request as ready for review July 24, 2026 04:01
@dkastl
dkastl merged commit 82fb51b into main Jul 24, 2026
6 checks passed
@dkastl
dkastl deleted the feat/betterleaks-dedup-dependabot-header branch July 24, 2026 04:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant