Skip to content

chore(sync): merge beta into alpha - #524

Merged
jondricek merged 6 commits into
alphafrom
beta
Nov 9, 2026
Merged

jondricek merged 6 commits into
alphafrom
beta

Conversation

@jondricek

@jondricek jondricek commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

Summary

beta → alpha
  + release-track coverage and last-enrollment evidence
  + optional corporate CA trust for container dependency installation
  + OpenAPI definitions and current-behavior documentation

Source beta: e8b4700
Destination alpha: 5ec0d16

PR #523 has merged; main → next and next → beta are synchronized. This direct release-branch PR is the sole remaining synchronization. Git finds six source commits absent by ancestry, including two merge commits; all four non-merge patches are unmatched by git cherry. The conflict-free merge changes 16 files (+1038/-2), with no identified patch/squash equivalence ambiguity. Alpha's validation policy is retained.

Evidence

  • Before: alpha lacks the coverage-report endpoint and optional build CA support.
  • After: isolated simulated merge tree c0d4ffb0a5a93ecb42079606b72a8278c9f659e9.
  • Node 22.23.4: npm ci, lint, lockfile check, commitlint and whitespace checks pass.
  • Registry signatures: 1093 verified; attestations: 144 verified.
  • Focused release-track-coverage spec: 11 passing.
  • Initial local failure: full npm test failed: OpenAPI 4 passing, config 22 passing, API 1284 passing / 1 failing. Quiet opt-in validation reports: “retains conversion preflight scope without saving either revision when hierarchy ADM validation rejects” failed with read ECONNRESET. Middleware and scheduler did not run through the short-circuited full command; separate verification and file isolation follow.
  • Isolation: validation-reports.spec.js 35 passing; separate middleware 29 and scheduler 15 passing. This does not establish a passing full suite.
  • Validation passed; ready for review. Current merge CI https://github.com/mitre-attack/attack-workbench-rest-api/actions/runs/41959260737 tested da4607f (beta e8b4700 into alpha 5ec0d16). Full npm test: OpenAPI 4, config 22, API 1285, middleware 29, scheduler 15 passing. Static checks and commitlint pass. This supersedes the initial local ECONNRESET blocker. Remote tips re-fetched unchanged. No tests changed/skipped. Preserve ancestry through merge commit or fast-forward; no squash/rebase. No PR merged or release branches pushed.

Bruno changes were not made: this synchronization imports existing source changes and the automation scope excludes external repositories.

Merge Danger

Door: two-way

Blast Radius: API

Adds a report endpoint and build-time CA configuration. Preserve source ancestry using a merge commit or fast-forward; do not squash or rebase. No release branches were pushed and no PR was merged by this run.

Proposed merge message: chore(sync): merge beta into alpha

@jondricek

Copy link
Copy Markdown
Contributor Author

Validation status: NOT VALIDATED; keep draft.

On isolated merge tree c0d4ffb0a5a93ecb42079606b72a8278c9f659e9 (beta e8b4700 into alpha 5ec0d16), full npm test passed OpenAPI 4/config 22, then API 1284 passed/1 failed: validation-reports.spec.js, “retains conversion preflight scope without saving either revision when hierarchy ADM validation rejects”, read ECONNRESET. That entire file passes isolation (35). Separately middleware 29/scheduler 15 pass. Coverage spec 11, lint, lockfile, commitlint and signatures pass.

The reset is not reproducible in isolation; this is not proof that the full suite passes. No tests changed or skipped. Await passing full-suite validation on current tips before readiness. Release tips re-fetched unchanged before publication. Neither codex nor codex-automation label is available. Merge must preserve beta ancestry; no squash/rebase.

@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 96.41026% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 84.36%. Comparing base (401a371) to head (e8b4700).
⚠️ Report is 4 commits behind head on alpha.

Files with missing lines Patch % Lines
app/controllers/reports-controller.js 76.47% 4 Missing ⚠️
...elease-tracks/release-track-registry.repository.js 75.00% 3 Missing ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@            Coverage Diff             @@
##            alpha     #524      +/-   ##
==========================================
+ Coverage   82.25%   84.36%   +2.10%     
==========================================
  Files         258      278      +20     
  Lines       41833    44189    +2356     
  Branches     5608     6822    +1214     
==========================================
+ Hits        34410    37278    +2868     
+ Misses       7316     6809     -507     
+ Partials      107      102       -5     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jondricek
jondricek marked this pull request as ready for review November 6, 2026 02:57
@jondricek

Copy link
Copy Markdown
Contributor Author

Validation passed; ready for review. Current merge CI https://github.com/mitre-attack/attack-workbench-rest-api/actions/runs/41959260737 tested da4607f (beta e8b4700 into alpha 5ec0d16). Full npm test: OpenAPI 4, config 22, API 1285, middleware 29, scheduler 15 passing. Static checks and commitlint pass. This supersedes the initial local ECONNRESET blocker. Remote tips re-fetched unchanged. No tests changed/skipped. Preserve ancestry through merge commit or fast-forward; no squash/rebase. No PR merged or release branches pushed.

@jondricek
jondricek merged commit 5058096 into alpha Nov 9, 2026
8 checks passed
@github-actions

github-actions Bot commented Nov 9, 2026

Copy link
Copy Markdown

🎉 This PR is included in version 4.27.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants