Problem: the hexagonal refactor churns the backend tree for nine more phases; the UI delivery stack (web/ SPA, cmd/desktop Wails wrapper, compose/web image) must move to its own repo first so doc/layout rewrites land once on a backend-only tree. Change: - New repo git.hubris.network/dtoro/oikos-web (v0.33.0): web/, desktop/ (updateURL repointed to oikos-web releases), compose/, own CI (web + desktop jobs), own deploy script (CI-green gate, TOCTOU guard, version-tagged images, prune-to-3), own webhook receiver on :9798 + launchd unit, own compose project publishing the same 8091:80. - Cutover executed on mac-mini in order: oikos stack's web service stopped+removed, oikos-web project brought up on 8091; outer Caddy untouched (targets the published port) — serving + Authentik flow + /wails 404 quirk verified post-cutover. - Stripped from oikos: web/, cmd/desktop/, compose/web/, desktop CI workflow, ci.yml web job, Makefile ui/desktop/desktop-package/install targets, the compose web service, oikos-web from deploy.sh's fallback prune list; wails + go-keyring dropped from go.mod, vendor synced. - README / CONTRIBUTING / AGENTS.md / .agents dev+operations docs now point at the new repo; mbse + mascot design docs carry a path note. Risk: production SPA serving depends on the new pipeline now; rollback is versioned-image re-up of the old web service from a pre-split checkout (port 8091). Desktop builds installed before the split still check dtoro/oikos releases — one manual reinstall, noted in the oikos-web release notes. Verification: go vet, make test (race), make generate-check, golangci (no new findings; baseline down 400→365); post-cutover curls — localhost:8091 200, /wails/runtime.js 404, outer Caddy 302 Authentik.
126 lines
5.4 KiB
JavaScript
126 lines
5.4 KiB
JavaScript
'use strict';
|
|
|
|
var schema = {
|
|
additionalItems: subschema('additionalItems'),
|
|
items: subschema('items'),
|
|
contains: subschema('contains'),
|
|
additionalProperties: subschema('additionalProperties'),
|
|
propertyNames: subschema('propertyNames'),
|
|
not: subschema('not'),
|
|
allOf: [
|
|
subschema('allOf_0'),
|
|
subschema('allOf_1'),
|
|
{
|
|
items: [
|
|
subschema('items_0'),
|
|
subschema('items_1'),
|
|
]
|
|
}
|
|
],
|
|
anyOf: [
|
|
subschema('anyOf_0'),
|
|
subschema('anyOf_1'),
|
|
],
|
|
oneOf: [
|
|
subschema('oneOf_0'),
|
|
subschema('oneOf_1'),
|
|
],
|
|
definitions: {
|
|
foo: subschema('definitions_foo'),
|
|
bar: subschema('definitions_bar'),
|
|
},
|
|
properties: {
|
|
foo: subschema('properties_foo'),
|
|
bar: subschema('properties_bar'),
|
|
},
|
|
patternProperties: {
|
|
foo: subschema('patternProperties_foo'),
|
|
bar: subschema('patternProperties_bar'),
|
|
},
|
|
dependencies: {
|
|
foo: subschema('dependencies_foo'),
|
|
bar: subschema('dependencies_bar'),
|
|
},
|
|
required: ['foo', 'bar']
|
|
};
|
|
|
|
|
|
function subschema(keyword) {
|
|
var sch = {
|
|
properties: {},
|
|
additionalProperties: false,
|
|
additionalItems: false,
|
|
anyOf: [
|
|
{format: 'email'},
|
|
{format: 'hostname'}
|
|
]
|
|
};
|
|
sch.properties['foo_' + keyword] = {title: 'foo'};
|
|
sch.properties['bar_' + keyword] = {title: 'bar'};
|
|
return sch;
|
|
}
|
|
|
|
|
|
module.exports = {
|
|
schema: schema,
|
|
|
|
// schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex
|
|
expectedCalls: [[schema, '', schema, undefined, undefined, undefined, undefined]]
|
|
.concat(expectedCalls('additionalItems'))
|
|
.concat(expectedCalls('items'))
|
|
.concat(expectedCalls('contains'))
|
|
.concat(expectedCalls('additionalProperties'))
|
|
.concat(expectedCalls('propertyNames'))
|
|
.concat(expectedCalls('not'))
|
|
.concat(expectedCallsChild('allOf', 0))
|
|
.concat(expectedCallsChild('allOf', 1))
|
|
.concat([
|
|
[schema.allOf[2], '/allOf/2', schema, '', 'allOf', schema, 2],
|
|
[schema.allOf[2].items[0], '/allOf/2/items/0', schema, '/allOf/2', 'items', schema.allOf[2], 0],
|
|
[schema.allOf[2].items[0].properties.foo_items_0, '/allOf/2/items/0/properties/foo_items_0', schema, '/allOf/2/items/0', 'properties', schema.allOf[2].items[0], 'foo_items_0'],
|
|
[schema.allOf[2].items[0].properties.bar_items_0, '/allOf/2/items/0/properties/bar_items_0', schema, '/allOf/2/items/0', 'properties', schema.allOf[2].items[0], 'bar_items_0'],
|
|
[schema.allOf[2].items[0].anyOf[0], '/allOf/2/items/0/anyOf/0', schema, '/allOf/2/items/0', 'anyOf', schema.allOf[2].items[0], 0],
|
|
[schema.allOf[2].items[0].anyOf[1], '/allOf/2/items/0/anyOf/1', schema, '/allOf/2/items/0', 'anyOf', schema.allOf[2].items[0], 1],
|
|
|
|
[schema.allOf[2].items[1], '/allOf/2/items/1', schema, '/allOf/2', 'items', schema.allOf[2], 1],
|
|
[schema.allOf[2].items[1].properties.foo_items_1, '/allOf/2/items/1/properties/foo_items_1', schema, '/allOf/2/items/1', 'properties', schema.allOf[2].items[1], 'foo_items_1'],
|
|
[schema.allOf[2].items[1].properties.bar_items_1, '/allOf/2/items/1/properties/bar_items_1', schema, '/allOf/2/items/1', 'properties', schema.allOf[2].items[1], 'bar_items_1'],
|
|
[schema.allOf[2].items[1].anyOf[0], '/allOf/2/items/1/anyOf/0', schema, '/allOf/2/items/1', 'anyOf', schema.allOf[2].items[1], 0],
|
|
[schema.allOf[2].items[1].anyOf[1], '/allOf/2/items/1/anyOf/1', schema, '/allOf/2/items/1', 'anyOf', schema.allOf[2].items[1], 1]
|
|
])
|
|
.concat(expectedCallsChild('anyOf', 0))
|
|
.concat(expectedCallsChild('anyOf', 1))
|
|
.concat(expectedCallsChild('oneOf', 0))
|
|
.concat(expectedCallsChild('oneOf', 1))
|
|
.concat(expectedCallsChild('definitions', 'foo'))
|
|
.concat(expectedCallsChild('definitions', 'bar'))
|
|
.concat(expectedCallsChild('properties', 'foo'))
|
|
.concat(expectedCallsChild('properties', 'bar'))
|
|
.concat(expectedCallsChild('patternProperties', 'foo'))
|
|
.concat(expectedCallsChild('patternProperties', 'bar'))
|
|
.concat(expectedCallsChild('dependencies', 'foo'))
|
|
.concat(expectedCallsChild('dependencies', 'bar'))
|
|
};
|
|
|
|
|
|
function expectedCalls(keyword) {
|
|
return [
|
|
[schema[keyword], `/${keyword}`, schema, '', keyword, schema, undefined],
|
|
[schema[keyword].properties[`foo_${keyword}`], `/${keyword}/properties/foo_${keyword}`, schema, `/${keyword}`, 'properties', schema[keyword], `foo_${keyword}`],
|
|
[schema[keyword].properties[`bar_${keyword}`], `/${keyword}/properties/bar_${keyword}`, schema, `/${keyword}`, 'properties', schema[keyword], `bar_${keyword}`],
|
|
[schema[keyword].anyOf[0], `/${keyword}/anyOf/0`, schema, `/${keyword}`, 'anyOf', schema[keyword], 0],
|
|
[schema[keyword].anyOf[1], `/${keyword}/anyOf/1`, schema, `/${keyword}`, 'anyOf', schema[keyword], 1]
|
|
];
|
|
}
|
|
|
|
|
|
function expectedCallsChild(keyword, i) {
|
|
return [
|
|
[schema[keyword][i], `/${keyword}/${i}`, schema, '', keyword, schema, i],
|
|
[schema[keyword][i].properties[`foo_${keyword}_${i}`], `/${keyword}/${i}/properties/foo_${keyword}_${i}`, schema, `/${keyword}/${i}`, 'properties', schema[keyword][i], `foo_${keyword}_${i}`],
|
|
[schema[keyword][i].properties[`bar_${keyword}_${i}`], `/${keyword}/${i}/properties/bar_${keyword}_${i}`, schema, `/${keyword}/${i}`, 'properties', schema[keyword][i], `bar_${keyword}_${i}`],
|
|
[schema[keyword][i].anyOf[0], `/${keyword}/${i}/anyOf/0`, schema, `/${keyword}/${i}`, 'anyOf', schema[keyword][i], 0],
|
|
[schema[keyword][i].anyOf[1], `/${keyword}/${i}/anyOf/1`, schema, `/${keyword}/${i}`, 'anyOf', schema[keyword][i], 1]
|
|
];
|
|
}
|