Skip to content

chore(sync): merge next into beta - #525

Merged
jondricek merged 2 commits into
betafrom
next
Nov 19, 2026
Merged

jondricek merged 2 commits into
betafrom
next

Conversation

@jondricek

@jondricek jondricek commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Summary

- @mitre-attack/attack-data-model 4.11.7
+ @mitre-attack/attack-data-model 4.12.0

Synchronize next into beta directly, preserving source ancestry with a merge commit or fast-forward; do not squash or rebase.

Source next: 19128f73b02d902dfd947794d29082f139f28d3e
Destination beta: e8b47005dc0bb80c14f6b58e130533a01a18223f
Simulated merge tree: a5d492302b04d5f975a14e1eb91216c4d867dfc8.

Two source commits absent by ancestry: one dependency/lockfile update and one empty release-trigger commit. git cherry reports both unmatched; resulting merge changes only package.json and package-lock.json (+5/-5). No conflict or patch/squash ambiguity identified. main → next and beta → alpha currently synchronized. Stop dependent propagation until this PR actually merges and branches are fetched again.

Evidence

Status: validated on current tips; ready for review.

CI run 43145641804 checked out exact merge 624fec37 of the source/destination SHAs above. Full npm test passed: OpenAPI 2, config 22, API 1183, middleware 29, scheduler 15. Commitlint and static checks pass. Earlier local failures below remain historical evidence and did not recur in full CI. Release tips re-fetched unchanged before this update.

Before: beta resolves ADM 4.11.7. After: isolated simulated merge installs ADM 4.12.0 using Node 22.23.4.

  • npm ci, lint, lockfile check, commitlint and whitespace checks pass.
  • npm audit signatures: 1093 verified signatures, 145 attestations.
  • Focused specs individually pass: allowed-values 16; validation-bypasses 15; ADM middleware 20.
  • Full npm test: OpenAPI 2 and config 22 pass; API 1179 pass / 4 fail, exit 4. All failures are in app/tests/api/techniques/techniques.tactics.spec.js: preloaded technique GET returns 404, then three dependent assertions read undefined stix. Entire file passes isolation (6). This suggests suite interaction; cause is not established.
  • Remaining suites run separately because npm test short-circuited: middleware 29 and scheduler 15 pass.
  • Initial combined focused invocation produced six ADM middleware assertions after OpenAPI intercepted validation; middleware file passes isolation and normal middleware suite. Treat combined invocation as test configuration interaction, not proof of an ADM regression.

Required next: review and merge with source ancestry preserved; do not squash or rebase. No tests changed, skipped or weakened. No API surface modifications authored by synchronization; no additional docs or Bruno changes needed.

Merge Danger

Door: two-way

Dependency pin can be reverted in a later commit.

Blast Radius: validation

ADM affects runtime STIX validation. Full-suite CI validation now passes on current tips.

Proposed merge message: chore(sync): merge next into beta.

@jondricek

Copy link
Copy Markdown
Contributor Author

Validation blocked on current next 19128f73b02d902dfd947794d29082f139f28d3e / beta e8b47005dc0bb80c14f6b58e130533a01a18223f. Isolated merge is clean, but full npm test exits 4: OpenAPI 2/config 22 pass; API 1179 pass and four techniques.tactics.spec.js failures (404 preloaded technique, then undefined stix). That entire file passes alone (6); middleware 29 and scheduler 15 pass separately. Cause of suite interaction remains unconfirmed. Focused ADM-related files pass individually; static/lockfile/commitlint/signature checks pass. No tests modified or skipped. Keep draft until full validation and required CI pass on current tips. See description for complete evidence and ancestry-preserving merge requirement.

@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

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 82.32%. Comparing base (6735242) to head (19128f7).
⚠️ Report is 6 commits behind head on beta.
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##             beta     #525   +/-   ##
=======================================
  Coverage   82.32%   82.32%           
=======================================
  Files         258      258           
  Lines       42028    42028           
  Branches     5624     5624           
=======================================
  Hits        34599    34599           
  Misses       7322     7322           
  Partials      107      107           

☔ 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

Copy link
Copy Markdown
Contributor Author

CI run 43145641804 checked out exact merge 624fec37 of the source/destination SHAs above. Full npm test passed: OpenAPI 2, config 22, API 1183, middleware 29, scheduler 15. Commitlint and static checks pass. Earlier local failures below remain historical evidence and did not recur in full CI. Release tips re-fetched unchanged before this update. This supersedes the local validation blocker. Ready for review; dependent beta-to-alpha propagation remains stopped until this PR actually merges. Preserve source ancestry when merging.

@jondricek
jondricek marked this pull request as ready for review November 13, 2026 03:03
@jondricek
jondricek merged commit aa8a6eb into beta Nov 19, 2026
8 checks passed
@github-actions

Copy link
Copy Markdown

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

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.

2 participants