e2e: merge origin/main — SetUserBGPStatus at variant 106, topology variants 107-110

Author: ben-malbeclabs

.claude/commands/changelog.md

@@ -1,9 +1,8 @@
 Generate a CHANGELOG.md entry for the current branch.
 
 Analyze the **net changes** between the current branch and origin/main by examining:
-1. First, run `git fetch origin` to ensure remote tracking is up to date
-2. The diff summary: `git diff origin/main...HEAD --stat`
-3. The actual changes: `git diff origin/main...HEAD` (focus on key changes, not every line)
+1. Run `scripts/diff-breakdown.sh` to get the automated categorization (see its JSON output for category tallies and unclassified files)
+2. The actual changes: `git diff origin/main...HEAD` (focus on key changes, not every line)
 
 IMPORTANT: Focus on what the branch adds/changes compared to origin/main as a whole. Do NOT describe individual commits or intermediate work. The reviewer only sees the final diff.
 

.claude/commands/diff-breakdown.md

@@ -1,22 +1,19 @@
 Analyze the diff between the current branch and origin/main and produce a categorized breakdown.
 
 Steps:
-1. Run `git fetch origin` to ensure remote tracking is up to date
-2. Run `git diff origin/main...HEAD --numstat` to get per-file added/removed line counts
-3. Categorize each changed file using these heuristics (applied in order, first match wins):
-   - **Tests**: files matching `*_test.go`, `*_test.rs`, `tests/`, `e2e/`, `*_test.py`, `*.test.ts`, `*.test.js`
-   - **Fixtures/snapshots**: paths containing `fixtures/`, `snapshots/`, or `.bin`/`.json` files within those directories
-   - **Config/build**: `Cargo.toml`, `go.mod`, `go.sum`, `Makefile`, `*.toml`, `*.yml`, `*.yaml`, `Dockerfile`, `*.lock`
-   - **Docs**: `*.md`, paths under `rfcs/`
-   - **Generated**: lock files (`Cargo.lock`, `go.sum`, `bun.lockb`, `package-lock.json`), protobuf generated output (`*.pb.go`, `*.pb.rs`)
+1. Run `scripts/diff-breakdown.sh` to get the automated categorization. The script outputs JSON with:
+   - `categories`: tallies (files, added, removed) for tests, fixtures, config, docs, generated, and unclassified
+   - `unclassified_files`: list of files not auto-categorized, with per-file added/removed counts
+   - `table`: a pre-formatted markdown table (use as a starting point)
+   - `total`: aggregate totals
+2. For each file in `unclassified_files`, read the diff (`git diff origin/main...HEAD -- <file>`) and classify as either:
    - **Scaffolding**: code that wires things together but contains little logic of its own:
      - Metrics/instrumentation definitions (`metrics.go`, prometheus boilerplate)
      - Thin CLI wrappers — files that are mostly clap/cobra struct definitions + a single function call (e.g. `enable.rs`, `disable.rs` that just call one controller method)
      - Subcommand/route registration (`mod.rs` adding a `pub mod`, `command.rs` adding a variant, `main.go` wiring a new dependency)
      - Interface/trait definitions that are pure signatures with no logic
    - **Core logic**: everything else — the files where the real business logic and algorithms live
-4. Tally lines added and removed per category, and count distinct files per category
-5. Omit categories with zero changes
+3. Rebuild the table replacing "Unclassified" with the Scaffolding and Core logic rows. Omit categories with zero changes.
 
 Output the breakdown as plain text (NOT inside a code block) so it's readable in the terminal. Use this format:
 

.claude/commands/pr-text.md

@@ -1,9 +1,10 @@
 Generate a PR description for the current branch.
 
 Analyze the **net changes** between the current branch and origin/main by examining:
-1. First, run `git fetch origin` to ensure remote tracking is up to date
-2. The diff summary: `git diff origin/main...HEAD --stat`
-3. The actual changes: `git diff origin/main...HEAD` (focus on key changes, not every line)
+1. Run `scripts/diff-breakdown.sh` to get the automated categorization (see its JSON output for category tallies, unclassified files, and a pre-formatted table)
+2. The actual changes: `git diff origin/main...HEAD` (focus on key changes, not every line)
+
+For each file in the script's `unclassified_files`, read the diff and classify as Scaffolding (wiring, metrics, thin CLI wrappers, registrations, interface-only) or Core logic (business logic, algorithms, state management).
 
 IMPORTANT: Focus on what the branch adds/changes compared to origin/main as a whole. Do NOT describe individual commits or intermediate work. The reviewer only sees the final diff - they don't care about bugs introduced and fixed within the same branch.
 
@@ -50,9 +51,9 @@ PR Title guidelines:
 Guidelines:
 - Summary should describe the net result: what does this branch add or change compared to origin/main?
 - Ignore commit history - only describe what the final diff shows
