Make main the lean product a site receives
main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
This commit is contained in:
cproudlock
57
.github/workflows/ci.yml
vendored
57
.github/workflows/ci.yml
vendored
@@ -88,9 +88,31 @@ jobs:
|
||||
- run: npm run build
|
||||
|
||||
lean-build:
|
||||
# ADR-013 Phase 5: prove a per-site build carries only its chosen plugins.
|
||||
# Builds a lean site (machines + printers) and asserts an omitted plugin's
|
||||
# code is absent from the bundle - the delete-a-plugin guarantee in CI.
|
||||
# ADR-013: prove a per-site build carries only its chosen plugins.
|
||||
#
|
||||
# The split below is SYNTHETIC, and deliberately so. Every plugin in this
|
||||
# repository ships on this line, so there is no "omitted" set to borrow from
|
||||
# a real site - and a job that iterated an empty omitted list would assert
|
||||
# nothing while staying green, which is the exact failure the omission
|
||||
# guarantee exists to catch. So the profile names a genuine SUBSET of the
|
||||
# bundled plugins and the assertions prove the SUBSETTING MECHANISM: what
|
||||
# the profile chooses is staged, and what it leaves out is not.
|
||||
#
|
||||
# Chosen (7): backups computers endpoints machines network notifications
|
||||
# printers
|
||||
# Omitted (5): guides knowledgebase slides tools warranty
|
||||
#
|
||||
# The omitted five are picked because nothing depends on them, so the
|
||||
# closure stays exactly the chosen set. 'applications' is manifest-less core
|
||||
# and ships in every build (ADR-013). endpoints hard-depends on computers,
|
||||
# which is already chosen, so the closure adds nothing - if that changes,
|
||||
# resolve_plugin_closure.py pulls the dependency in and the absence
|
||||
# assertions below start failing, which is the signal to update this list
|
||||
# rather than to loosen the check.
|
||||
#
|
||||
# Verified by planting a leak, per the standing rule that a green gate may
|
||||
# be vacuous: adding 'guides' to the profile and rebuilding makes both the
|
||||
# GuidesList assertion and the plugins/guides directory assertion fail.
|
||||
runs-on: arc-runner-set
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
@@ -100,21 +122,29 @@ jobs:
|
||||
cache: npm
|
||||
cache-dependency-path: frontend/package-lock.json
|
||||
- run: cd frontend && npm ci
|
||||
- name: Build lean site (machines + printers)
|
||||
- name: Build lean site (seven-plugin subset)
|
||||
run: |
|
||||
printf '{ "site": "ci-lean", "plugins": ["machines", "printers"] }' \
|
||||
printf '%s' '{ "site": "ci-lean", "plugins": ["backups", "computers", "endpoints", "machines", "network", "notifications", "printers"] }' \
|
||||
> /tmp/lean-profile.json
|
||||
bash scripts/build-site.sh /tmp/lean-profile.json /tmp/leansite
|
||||
- name: Assert omitted plugin code is absent, chosen present
|
||||
run: |
|
||||
assets=/tmp/leansite/frontend-dist/assets
|
||||
for code in PartsKiosk ManifestEditor USBLabelBatch KnowledgeBaseDetail; do
|
||||
# One component per OMITTED plugin: guides, knowledgebase, slides,
|
||||
# tools, warranty. Each name is proven to exist by the chosen-plugin
|
||||
# loop on a full build, so these are known-good grep targets rather
|
||||
# than strings that would pass by being misspelled.
|
||||
for code in GuidesList KnowledgeBaseDetail SlideManager ToolsIndex \
|
||||
WarrantiesList; do
|
||||
if grep -rqoh "$code" "$assets"/*.js; then
|
||||
echo "FAIL: omitted-plugin code '$code' leaked into the lean bundle"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
for code in MachineDetail PrinterDetail; do
|
||||
# One component per CHOSEN plugin, so a plugin silently dropped from
|
||||
# the bundle fails here instead of on the floor.
|
||||
for code in BackupHistory PCsList EndpointsList MachineDetail \
|
||||
NetworkDevicesList NotificationsList PrinterDetail; do
|
||||
grep -rqoh "$code" "$assets"/*.js || {
|
||||
echo "FAIL: chosen-plugin code '$code' missing from the lean bundle"
|
||||
exit 1; }
|
||||
@@ -124,8 +154,17 @@ jobs:
|
||||
grep -rqoh "ApplicationsList" "$assets"/*.js || {
|
||||
echo "FAIL: core page 'ApplicationsList' missing from the lean bundle"
|
||||
exit 1; }
|
||||
test -d /tmp/leansite/plugins/machines
|
||||
test ! -d /tmp/leansite/plugins/printedparts
|
||||
for plugin in backups computers endpoints machines network \
|
||||
notifications printers; do
|
||||
test -d "/tmp/leansite/plugins/$plugin" || {
|
||||
echo "FAIL: chosen plugin '$plugin' missing from the backend tree"
|
||||
exit 1; }
|
||||
done
|
||||
for plugin in guides knowledgebase slides tools warranty; do
|
||||
test ! -d "/tmp/leansite/plugins/$plugin" || {
|
||||
echo "FAIL: omitted plugin '$plugin' staged into the backend tree"
|
||||
exit 1; }
|
||||
done
|
||||
echo "lean build verified: only chosen plugins present"
|
||||
|
||||
# NOTE: the MySQL-8 migration/seed job (fresh `flask db upgrade` + every
|
||||
|
||||
32
.github/workflows/scan-darkwing-portable.yml
vendored
32
.github/workflows/scan-darkwing-portable.yml
vendored
@@ -1,32 +0,0 @@
|
||||
# Darkwing vulnerability scan, manual dispatch.
|
||||
#
|
||||
# Copied verbatim from the ge-aero/darkwing README so it stays byte-identical
|
||||
# to the sanctioned integration. Do not edit this file to add triggers or
|
||||
# gating - see scan-darkwing-pr.yml for that, which is ours to change.
|
||||
#
|
||||
# The file must sit on the default branch before a scan can run on ANY branch.
|
||||
name: Scan (darkwing, portable)
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
target_ref:
|
||||
description: Ref, branch, or sha of this repo to scan
|
||||
required: false
|
||||
type: string
|
||||
default: main
|
||||
|
||||
permissions:
|
||||
contents: read # checkout this repo via the ambient GITHUB_TOKEN
|
||||
security-events: write # SARIF upload to the Security tab
|
||||
actions: read # required by upload-sarif on private/internal repos
|
||||
|
||||
jobs:
|
||||
scan:
|
||||
runs-on: darkwing-scan
|
||||
steps:
|
||||
# @v1 is a moving tag pointing to the latest release that is compatible
|
||||
# with this workflow file.
|
||||
- uses: ge-aero/darkwing@v1
|
||||
with:
|
||||
target_ref: ${{ inputs.target_ref || 'main' }}
|
||||
62
.github/workflows/scan-darkwing-pr.yml
vendored
62
.github/workflows/scan-darkwing-pr.yml
vendored
@@ -1,62 +0,0 @@
|
||||
# Darkwing scan on pull requests, so the "check against darkwing" is a check
|
||||
# and not a thing somebody remembers to click.
|
||||
#
|
||||
# WHY THIS IS SEPARATE from scan-darkwing-portable.yml: that file is copied
|
||||
# byte-for-byte from the ge-aero/darkwing README and is left alone so it keeps
|
||||
# matching the sanctioned integration. Everything below is ours.
|
||||
#
|
||||
# THE TRAP THIS AVOIDS. The README workflow resolves its scan target as
|
||||
# `inputs.target_ref || 'main'`. On a pull_request event there are no inputs,
|
||||
# so that expression falls through to 'main' and the job scans the default
|
||||
# branch instead of the code under review - a green Darkwing check that never
|
||||
# looked at the change. Resolve the head SHA explicitly.
|
||||
#
|
||||
# Darkwing exits 0 whatever it finds (its own FAQ: "Does a finding fail my
|
||||
# build? No."), so a passing job means the scan RAN, not that the code is
|
||||
# clean. Findings land in Security -> Code scanning. Turning a finding into a
|
||||
# hard failure means reading findings.sarif ourselves; the commented step at
|
||||
# the bottom is the shape of that, deliberately left off until we have seen the
|
||||
# false-positive rate on this repo.
|
||||
name: Scan (darkwing, PR)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
security-events: write
|
||||
actions: read
|
||||
|
||||
# One scan per PR. A new push supersedes the old one rather than queueing a
|
||||
# second Bedrock spend against a diff nobody is reviewing any more.
|
||||
concurrency:
|
||||
group: darkwing-pr-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
scan:
|
||||
runs-on: darkwing-scan
|
||||
steps:
|
||||
- uses: ge-aero/darkwing@v1
|
||||
with:
|
||||
# The PR's head, NOT the default branch. See the note above.
|
||||
target_ref: ${{ github.event.pull_request.head.sha }}
|
||||
|
||||
# Gating, once the signal is trusted. Darkwing writes findings.sarif into
|
||||
# its work dir and attaches it as the `findings` artifact; this reads the
|
||||
# severities out and fails on error-level results only.
|
||||
#
|
||||
# - name: Fail on error-level findings
|
||||
# run: |
|
||||
# python - <<'PY'
|
||||
# import json, pathlib, sys
|
||||
# sarif = pathlib.Path('darkwing/findings.sarif')
|
||||
# if not sarif.is_file():
|
||||
# sys.exit('no findings.sarif: the scan did not produce results')
|
||||
# doc = json.loads(sarif.read_text())
|
||||
# bad = [r for run in doc.get('runs', [])
|
||||
# for r in run.get('results', [])
|
||||
# if r.get('level') == 'error']
|
||||
# if bad:
|
||||
# sys.exit(f'{len(bad)} error-level finding(s); see the Security tab')
|
||||
# PY
|
||||
Reference in New Issue
Block a user