Import the wilm agent store and WINC adoption work, with four fixes
Eleven commits from the sister site: a reversible Maximo/WINC machine-adoption import, a versioned agent binary store with upload and rollback, remote-BuildKit CI, tray version reporting, and UI fixes. Applied as a patch again - the published mirror rewrites hashes, so the branches have unrelated histories and git refuses to merge them. Reviewed by three agents before merging. Four things fixed here. THE PUBLISH WORKFLOW WAS DEAD. The new remote-BuildKit step in publish-images.yml sits at column 0 instead of indented under steps:, so the whole file is invalid YAML and GitHub would refuse it. Their entire GHCR distribution channel - which Start-ShopDBDev.ps1 and the compose files consume - was broken at the source and clearly never run. Indented; all five workflows now parse. THE IMPORT'S APPROVAL CHECK COULD NOT FAIL. commit() built the plan and the approval packet from the same upload and then asked the writer whether they matched, so packet_matches_plan compared a hash against itself. The documented contract - "a human approves a specific, frozen plan, and the writer can prove nothing drifted" - did not exist in the web path: an admin could preview file A and commit file B, gated only by the needs-create group NAMES they ticked. The preview's planhash is now required at commit and checked against a freshly rebuilt plan. Their tests committed without previewing, which is what let this through; they go through the real flow now, and three new tests pin it - all confirmed to fail with the check stubbed out. endpoints.agentpackage QUIETLY GREW. It used to mean "wrap the staged exe in a ZIP"; with the upload routes it also means "choose the executable every future package installs and runs as SYSTEM". Before this, staging needed filesystem access to the server. The permission description still said only "generate and download a package", so an admin granting it could not see what they were granting. Reworded. NOTHING RECORDED WHAT WAS STAGED, OR BY WHOM. The manifest held version, size and timestamp; re-uploading a version replaces the bytes in place under the same label. A sha256 of the stored file is now recorded, and the upload is audit-logged with it - after an incident there was previously no answer to who put that binary on the fleet. Also documented the nine new routes in docs/api-inventory.json (that gate cannot run on the mirror, so it falls to us at promotion time again), regenerated the spec and the project map, and kept our own docs where they conflicted: docs/ is scrubbed from the mirror, so their DEV-BUILD-TEST.md still had the dev-be channel mapping we corrected, and their PLUGIN-HOOKS.md was a new 45-line file rather than our 737-line canonical one. Their journal section is appended to ours. Contract version comes across as 0.30.0 for a genuinely additive surface. Suite 2369, frontend 324, gate green. Scope: product
This commit is contained in:
@@ -595,6 +595,134 @@ def import_asset_csvs():
|
||||
})
|
||||
|
||||
|
||||
def _winc_upload_text():
|
||||
"""Read the single uploaded WINC export as text, or (None, error_response)."""
|
||||
uploads = request.files.getlist('files')
|
||||
if not uploads:
|
||||
return None, error_response(ErrorCodes.VALIDATION_ERROR,
|
||||
'No export file was uploaded')
|
||||
upload = uploads[0]
|
||||
name = upload.filename or ''
|
||||
if not name.lower().endswith('.csv'):
|
||||
return None, error_response(ErrorCodes.VALIDATION_ERROR,
|
||||
'The WINC export must be a .csv file')
|
||||
try:
|
||||
return upload.read().decode('utf-8-sig'), None
|
||||
except (UnicodeDecodeError, OSError):
|
||||
return None, error_response(ErrorCodes.VALIDATION_ERROR,
|
||||
'Could not read %s as UTF-8 text' % name)
|
||||
|
||||
|
||||
@settings_bp.route('/asset-import/winc/preview', methods=['POST'])
|
||||
@require_role('admin')
|
||||
def winc_import_preview():
|
||||
"""Read-only WINC analysis: report what a commit would do. Writes nothing.
|
||||
|
||||
WINC (a Maximo-style asset dump) is not a canonical-CSV source: it updates
|
||||
existing machines only, needs acknowledgment before creating business units,
|
||||
and is reversible. This returns the approval packet the UI renders - counts,
|
||||
the business units it would create, and any unresolved values that block it.
|
||||
"""
|
||||
from shopdb.core.services.wincimport import preview, WincImportError
|
||||
|
||||
export_text, failure = _winc_upload_text()
|
||||
if failure is not None:
|
||||
return failure
|
||||
try:
|
||||
report = preview(export_text)
|
||||
except WincImportError as exc:
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, str(exc))
|
||||
finally:
|
||||
# A preview must leave nothing behind even though it only read: the
|
||||
# analyzer runs against the request-scoped session.
|
||||
db.session.rollback()
|
||||
return success_response(report)
|
||||
|
||||
|
||||
@settings_bp.route('/asset-import/winc/commit', methods=['POST'])
|
||||
@require_role('admin')
|
||||
def winc_import_commit():
|
||||
"""Apply a WINC plan reversibly. Requires acknowledgment for needs-create.
|
||||
|
||||
The 'acknowledge' form field is a comma-separated list of needs-create group
|
||||
names the admin confirmed (e.g. 'businessunit'). The whole write is one
|
||||
transaction recorded to the import journal, so it can be undone later.
|
||||
"""
|
||||
from shopdb.core.services.wincimport import commit as winc_commit
|
||||
from shopdb.core.services.wincimport import WincImportError
|
||||
|
||||
export_text, failure = _winc_upload_text()
|
||||
if failure is not None:
|
||||
return failure
|
||||
|
||||
acknowledge = [
|
||||
part.strip() for part in
|
||||
(request.form.get('acknowledge') or '').split(',') if part.strip()]
|
||||
|
||||
# The hash the PREVIEW returned. Required here, because without it the
|
||||
# writer's drift check compares a freshly built packet against the plan it
|
||||
# was built from and can never fail - so "the admin approved this plan"
|
||||
# meant only "the admin ticked these group names".
|
||||
planhash = (request.form.get('planhash') or '').strip()
|
||||
if not planhash:
|
||||
return error_response(
|
||||
ErrorCodes.VALIDATION_ERROR,
|
||||
'planhash is required: send the value the preview returned, so the '
|
||||
'commit can prove it is applying the plan that was approved.')
|
||||
|
||||
try:
|
||||
report = winc_commit(export_text, acknowledge=acknowledge,
|
||||
createdby=get_jwt_identity(), planhash=planhash)
|
||||
AuditLog.log(
|
||||
'imported', 'SiteAssets', entityname='winc-machine-adoption',
|
||||
changes={'batchid': report.get('batchid'),
|
||||
'rows': report.get('rowcount')})
|
||||
db.session.commit()
|
||||
except WincImportError as exc:
|
||||
db.session.rollback()
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, str(exc))
|
||||
except Exception:
|
||||
db.session.rollback()
|
||||
raise
|
||||
return success_response(report)
|
||||
|
||||
|
||||
@settings_bp.route('/asset-import/winc/batches', methods=['GET'])
|
||||
@require_role('admin')
|
||||
def winc_import_batches():
|
||||
"""List applied/undone WINC import batches, newest first (for the undo UI)."""
|
||||
from shopdb.core.services.wincimport import list_batches
|
||||
|
||||
return success_response({'batches': list_batches()})
|
||||
|
||||
|
||||
@settings_bp.route('/asset-import/winc/undo', methods=['POST'])
|
||||
@require_role('admin')
|
||||
def winc_import_undo():
|
||||
"""Reverse an applied WINC import batch by id. Conservative and reversible."""
|
||||
from shopdb.core.services.wincimport import undo as winc_undo
|
||||
|
||||
payload = request.get_json(silent=True) or {}
|
||||
batchid = (payload.get('batchid') or request.form.get('batchid') or '').strip()
|
||||
if not batchid:
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, 'A batchid is required')
|
||||
|
||||
try:
|
||||
result = winc_undo(batchid)
|
||||
AuditLog.log(
|
||||
'undone', 'SiteAssets', entityname='winc-machine-adoption',
|
||||
changes={'batchid': batchid, 'reverted': result['reverted'],
|
||||
'conflicts': len(result['conflicts'])})
|
||||
db.session.commit()
|
||||
except ValueError as exc:
|
||||
db.session.rollback()
|
||||
return error_response(ErrorCodes.VALIDATION_ERROR, str(exc))
|
||||
except Exception:
|
||||
db.session.rollback()
|
||||
raise
|
||||
return success_response(result)
|
||||
|
||||
|
||||
@settings_bp.route('', methods=['GET'])
|
||||
@jwt_required(optional=True)
|
||||
def list_settings():
|
||||
|
||||
Reference in New Issue
Block a user