-- Include a Diff Breakdown table categorizing changes using `git diff origin/main...HEAD --numstat`. Categorize files as: Core logic, Scaffolding (metrics, thin CLI wrappers, subcommand registration, interface-only files), Tests, Fixtures, Config/build, Docs, Generated. Omit categories with zero changes. Add a one-line summary below the table characterizing the balance of changes.
+- Include a Diff Breakdown table categorizing changes (use the script output as a base, replacing Unclassified with Scaffolding and Core logic rows). Omit categories with zero changes. Add a one-line summary below the table characterizing the balance of changes.
 - Include a "Key files" list after the diff breakdown showing the most important core logic files (up to 8), sorted by lines changed descending. Each entry should have a brief description of what changed. This helps reviewers know where to focus.
-- Link each key file to its diff in the PR. Use `gh pr view --json number,url` to get the PR URL, then link to `<PR_URL>/files#diff-<SHA256_OF_FILE_PATH>` where the hash is `echo -n "path/to/file" | shasum -a 256`. If no PR exists yet, use plain backtick paths instead.
+- Link each key file to its diff in the PR using the `pr_url` and `diff_hash` fields from the script output: `<pr_url>/files#diff-<diff_hash>`. If no PR exists yet (`pr_url` is empty), use plain backtick paths instead.
 - Testing Verification should describe how the changes were tested (e.g., unit tests added/passing, manual testing performed, build verified)
 - Focus on the "what" and "why", not the "how"
 - Group related changes together

.github/workflows/e2e.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main, 'hotfix/**' ]
   pull_request:
-    branches: [ main, 'hotfix/**' ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -25,6 +24,8 @@ env:
   DZ_CLIENT_IMAGE: ghcr.io/malbeclabs/dz-e2e/client:${{ github.sha }}
   DZ_DEVICE_HEALTH_ORACLE_IMAGE: ghcr.io/malbeclabs/dz-e2e/device-health-oracle:${{ github.sha }}
   DZ_GEOPROBE_IMAGE: ghcr.io/malbeclabs/dz-e2e/geoprobe:${{ github.sha }}
+  DZ_SENTINEL_IMAGE: ghcr.io/malbeclabs/dz-e2e/sentinel:${{ github.sha }}
+  DZ_VALIDATOR_METADATA_SERVICE_MOCK_IMAGE: ghcr.io/malbeclabs/dz-e2e/validator-metadata-service-mock:${{ github.sha }}
 
 jobs:
   setup:
@@ -63,6 +64,8 @@ jobs:
           docker push ${{ env.DZ_IMAGE_REPO }}/client:${{ env.DZ_IMAGE_TAG }}
           docker push ${{ env.DZ_IMAGE_REPO }}/device-health-oracle:${{ env.DZ_IMAGE_TAG }}
           docker push ${{ env.DZ_IMAGE_REPO }}/geoprobe:${{ env.DZ_IMAGE_TAG }}
+          docker push ${{ env.DZ_IMAGE_REPO }}/sentinel:${{ env.DZ_IMAGE_TAG }}
+          docker push ${{ env.DZ_IMAGE_REPO }}/validator-metadata-service-mock:${{ env.DZ_IMAGE_TAG }}
       - name: Discover tests and distribute across shards
         id: shard
         working-directory: e2e/
@@ -176,6 +179,8 @@ jobs:
           pull_with_retry ${{ env.DZ_IMAGE_REPO }}/client:${{ env.DZ_IMAGE_TAG }}
           pull_with_retry ${{ env.DZ_IMAGE_REPO }}/device-health-oracle:${{ env.DZ_IMAGE_TAG }}
           pull_with_retry ${{ env.DZ_IMAGE_REPO }}/geoprobe:${{ env.DZ_IMAGE_TAG }}
+          pull_with_retry ${{ env.DZ_IMAGE_REPO }}/sentinel:${{ env.DZ_IMAGE_TAG }}
+          pull_with_retry ${{ env.DZ_IMAGE_REPO }}/validator-metadata-service-mock:${{ env.DZ_IMAGE_TAG }}
           pull_with_retry quay.io/prometheus/prometheus:v2.54.1
           pull_with_retry public.ecr.aws/influxdb/influxdb:1.8
       - name: test

.github/workflows/flow_schema_migrations.yml

@@ -7,7 +7,6 @@ on:
   pull_request:
     paths:
       - "telemetry/flow-enricher/clickhouse/**"
-    branches: [ main, 'hotfix/**' ]
 
 jobs:
   validate:

.github/workflows/go.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main, 'hotfix/**' ]
   pull_request:
-    branches: [ main, 'hotfix/**' ]
 
 jobs:
   go-build:

.github/workflows/release.pipeline.validation.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main, 'hotfix/**' ]
   pull_request:
-    branches: [ main, 'hotfix/**' ]
 
 permissions:
   contents: write

.github/workflows/rust.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main, 'hotfix/**' ]
   pull_request:
-    branches: [ main, 'hotfix/**' ]
 
 jobs:
   rust-build:

.github/workflows/sdk.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main, 'hotfix/**' ]
   pull_request:
-    branches: [ main, 'hotfix/**' ]
 
 jobs:
   sdk-version-check:

.github/workflows/shreds-e2e.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches: [main, 'hotfix/**']
   pull_request:
-    branches: [main, 'hotfix/**']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}