Skip to content

Renumber #15058 migration and move release notes to 3.1.x#15108

Merged
devGregA merged 1 commit into
devfrom
fix-15058-renumber-migration-3.1
Jun 30, 2026
Merged

Renumber #15058 migration and move release notes to 3.1.x#15108
devGregA merged 1 commit into
devfrom
fix-15058-renumber-migration-3.1

Conversation

@Maffooch

@Maffooch Maffooch commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Summary

The dev branch was broken by the premature merge of #15058, which was branched from an older base. This corrects the migration numbering and release-notes version to match dev (3.1.0-dev).

  • Migration collision: Modernize Tool Config credential encryption to AES-256-GCM #15058 added 0270_reencrypt_tool_config_credentials_aes_gcm depending on 0269, but dev already has 0270_finding_visibility_perf_indexes and 0271_finding_perf_indexes — two 0270 leaf nodes break the migration graph. Renamed to 0272_reencrypt_tool_config_credentials_aes_gcm and re-pointed its dependency to 0271_finding_perf_indexes, restoring a linear chain (0269 → 0270 → 0271 → 0272).
  • Migration name references: updated the 02700272 references in dojo/utils.py (REMOVAL TRACKING note + legacy read-path comment).
  • Release notes: dev is 3.1.0-dev, not 3.2. Merged the "Tool Configuration credentials upgraded to AES-256-GCM" section into 3.1.md (fixing the in-text migration name to 0272 and the release-tag link to 3.1.0), updated the 3.1.md frontmatter description, and deleted 3.2.md.

No changes to the encryption logic, requirements bumps, or tests.

🤖 Generated with Claude Code

[sc-13319]

PR #15058 was branched from an older base: its migration was numbered
0270 (depending on 0269) and its upgrade notes targeted 3.2.x. On dev
this collided with the existing 0270_finding_visibility_perf_indexes /
0271_finding_perf_indexes migrations (two 0270 leaf nodes break the
migration graph), and dev is 3.1.0-dev, not 3.2.

- Rename 0270_reencrypt_tool_config_credentials_aes_gcm -> 0272 and
  depend on 0271_finding_perf_indexes, restoring a linear chain.
- Update the migration-name references in dojo/utils.py (0270 -> 0272).
- Merge the AES-256-GCM upgrade notes into 3.1.md (fixing the migration
  name and release-tag link) and delete 3.2.md.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@Maffooch Maffooch requested a review from mtesauro as a code owner June 29, 2026 23:20
@github-actions github-actions Bot added New Migration Adding a new migration file. Take care when merging. docs labels Jun 29, 2026
@Maffooch Maffooch added this to the 3.1.0 milestone Jun 29, 2026

@mtesauro mtesauro 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.

Approved

@devGregA devGregA self-requested a review June 30, 2026 01:23
@devGregA devGregA merged commit 20cdba0 into dev Jun 30, 2026
275 of 277 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs New Migration Adding a new migration file. Take care when merging.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants