Repository navigation
chore(sync): merge beta into alpha preserving validation policy - #521
Conversation
…the correct values
Update ICS Analytics
Clean candidate, staged, and quarantine references across snapshot history before permitted object deletion. Preserve member and manifest guards, reconcile surviving latest selectors, and support idempotent cleanup retries. Add deletion regression coverage and document cleanup and repair semantics.
Replace deterministic UUIDv5 draft bundle generation with random UUIDv4 IDs while preserving stored release bundle IDs. Update bundle regression coverage and export documentation.
Align shared release-track admission with the import lifecycle policy for revoked and deprecated revisions. Preserve exact-revision existence checks, active-content validation, membership, manifests, and exported inactive content. Add lifecycle admission regression coverage and document the exemption.
Carry creation provenance from the latest stored revision without historical recovery or organization backfill. Fetch only that revision and retain normal authoring and import behavior. Cover absent and divergent imported provenance, historical STIX preservation, and normal lifecycle synchronization; document the prevention-only contract.
…om previous revision
feat(docker): add REST API live reload
Remove the sync-specific fixture adjustment from PR #518 as requested. Leave test repairs for next; the seeded Network Devices assertion is expected to fail until addressed there.
chore(sync): merge main into next
Remove the test option during setup so the lifecycle assertions do not depend on bundled defaults.
Start a normal push range after replacing the unreleased merge history. The previous push referenced a commit absent from the runner checkout.
chore(sync): merge next into beta
chore(sync): merge next into beta
Retain canonical admission evaluation, configurable exemptions and reports. Add policy regression coverage and reconcile provenance tests with alpha identity propagation. Keep current exemption defaults unchanged.
|
Implemented the approved conflict resolution in Current-head CI passes: commitlint, lint, full Two local full-suite attempts had changing failures: groups setup ECONNRESET, virtual composition 404, then explicit virtual materialization 404. All affected specs pass in isolation; details are retained in the description. CI provides the complete passing validation of this exact head. Ready for review. Merge with a merge commit to preserve beta ancestry; exemption-default changes remain a separate policy decision. No PR has been merged by this task. |
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## alpha #521 +/- ##
==========================================
+ Coverage 83.36% 83.41% +0.05%
==========================================
Files 277 278 +1
Lines 43679 43847 +168
Branches 6146 6195 +49
==========================================
+ Hits 36411 36576 +165
+ Misses 7150 7149 -1
- Partials 118 122 +4 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
🎉 This PR is included in version 4.26.0-alpha.1 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
Summary
Merge beta into alpha while retaining alpha's canonical validation, configurable retirement exemptions and optional reporting. The only textual conflict was
app/services/release-tracks/reviewed-state-service.js; its resolved content is identical to alpha. Existing enabled retirement defaults and administrator overrides remain unchanged. Changing defaults is a separate policy decision.Source beta:
401a3719eed71852a04b7872ede5cb8137fcb506Destination alpha:
3fc457683a4bd3cd366e0731314d775e19b6ae06Resolution merge:
50a4388b2874a7d885a52e1afed00c4898332911The dedicated branch is authorized for this file-conflict resolution and starts from alpha with beta as the second merge parent. Merge this PR with a merge commit, preserving source ancestry; do not squash or rebase.
The merge also brings beta's workflow-reference cleanup on deletion, authoring provenance preservation, UUIDv4 draft bundle IDs, ICS platform defaults and development configuration. Git reports 24 source commits absent by ancestry and 16 unmatched non-merge patches; the history includes reapplication and revisions, not 24 independent new features.
Added four admission cases for revoked/deprecated revisions with disabled or nonmatching exemptions, matching-scope retries, batch atomicity and stored-content preservation. Added overlapping-rule report coverage and publication rejection after both exemptions are disabled. Reconciled the provenance test with alpha's explicit organization-identity propagation: ordinary authoring preserves the latest stored creator while historical revisions remain unchanged. Updated user/admin/developer contracts accordingly. No new API fields or endpoints were introduced by the resolution.
Evidence
reviewed-state-service.js; beta's unconditional retirement shortcut would bypass alpha's policy and report collection.npm ci, lint, lockfile checks, whitespace checks and commitlint pass. Dependency verification: 1,093 signatures and 144 attestations.npm test: OpenAPI 4 passing, config 22 passing, API 1,263 passing / 2 failing. Failures: groups query setupECONNRESET; virtual-determinism source-promotion composition expected 201 but returned 404. Both affected specs pass in isolation (10 and 11 tests). No Mongo port/startup error found. Middleware/scheduler were short-circuited by API failures.virtual-scheduled-materialization.spec.js, client-supplied explicit creation value: expected 200, returned 404. That spec passes in isolation (5 passing). Separately, middleware 29 passing and scheduler 15 passing. Full local validation has not passed. No tests were skipped, weakened or given higher timeouts.npm testvia coverage: OpenAPI 4, configuration 22, API 1,274, middleware 29, scheduler 15, all passing. Registry signatures 1,093 and attestations 144 verified. Fresh fetch confirms source/destination tips are unchanged. The PR is ready for review; the local intermittent failures above remain recorded.Merge Danger
Door: Two-way for code; published release manifests retain their established immutability contracts.
Blast Radius: API
This integrates the beta changes into alpha only. The primary review points are canonical admission policy/report preservation, deletion cleanup integration, and identity propagation versus ordinary authoring. Default-exemption changes are explicitly deferred. No release branch was pushed directly and no PR was merged.