534f179ee6
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.
111 lines
4.1 KiB
Python
111 lines
4.1 KiB
Python
"""The Fleet list must carry the asset alias.
|
|
|
|
The alias is what people actually call a PC ("Bay 3 Controller"); the hostname
|
|
is what DNS calls it. The PCs list has shown both for a long time, but the
|
|
Fleet list query never selected Asset.name, so the column could not be built
|
|
even though the data existed - it was missing rather than broken.
|
|
|
|
These pin the field on the payload and its inclusion in search, so the column
|
|
cannot quietly lose its source again.
|
|
"""
|
|
|
|
LIST_URL = '/api/endpoints/'
|
|
|
|
|
|
def _endpoint(db, hostname='fleetbox', alias='Bay 3 Controller'):
|
|
"""An Asset + Computer + EndpointState triple: one row on the fleet list.
|
|
|
|
The list joins through Computer and filters on Asset.isactive, so all three
|
|
are required for a row to appear at all.
|
|
"""
|
|
from shopdb.api import Asset, AssetType
|
|
from plugins.computers.models import Computer
|
|
from plugins.endpoints.models import EndpointState
|
|
|
|
assettype = AssetType.query.filter_by(assettype='computer').first()
|
|
if assettype is None:
|
|
assettype = AssetType(assettype='computer', pluginname='computers',
|
|
tablename='computers')
|
|
db.session.add(assettype)
|
|
db.session.flush()
|
|
|
|
asset = Asset(assetnumber=hostname, name=alias,
|
|
assettypeid=assettype.assettypeid, isactive=True)
|
|
db.session.add(asset)
|
|
db.session.flush()
|
|
db.session.add(Computer(assetid=asset.assetid, hostname=hostname))
|
|
db.session.add(EndpointState(assetid=asset.assetid, hostname=hostname))
|
|
db.session.commit()
|
|
return asset.assetid
|
|
|
|
|
|
def _rows(response):
|
|
return response.get_json()['data']
|
|
|
|
|
|
def test_the_fleet_list_carries_the_alias(client, db, auth_headers):
|
|
_endpoint(db)
|
|
|
|
response = client.get(LIST_URL, headers=auth_headers)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
rows = _rows(response)
|
|
assert len(rows) == 1
|
|
# Exposed as 'alias', not 'name': the row already has a hostname, and
|
|
# 'name' beside 'hostname' reads as a duplicate of the same thing.
|
|
assert rows[0]['alias'] == 'Bay 3 Controller'
|
|
|
|
|
|
def test_an_endpoint_without_an_alias_still_lists(client, db, auth_headers):
|
|
# The column renders '-' for these. A null must not drop the row or 500.
|
|
_endpoint(db, hostname='namelessbox', alias=None)
|
|
|
|
response = client.get(LIST_URL, headers=auth_headers)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
rows = _rows(response)
|
|
assert len(rows) == 1
|
|
assert rows[0]['alias'] is None
|
|
assert rows[0]['hostname'] == 'namelessbox'
|
|
|
|
|
|
def test_the_alias_is_searchable(client, db, auth_headers):
|
|
# Someone looking for a PC types what it is called, not its hostname.
|
|
_endpoint(db, hostname='pc-a', alias='Bay 3 Controller')
|
|
_endpoint(db, hostname='pc-b', alias='Paint Booth')
|
|
|
|
response = client.get(LIST_URL + '?search=Bay 3', headers=auth_headers)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
rows = _rows(response)
|
|
assert [r['hostname'] for r in rows] == ['pc-a']
|
|
|
|
|
|
def test_searching_by_hostname_still_works(client, db, auth_headers):
|
|
# The alias clause was added to an existing OR; prove it did not replace
|
|
# what was already there.
|
|
_endpoint(db, hostname='pc-a', alias='Bay 3 Controller')
|
|
_endpoint(db, hostname='pc-b', alias='Paint Booth')
|
|
|
|
response = client.get(LIST_URL + '?search=pc-b', headers=auth_headers)
|
|
|
|
assert response.status_code == 200, response.get_json()
|
|
rows = _rows(response)
|
|
assert [r['hostname'] for r in rows] == ['pc-b']
|
|
|
|
|
|
def test_the_row_keeps_its_other_columns(client, db, auth_headers):
|
|
# The alias was added mid-tuple in the query, so every following column
|
|
# shifted position. If that unpacking is wrong the values silently swap
|
|
# rather than raising.
|
|
_endpoint(db, hostname='fleetbox', alias='Bay 3 Controller')
|
|
|
|
response = client.get(LIST_URL, headers=auth_headers)
|
|
|
|
row = _rows(response)[0]
|
|
assert row['hostname'] == 'fleetbox'
|
|
assert row['assetnumber'] == 'fleetbox'
|
|
assert row['alias'] == 'Bay 3 Controller'
|
|
assert row['status'] in ('never', 'quiet', 'reporting')
|
|
assert 'computerid' in row and row['computerid'] is not None
|