From 71a35a6376c673efbe9ef0570c93bfb9a8cb22cd Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 12 Nov 2026 05:09:56 +0100 Subject: [PATCH] MV1: move contracts and sdk under modules/, importers follow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The delivery repository's contracts and SDK live under modules/ as mesh-delivery-contracts and mesh-delivery-sdk, their Go module paths renamed to match the folders (the TypeScript names already did), and every importer in mesh-delivery, mesh-catalog, mesh-host, mesh-tools and mesh-sdk follows in the same group: a design as it should be, one path per module, checked by the group's check building every importer. Builds: design 47 G §427, §88 Claude-Session: https://claude.ai/code/session_01NcbgfGKaxw984XyAPfLm4h --- contracts/go/clients/meshbuildsclient/go.mod | 5 --- .../clients/meshdeliverycheckerclient/go.mod | 8 ---- .../go/clients/meshdeliveryclient/go.mod | 8 ---- .../clients/meshpipelinerunnerclient/go.mod | 8 ---- .../go/seats/containerimageregistry/go.mod | 3 -- contracts/go/seats/git/go.mod | 3 -- contracts/go/seats/gopackageregistry/go.mod | 3 -- contracts/go/seats/meshartifactsweep/go.mod | 3 -- contracts/go/seats/meshbuilds/go.mod | 3 -- contracts/go/seats/meshcatalog/go.mod | 3 -- contracts/go/seats/meshdelivery/go.mod | 3 -- contracts/go/seats/meshdeliverychecker/go.mod | 3 -- contracts/go/seats/meshpipelinerunner/go.mod | 3 -- contracts/go/seats/meshwants/go.mod | 3 -- contracts/go/seats/nodebuildgo/go.mod | 3 -- contracts/go/seats/nodebuildimage/go.mod | 3 -- contracts/go/seats/nodebuildnode/go.mod | 3 -- contracts/go/seats/npmpackageregistry/go.mod | 3 -- contracts/go/seats/ociartifactregistry/go.mod | 3 -- modules/mesh-delivery-assigner/asks/asks.go | 6 +-- modules/mesh-delivery-assigner/asks/go.mod | 16 ++++---- .../mesh-delivery-assigner/askagain_tool.go | 2 +- .../cmd/mesh-delivery-assigner/buildended.go | 2 +- .../mesh-delivery-assigner/buildended_test.go | 2 +- .../cmd/mesh-delivery-assigner/composed.go | 2 +- .../cmd/mesh-delivery-assigner/graph_tools.go | 2 +- .../cmd/mesh-delivery-assigner/graphkept.go | 4 +- .../mesh-delivery-assigner/graphkept_test.go | 8 ++-- .../cmd/mesh-delivery-assigner/halves.go | 6 +-- .../cmd/mesh-delivery-assigner/inputs.go | 2 +- .../cmd/mesh-delivery-assigner/inputs_test.go | 2 +- .../integration_test.go | 12 +++--- .../cmd/mesh-delivery-assigner/outside.go | 4 +- .../mesh-delivery-assigner/outside_test.go | 4 +- .../cmd/mesh-delivery-assigner/pass.go | 6 +-- .../cmd/mesh-delivery-assigner/pass_test.go | 12 +++--- .../cmd/mesh-delivery-assigner/pipelines.go | 10 ++--- .../mesh-delivery-assigner/pipelines_test.go | 10 ++--- .../cmd/mesh-delivery-assigner/puts.go | 4 +- .../cmd/mesh-delivery-assigner/seat.go | 4 +- .../cmd/mesh-delivery-assigner/seat_tools.go | 2 +- .../mesh-delivery-assigner/seat_tools_test.go | 8 ++-- .../cmd/mesh-delivery-assigner/tools.go | 4 +- .../cmd/mesh-delivery-assigner/verbs.go | 2 +- .../cmd/mesh-delivery-assigner/wants_tools.go | 6 +-- .../cmd/mesh-delivery-assigner/world.go | 10 ++--- .../cmd/mesh-delivery-assigner/world_test.go | 6 +-- modules/mesh-delivery-assigner/go.mod | 36 ++++++++--------- .../internal/assign/askjson.go | 2 +- .../internal/assign/asks.go | 6 +-- .../internal/assign/asks_test.go | 6 +-- .../internal/assign/ended.go | 2 +- .../internal/assign/put.go | 4 +- .../internal/assign/seat.go | 2 +- .../internal/assign/verbs.go | 2 +- .../internal/assign/wants.go | 8 ++-- .../internal/assign/wants_test.go | 6 +-- .../internal/assigngraph/compute.go | 4 +- .../internal/assigngraph/graph_test.go | 6 +-- .../internal/assigngraph/keep.go | 2 +- .../internal/assigngraph/verbs.go | 2 +- .../internal/buckets/buckets.go | 6 +-- .../internal/judge/judge.go | 2 +- .../internal/judge/judge_test.go | 2 +- .../internal/puts/puts.go | 2 +- .../mesh-delivery-assigner/manifest_test.go | 2 +- .../mesh-delivery-builder/buildrun/asks.go | 2 +- .../buildrun/asks_integration_test.go | 2 +- .../buildrun/asks_test.go | 2 +- .../buildrun/buildseats.go | 2 +- .../mesh-delivery-builder/buildrun/choose.go | 2 +- .../buildrun/choose_test.go | 2 +- .../mesh-delivery-builder/buildrun/faults.go | 2 +- modules/mesh-delivery-builder/buildrun/go.mod | 6 +-- .../buildrun/heardends.go | 2 +- .../mesh-delivery-builder/buildrun/lostask.go | 2 +- .../buildrun/standing.go | 4 +- .../buildrun/standing_test.go | 2 +- .../mesh-delivery-builder/buildrun/steps.go | 2 +- .../buildrun/steps_resume_test.go | 2 +- .../buildrun/steps_test.go | 2 +- .../buildrun/toolchaingate.go | 6 +-- .../buildrun/toolchaingate_test.go | 4 +- .../buildrun/toolchains.go | 2 +- .../buildrun/toolchains_test.go | 2 +- .../mesh-delivery-builder/builds/builds.go | 14 +++---- .../builds/builds_test.go | 2 +- .../builds/forms/forms.go | 6 +-- modules/mesh-delivery-builder/builds/go.mod | 10 ++--- modules/mesh-delivery-builder/builds/log.go | 2 +- .../cmd/mesh-delivery-builder-tools/build.go | 4 +- .../mesh-delivery-builder-tools/build_test.go | 4 +- .../cmd/mesh-delivery-builder-tools/main.go | 6 +-- .../reservedname_test.go | 2 +- .../mesh-delivery-builder-tools/toolchains.go | 2 +- .../toolchains_test.go | 2 +- .../cmd/mesh-delivery-builder/catalog.go | 4 +- .../cmd/mesh-delivery-builder/catalog_test.go | 2 +- .../catalogholder_integration_test.go | 4 +- .../gone_integration_test.go | 2 +- .../cmd/mesh-delivery-builder/held.go | 2 +- .../mesh-delivery-builder/integration_test.go | 10 ++--- .../cmd/mesh-delivery-builder/main.go | 8 ++-- .../cmd/mesh-delivery-builder/names.go | 2 +- .../cmd/mesh-delivery-builder/refused_test.go | 2 +- .../cmd/mesh-delivery-builder/republish.go | 4 +- .../mesh-delivery-builder/republish_test.go | 8 ++-- .../cmd/mesh-delivery-builder/reserve.go | 6 +-- .../cmd/mesh-delivery-builder/reserve_test.go | 6 +-- .../cmd/mesh-delivery-builder/reservedverb.go | 4 +- .../reservedverb_test.go | 4 +- .../cmd/mesh-delivery-builder/seats.go | 8 ++-- .../cmd/mesh-delivery-builder/step.go | 6 +-- .../step_integration_test.go | 2 +- .../cmd/mesh-delivery-builder/stored.go | 2 +- .../cmd/mesh-delivery-builder/toolchains.go | 8 ++-- .../mesh-delivery-builder/toolchains_test.go | 2 +- .../cmd/mesh-delivery-builder/versions.go | 4 +- modules/mesh-delivery-builder/go.mod | 40 +++++++++---------- .../internal/build/askagain.go | 2 +- .../internal/build/askfake_test.go | 2 +- .../internal/build/buildread.go | 2 +- .../internal/build/candidates.go | 2 +- .../internal/build/entry_test.go | 2 +- .../internal/build/fakes_test.go | 2 +- .../internal/build/fixtures_test.go | 2 +- .../internal/build/followups_test.go | 4 +- .../internal/build/gone_test.go | 2 +- .../internal/build/imports_test.go | 2 +- .../internal/build/numbers.go | 6 +-- .../internal/build/queue.go | 2 +- .../internal/build/r4e_test.go | 6 +-- .../internal/build/reserve_test.go | 6 +-- .../internal/build/retake.go | 2 +- .../internal/build/retake_test.go | 2 +- .../internal/build/run.go | 12 +++--- .../internal/build/run_test.go | 6 +-- .../internal/build/step.go | 4 +- .../internal/build/step_test.go | 4 +- .../internal/build/stuck.go | 2 +- .../internal/build/toolchains.go | 4 +- .../internal/build/waits.go | 4 +- .../internal/versions/entrynames.go | 4 +- .../internal/versions/entrynames_test.go | 2 +- .../internal/versions/names.go | 2 +- .../internal/versions/oldform.go | 2 +- .../internal/versions/republish.go | 2 +- .../internal/versions/republish_test.go | 2 +- .../internal/versions/reserve.go | 4 +- .../internal/versions/reserve_test.go | 2 +- .../internal/versions/reservedname_test.go | 4 +- .../internal/versions/tools.go | 2 +- .../checkermsg/checkermsg.go | 2 +- .../mesh-delivery-checker/checkermsg/go.mod | 4 +- .../cmd/mesh-checking-program/main.go | 2 +- .../cmd/mesh-checking-program/main_test.go | 6 +-- .../cmd/mesh-delivery-checker-tools/main.go | 6 +-- .../mesh-delivery-checker-tools/main_test.go | 6 +-- .../cmd/mesh-delivery-checker/bus.go | 2 +- .../cmd/mesh-delivery-checker/engines.go | 8 ++-- .../cmd/mesh-delivery-checker/forge.go | 2 +- .../cmd/mesh-delivery-checker/forge_test.go | 4 +- .../mesh-delivery-checker/integration_test.go | 14 +++---- .../cmd/mesh-delivery-checker/judge.go | 6 +-- .../cmd/mesh-delivery-checker/judge_test.go | 6 +-- .../cmd/mesh-delivery-checker/main.go | 4 +- .../cmd/mesh-delivery-checker/packages.go | 4 +- .../cmd/mesh-delivery-checker/trunk.go | 2 +- .../cmd/mesh-delivery-checker/trunk_test.go | 2 +- .../mesh-delivery-checker/try_candidates.go | 4 +- modules/mesh-delivery-checker/go.mod | 32 +++++++-------- .../internal/check/adr548_test.go | 6 +-- .../internal/check/askagain.go | 8 ++-- .../internal/check/beside.go | 2 +- .../internal/check/binaries_test.go | 4 +- .../internal/check/bounded.go | 2 +- .../internal/check/build_change.go | 2 +- .../internal/check/builds.go | 4 +- .../internal/check/buildseats.go | 2 +- .../internal/check/case.go | 10 ++--- .../internal/check/checker.go | 12 +++--- .../internal/check/checker_test.go | 12 +++--- .../internal/check/composition_test.go | 8 ++-- .../internal/check/couldnotrun.go | 4 +- .../internal/check/declared.go | 2 +- .../internal/check/digestform_test.go | 4 +- .../internal/check/engines.go | 8 ++-- .../internal/check/engines_test.go | 14 +++---- .../internal/check/every_failure_test.go | 6 +-- .../internal/check/examiner_test.go | 10 ++--- .../internal/check/failure_words_test.go | 2 +- .../internal/check/gate_test.go | 2 +- .../internal/check/graph_edges.go | 4 +- .../internal/check/judge.go | 10 ++--- .../internal/check/judged_test.go | 4 +- .../internal/check/kept.go | 4 +- .../internal/check/kept_test.go | 6 +-- .../internal/check/line.go | 6 +-- .../internal/check/line_test.go | 8 ++-- .../internal/check/lostask.go | 6 +-- .../internal/check/lostask_test.go | 8 ++-- .../internal/check/manifests_judge.go | 10 ++--- .../internal/check/names.go | 4 +- .../internal/check/owed.go | 6 +-- .../internal/check/pins.go | 4 +- .../internal/check/pins_test.go | 10 ++--- .../internal/check/preview.go | 4 +- .../internal/check/programs.go | 6 +-- .../internal/check/rank_test.go | 8 ++-- .../internal/check/read.go | 10 ++--- .../internal/check/read_test.go | 10 ++--- .../internal/check/results.go | 2 +- .../internal/check/series.go | 2 +- .../internal/check/trunkview.go | 2 +- .../internal/check/try.go | 10 ++--- .../internal/check/try_test.go | 8 ++-- .../internal/check/verdictevent.go | 4 +- modules/mesh-delivery-checker/rules/facts.go | 6 +-- modules/mesh-delivery-checker/rules/judged.go | 10 ++--- modules/mesh-delivery-checker/rules/names.go | 2 +- .../mesh-delivery-checker/rules/results.go | 2 +- modules/mesh-delivery-checker/rules/seats.go | 2 +- modules/mesh-delivery-checker/rules/words.go | 6 +-- .../containerimageregistryclient/client.go | 4 +- .../client_test.go | 4 +- .../containerimageregistryclient}/go.mod | 6 +-- .../containerimageregistryclient/go.sum | 0 .../reference/reference.go | 0 .../reference/reference_test.go | 0 .../clients/gopackageregistryclient/client.go | 4 +- .../gopackageregistryclient/client_test.go | 4 +- .../go/clients/gopackageregistryclient/go.mod | 6 +-- .../go/clients/gopackageregistryclient/go.sum | 0 .../go/clients/meshbuildsclient/client.go | 2 +- .../clients/meshbuildsclient/client_test.go | 2 +- .../go/clients/meshbuildsclient/go.mod | 5 +++ .../go/clients/meshcatalogclient/branches.go | 4 +- .../meshcatalogclient/branches_test.go | 4 +- .../go/clients/meshcatalogclient/candidate.go | 2 +- .../go/clients/meshcatalogclient/catalog.go | 2 +- .../clients/meshcatalogclient/catalog_test.go | 2 +- .../meshcatalogclient/catalog_view_test.go | 2 +- .../go/clients/meshcatalogclient/entry.go | 2 +- .../clients/meshcatalogclient/entry_test.go | 2 +- .../clients/meshcatalogclient/fingerprint.go | 2 +- .../go/clients/meshcatalogclient/go.mod | 6 +-- .../go/clients/meshcatalogclient/go.sum | 0 .../clients/meshcatalogclient/imports_test.go | 0 .../go/clients/meshcatalogclient/manifest.go | 2 +- .../go/clients/meshcatalogclient/module.go | 4 +- .../meshcatalogclient/registrations.go | 4 +- .../meshcatalogclient/registrations_test.go | 2 +- .../go/clients/meshcatalogclient/verdict.go | 2 +- .../meshdeliverycheckerclient/client.go | 2 +- .../meshdeliverycheckerclient/client_test.go | 2 +- .../meshdeliverycheckerclient/codec.go | 2 +- .../clients/meshdeliverycheckerclient/go.mod | 8 ++++ .../meshdeliverycheckerclient/input.go | 2 +- .../go/clients/meshdeliveryclient/client.go | 2 +- .../clients/meshdeliveryclient/client_test.go | 2 +- .../go/clients/meshdeliveryclient/gate.go | 2 +- .../clients/meshdeliveryclient/gate_test.go | 2 +- .../go/clients/meshdeliveryclient/go.mod | 8 ++++ .../go/clients/meshdeliveryclient/go.sum | 0 .../go/clients/meshdeliveryclient/switched.go | 0 .../meshpipelinerunnerclient/client.go | 2 +- .../meshpipelinerunnerclient/client_test.go | 2 +- .../clients/meshpipelinerunnerclient/go.mod | 8 ++++ .../clients/meshpipelinerunnerclient/go.sum | 0 .../go/clients/meshwantsclient/assignment.go | 2 +- .../meshwantsclient/assignment_test.go | 2 +- .../go/clients/meshwantsclient/go.mod | 4 +- .../go/clients/meshwantsclient/go.sum | 0 .../go/clients/meshwantsclient/placed.go | 2 +- .../go/clients/meshwantsclient/wants.go | 2 +- .../go/clients/meshwantsclient/wants_test.go | 2 +- .../npmpackageregistryclient/client.go | 4 +- .../npmpackageregistryclient/client_test.go | 4 +- .../clients/npmpackageregistryclient/go.mod | 6 +-- .../clients/npmpackageregistryclient/go.sum | 0 .../ociartifactregistryclient/client.go | 4 +- .../ociartifactregistryclient/client_test.go | 4 +- .../clients/ociartifactregistryclient}/go.mod | 6 +-- .../clients/ociartifactregistryclient/go.sum | 0 .../seats/containerimageregistry/contract.go | 0 .../containerimageregistry/contract_test.go | 0 .../go/seats/containerimageregistry/go.mod | 3 ++ .../go/seats/git/contract.go | 0 .../go/seats/git/contract_test.go | 0 .../go/seats/git/go.mod | 3 ++ .../go/seats/gopackageregistry/contract.go | 0 .../seats/gopackageregistry/contract_test.go | 0 .../go/seats/gopackageregistry/go.mod | 3 ++ .../go/seats/meshartifactsweep/contract.go | 0 .../seats/meshartifactsweep/contract_test.go | 0 .../go/seats/meshartifactsweep/go.mod | 3 ++ .../go/seats/meshbuilds/contract.go | 0 .../go/seats/meshbuilds/contract_test.go | 0 .../go/seats/meshbuilds/go.mod | 3 ++ .../go/seats/meshcatalog/contract.go | 0 .../go/seats/meshcatalog/contract_test.go | 0 .../go/seats/meshcatalog/go.mod | 3 ++ .../go/seats/meshdelivery/contract.go | 0 .../go/seats/meshdelivery/contract_test.go | 0 .../go/seats/meshdelivery/go.mod | 3 ++ .../go/seats/meshdeliverychecker/contract.go | 0 .../meshdeliverychecker/contract_test.go | 0 .../go/seats/meshdeliverychecker/go.mod | 3 ++ .../go/seats/meshpipelinerunner/contract.go | 0 .../seats/meshpipelinerunner/contract_test.go | 0 .../go/seats/meshpipelinerunner/go.mod | 3 ++ .../go/seats/meshwants/contract.go | 0 .../go/seats/meshwants/contract_test.go | 0 .../go/seats/meshwants/go.mod | 3 ++ .../go/seats/nodebuildgo/contract.go | 0 .../go/seats/nodebuildgo/contract_test.go | 0 .../go/seats/nodebuildgo/go.mod | 3 ++ .../go/seats/nodebuildimage/contract.go | 0 .../go/seats/nodebuildimage/contract_test.go | 0 .../go/seats/nodebuildimage/go.mod | 3 ++ .../go/seats/nodebuildnode/contract.go | 0 .../go/seats/nodebuildnode/contract_test.go | 0 .../go/seats/nodebuildnode/go.mod | 3 ++ .../go/seats/npmpackageregistry/contract.go | 0 .../seats/npmpackageregistry/contract_test.go | 0 .../go/seats/npmpackageregistry/go.mod | 3 ++ .../go/seats/ociartifactregistry/contract.go | 0 .../ociartifactregistry/contract_test.go | 0 .../go/seats/ociartifactregistry/go.mod | 3 ++ .../mesh-delivery-contracts}/module.json | 0 .../parts/build-step.json | 0 .../parts/registry.json | 0 .../fixtures/events.json | 0 .../fixtures/states.json | 0 .../fixtures/verbs.json | 0 .../seats/container-image-registry/seat.json | 0 .../seats/git/fixtures/events.json | 0 .../seats/git/fixtures/states.json | 0 .../seats/git/fixtures/verbs.json | 0 .../seats/git/seat.json | 0 .../go-package-registry/fixtures/events.json | 0 .../go-package-registry/fixtures/verbs.json | 0 .../seats/go-package-registry/seat.json | 0 .../seats/mesh-artifact-store/seat.json | 0 .../mesh-artifact-sweep/fixtures/events.json | 0 .../mesh-artifact-sweep/fixtures/states.json | 0 .../mesh-artifact-sweep/fixtures/verbs.json | 0 .../seats/mesh-artifact-sweep/seat.json | 0 .../seats/mesh-builds/fixtures/events.json | 0 .../seats/mesh-builds/fixtures/verbs.json | 0 .../seats/mesh-builds/seat.json | 0 .../seats/mesh-catalog/fixtures/events.json | 0 .../seats/mesh-catalog/fixtures/states.json | 0 .../seats/mesh-catalog/fixtures/verbs.json | 0 .../seats/mesh-catalog/seat.json | 0 .../fixtures/events.json | 0 .../fixtures/states.json | 0 .../mesh-delivery-checker/fixtures/verbs.json | 0 .../seats/mesh-delivery-checker/seat.json | 0 .../seats/mesh-delivery/fixtures/events.json | 0 .../seats/mesh-delivery/fixtures/states.json | 0 .../seats/mesh-delivery/fixtures/verbs.json | 0 .../seats/mesh-delivery/seat.json | 0 .../mesh-pipeline-runner/fixtures/events.json | 0 .../mesh-pipeline-runner/fixtures/states.json | 0 .../mesh-pipeline-runner/fixtures/verbs.json | 0 .../seats/mesh-pipeline-runner/seat.json | 0 .../seats/mesh-wants/fixtures/events.json | 0 .../seats/mesh-wants/fixtures/states.json | 0 .../seats/mesh-wants/fixtures/verbs.json | 0 .../seats/mesh-wants/seat.json | 0 .../seats/node-build-go/fixtures/events.json | 0 .../seats/node-build-go/fixtures/states.json | 0 .../seats/node-build-go/fixtures/verbs.json | 0 .../seats/node-build-go/seat.json | 0 .../node-build-image/fixtures/events.json | 0 .../node-build-image/fixtures/states.json | 0 .../node-build-image/fixtures/verbs.json | 0 .../seats/node-build-image/seat.json | 0 .../node-build-node/fixtures/events.json | 0 .../node-build-node/fixtures/states.json | 0 .../seats/node-build-node/fixtures/verbs.json | 0 .../seats/node-build-node/seat.json | 0 .../npm-package-registry/fixtures/events.json | 0 .../npm-package-registry/fixtures/verbs.json | 0 .../seats/npm-package-registry/seat.json | 0 .../fixtures/events.json | 0 .../fixtures/states.json | 0 .../oci-artifact-registry/fixtures/verbs.json | 0 .../seats/oci-artifact-registry/seat.json | 0 .../seats/containerimageregistry/index.d.ts | 0 .../ts/seats/containerimageregistry/index.js | 0 .../containerimageregistry/package-lock.json | 0 .../seats/containerimageregistry/package.json | 0 .../parts/registry.d.ts | 0 .../containerimageregistry/parts/registry.js | 0 .../ts/seats/git/index.d.ts | 0 .../ts/seats/git/index.js | 0 .../ts/seats/git/package-lock.json | 0 .../ts/seats/git/package.json | 0 .../ts/seats/gopackageregistry/index.d.ts | 0 .../ts/seats/gopackageregistry/index.js | 0 .../seats/gopackageregistry/package-lock.json | 0 .../ts/seats/gopackageregistry/package.json | 0 .../gopackageregistry/parts/registry.d.ts | 0 .../seats/gopackageregistry/parts/registry.js | 0 .../ts/seats/meshartifactsweep/index.d.ts | 0 .../ts/seats/meshartifactsweep/index.js | 0 .../seats/meshartifactsweep/package-lock.json | 0 .../ts/seats/meshartifactsweep/package.json | 0 .../ts/seats/meshbuilds/index.d.ts | 0 .../ts/seats/meshbuilds/index.js | 0 .../ts/seats/meshbuilds/package-lock.json | 0 .../ts/seats/meshbuilds/package.json | 0 .../ts/seats/meshcatalog/index.d.ts | 0 .../ts/seats/meshcatalog/index.js | 0 .../ts/seats/meshcatalog/package-lock.json | 0 .../ts/seats/meshcatalog/package.json | 0 .../ts/seats/meshdelivery/index.d.ts | 0 .../ts/seats/meshdelivery/index.js | 0 .../ts/seats/meshdelivery/package-lock.json | 0 .../ts/seats/meshdelivery/package.json | 0 .../ts/seats/meshdeliverychecker/index.d.ts | 0 .../ts/seats/meshdeliverychecker/index.js | 0 .../meshdeliverychecker/package-lock.json | 0 .../ts/seats/meshdeliverychecker/package.json | 0 .../ts/seats/meshpipelinerunner/index.d.ts | 0 .../ts/seats/meshpipelinerunner/index.js | 0 .../meshpipelinerunner/package-lock.json | 0 .../ts/seats/meshpipelinerunner/package.json | 0 .../ts/seats/meshwants/index.d.ts | 0 .../ts/seats/meshwants/index.js | 0 .../ts/seats/meshwants/package-lock.json | 0 .../ts/seats/meshwants/package.json | 0 .../ts/seats/nodebuildgo/index.d.ts | 0 .../ts/seats/nodebuildgo/index.js | 0 .../ts/seats/nodebuildgo/package-lock.json | 0 .../ts/seats/nodebuildgo/package.json | 0 .../seats/nodebuildgo/parts/build-step.d.ts | 0 .../ts/seats/nodebuildgo/parts/build-step.js | 0 .../ts/seats/nodebuildimage/index.d.ts | 0 .../ts/seats/nodebuildimage/index.js | 0 .../ts/seats/nodebuildimage/package-lock.json | 0 .../ts/seats/nodebuildimage/package.json | 0 .../nodebuildimage/parts/build-step.d.ts | 0 .../seats/nodebuildimage/parts/build-step.js | 0 .../ts/seats/nodebuildnode/index.d.ts | 0 .../ts/seats/nodebuildnode/index.js | 0 .../ts/seats/nodebuildnode/package-lock.json | 0 .../ts/seats/nodebuildnode/package.json | 0 .../seats/nodebuildnode/parts/build-step.d.ts | 0 .../seats/nodebuildnode/parts/build-step.js | 0 .../ts/seats/npmpackageregistry/index.d.ts | 0 .../ts/seats/npmpackageregistry/index.js | 0 .../npmpackageregistry/package-lock.json | 0 .../ts/seats/npmpackageregistry/package.json | 0 .../npmpackageregistry/parts/registry.d.ts | 0 .../npmpackageregistry/parts/registry.js | 0 .../ts/seats/ociartifactregistry/index.d.ts | 0 .../ts/seats/ociartifactregistry/index.js | 0 .../ociartifactregistry/package-lock.json | 0 .../ts/seats/ociartifactregistry/package.json | 0 .../ociartifactregistry/parts/registry.d.ts | 0 .../ociartifactregistry/parts/registry.js | 0 .../mesh-delivery-forge-bridge-tools/main.go | 2 +- .../main_test.go | 6 +-- .../mesh-delivery-forge-bridge/gate_test.go | 6 +-- .../mesh-delivery-forge-bridge/groupask.go | 2 +- .../cmd/mesh-delivery-forge-bridge/groups.go | 2 +- .../mesh-delivery-forge-bridge/groups_test.go | 2 +- .../integration_test.go | 6 +-- .../cmd/mesh-delivery-forge-bridge/main.go | 6 +-- .../mesh-delivery-forge-bridge/main_test.go | 4 +- .../cmd/mesh-delivery-forge-bridge/open.go | 2 +- .../cmd/mesh-delivery-forge-bridge/owed.go | 8 ++-- .../forgemsg/forge.go | 4 +- .../forgemsg/forge_test.go | 2 +- .../forgemsg/go.mod | 6 +-- modules/mesh-delivery-forge-bridge/go.mod | 10 ++--- .../internal/bridge/bridge.go | 2 +- .../internal/bridge/bridge_test.go | 2 +- .../internal/bridge/call.go | 2 +- .../internal/bridge/forgemade.go | 2 +- .../internal/bridge/owed.go | 6 +-- .../internal/bridge/owed_test.go | 2 +- .../internal/bridge/tags.go | 2 +- .../internal/gitfixture/gitfixture.go | 4 +- .../internal/groups/groups.go | 6 +-- .../mesh-delivery-indexer-tools/catalog.go | 6 +-- .../cmd/mesh-delivery-indexer-tools/views.go | 4 +- .../cmd/mesh-delivery-indexer/buildmodules.go | 2 +- .../mesh-delivery-indexer/integration_test.go | 22 +++++----- .../cmd/mesh-delivery-indexer/main.go | 8 ++-- .../cmd/mesh-delivery-indexer/main_test.go | 2 +- .../cmd/mesh-delivery-indexer/named.go | 6 +-- .../cmd/mesh-delivery-indexer/named_events.go | 2 +- .../cmd/mesh-delivery-indexer/named_test.go | 2 +- .../cmd/mesh-delivery-indexer/objects.go | 2 +- .../packages_integration_test.go | 10 ++--- .../cmd/mesh-delivery-indexer/registry.go | 4 +- .../cmd/mesh-delivery-indexer/seatdefs.go | 2 +- .../cmd/mesh-delivery-indexer/series.go | 4 +- .../cmd/mesh-delivery-indexer/source.go | 2 +- .../cmd/mesh-delivery-indexer/steps.go | 2 +- .../mesh-delivery-indexer/toolchains_test.go | 2 +- .../cmd/mesh-delivery-indexer/verdicts.go | 2 +- .../cmd/mesh-delivery-indexer/versions.go | 8 ++-- .../cmd/mesh-delivery-indexer/views.go | 4 +- .../cmd/mesh-judge/main.go | 2 +- modules/mesh-delivery-indexer/go.mod | 32 +++++++-------- .../internal/fingerprint/fingerprint.go | 8 ++-- .../internal/fingerprint/fingerprint_test.go | 6 +-- .../internal/index/accepted.go | 4 +- .../internal/index/accepted_problems_test.go | 2 +- .../internal/index/artifacts.go | 4 +- .../internal/index/branch_builds.go | 4 +- .../internal/index/branch_builds_test.go | 4 +- .../internal/index/branch_take_in.go | 2 +- .../internal/index/branch_take_in_test.go | 4 +- .../internal/index/builds.go | 4 +- .../internal/index/bus_state.go | 2 +- .../index/candidate_manifests_test.go | 4 +- .../internal/index/candidate_values.go | 10 ++--- .../internal/index/candidates.go | 10 ++--- .../internal/index/catalog.go | 4 +- .../internal/index/catalog_branches_test.go | 2 +- .../internal/index/catalog_graph.go | 4 +- .../internal/index/catalog_graph_test.go | 6 +-- .../internal/index/catalog_revisions.go | 6 +-- .../internal/index/catalog_test.go | 4 +- .../internal/index/config_readers.go | 2 +- .../internal/index/control_records.go | 4 +- .../internal/index/control_records_test.go | 8 ++-- .../internal/index/domain.go | 2 +- .../internal/index/entry_verb.go | 2 +- .../internal/index/entry_verb_test.go | 2 +- .../internal/index/events.go | 2 +- .../internal/index/fingerprints.go | 2 +- .../internal/index/form.go | 6 +-- .../internal/index/graph.go | 6 +-- .../internal/index/imports.go | 6 +-- .../internal/index/imports_test.go | 6 +-- .../internal/index/index_test.go | 4 +- .../internal/index/inputs.go | 6 +-- .../internal/index/inputs_test.go | 4 +- .../internal/index/manifests.go | 4 +- .../internal/index/manifests_test.go | 2 +- .../internal/index/modules.go | 6 +-- .../internal/index/modules_test.go | 6 +-- .../internal/index/moves.go | 2 +- .../internal/index/named.go | 2 +- .../internal/index/named_test.go | 4 +- .../internal/index/newform_test.go | 2 +- .../internal/index/order.go | 2 +- .../internal/index/own.go | 6 +-- .../internal/index/package_users.go | 6 +-- .../internal/index/packages.go | 6 +-- .../internal/index/packages_values.go | 6 +-- .../internal/index/paths_backfill_test.go | 6 +-- .../internal/index/pending.go | 10 ++--- .../internal/index/pending_test.go | 6 +-- .../internal/index/pending_tools.go | 4 +- .../internal/index/previews.go | 12 +++--- .../internal/index/previews_test.go | 8 ++-- .../internal/index/previews_values.go | 4 +- .../internal/index/registered.go | 4 +- .../internal/index/registered_test.go | 4 +- .../internal/index/registrations.go | 4 +- .../internal/index/registrations_test.go | 4 +- .../internal/index/registrations_tools.go | 2 +- .../internal/index/remove_test.go | 4 +- .../internal/index/requirements.go | 2 +- .../internal/index/revision_tools.go | 2 +- .../internal/index/revision_verb.go | 2 +- .../internal/index/run_inputs.go | 4 +- .../internal/index/seatdefs.go | 6 +-- .../internal/index/seatsof.go | 2 +- .../internal/index/seed.go | 2 +- .../internal/index/seed_steps.go | 4 +- .../internal/index/seed_steps_test.go | 4 +- .../internal/index/series.go | 8 ++-- .../internal/index/source.go | 6 +-- .../internal/index/source_test.go | 2 +- .../internal/index/takein.go | 4 +- .../internal/index/taken.go | 2 +- .../internal/index/toolchains.go | 8 ++-- .../internal/index/toolchains_test.go | 10 ++--- .../internal/index/toolchains_values.go | 2 +- .../internal/index/trycandidates.go | 8 ++-- .../internal/index/verdicts.go | 4 +- .../internal/index/verdicts_test.go | 4 +- .../internal/index/versions.go | 4 +- .../internal/index/versions_edges.go | 6 +-- .../internal/index/versions_fill.go | 2 +- .../internal/index/versions_fill_edges.go | 4 +- .../internal/index/versions_test.go | 8 ++-- .../internal/index/views.go | 2 +- .../internal/index/wanted_names_test.go | 4 +- .../judge/busstate_test.go | 2 +- modules/mesh-delivery-indexer/judge/judge.go | 2 +- .../mesh-delivery-indexer/judge/judge_test.go | 2 +- .../judge/packagenames.go | 2 +- .../judge/packagenames_test.go | 2 +- .../mesh-delivery-indexer/manifest_test.go | 2 +- modules/mesh-delivery-indexer/takein/go.mod | 8 ++-- .../mesh-delivery-indexer/takein/takein.go | 2 +- .../takein/takein_test.go | 2 +- modules/mesh-delivery-indexer/takein/taken.go | 2 +- .../cmd/mesh-delivery-pipeline-tools/main.go | 2 +- .../cmd/mesh-delivery-pipeline/main.go | 2 +- .../run_integration_test.go | 6 +-- .../cmd/mesh-delivery-pipeline/start.go | 4 +- .../cmd/mesh-delivery-pipeline/steps.go | 6 +-- .../cmd/mesh-delivery-pipeline/verbs.go | 2 +- .../cmd/mesh-delivery-pipeline/verbs_test.go | 2 +- .../cmd/mesh-delivery-pipeline/views.go | 4 +- modules/mesh-delivery-pipeline/go.mod | 16 ++++---- .../internal/pipeline/approval.go | 2 +- .../internal/pipeline/bounds.go | 8 ++-- .../internal/pipeline/place.go | 14 +++---- .../internal/pipeline/place_test.go | 10 ++--- .../internal/pipeline/read.go | 2 +- .../internal/pipeline/read_test.go | 2 +- .../internal/pipeline/registrations.go | 4 +- .../internal/pipeline/registrations_test.go | 2 +- .../internal/pipeline/start.go | 10 ++--- .../internal/pipeline/start_test.go | 6 +-- .../internal/pipeline/steps.go | 12 +++--- .../internal/pipeline/steps_test.go | 6 +-- .../internal/pipeline/toolchain.go | 4 +- .../internal/pipeline/verbs.go | 8 ++-- .../internal/pipeline/verbs_test.go | 6 +-- .../mesh-delivery-pipeline/manifest_test.go | 4 +- .../buildrecord/buildrecord.go | 0 .../buildrecord/buildrecord_test.go | 0 .../testdata/build-record-build-agent.json | 0 .../mesh-delivery-sdk}/buildrun/keys_test.go | 2 +- .../mesh-delivery-sdk}/buildrun/stale.go | 2 +- .../mesh-delivery-sdk}/buildrun/stale_test.go | 2 +- .../mesh-delivery-sdk}/buildstep/ask.go | 0 .../mesh-delivery-sdk}/buildstep/ask_test.go | 4 +- .../buildstep/busfree_test.go | 0 .../mesh-delivery-sdk}/buildstep/capacity.go | 0 .../mesh-delivery-sdk}/buildstep/doc.go | 0 .../mesh-delivery-sdk}/buildstep/failure.go | 0 .../mesh-delivery-sdk}/buildstep/helpers.go | 0 .../buildstep/keptartifact.go | 0 .../mesh-delivery-sdk}/buildstep/launchers.go | 0 .../buildstep/launchers_test.go | 0 .../mesh-delivery-sdk}/buildstep/passing.go | 0 .../mesh-delivery-sdk}/buildstep/pause.go | 0 .../buildstep/pipelinestep.go | 0 .../mesh-delivery-sdk}/buildstep/request.go | 0 .../buildstep/request_test.go | 0 .../mesh-delivery-sdk}/buildstep/run.go | 0 .../buildstep/seat_acts_test.go | 2 +- .../mesh-delivery-sdk}/buildstep/step.go | 0 .../mesh-delivery-sdk}/buildstep/step_test.go | 0 .../mesh-delivery-sdk}/buildstep/steps.go | 0 .../mesh-delivery-sdk}/buildstep/toolchain.go | 0 .../buildstep/toolchain_test.go | 2 +- .../buildstep/toolchains.go | 0 .../buildstep/toolchains_test.go | 0 .../mesh-delivery-sdk}/buildstep/trees.go | 0 .../mesh-delivery-sdk}/catalogkey/key.go | 0 .../mesh-delivery-sdk}/catalogkey/key_test.go | 0 .../mesh-delivery-sdk}/composer/composer.go | 0 .../composer/composer_test.go | 0 .../mesh-delivery-sdk}/forgekey/forgekey.go | 0 .../forgekey/forgekey_test.go | 0 {sdk => modules/mesh-delivery-sdk}/go.mod | 6 +-- {sdk => modules/mesh-delivery-sdk}/go.sum | 0 .../mesh-delivery-sdk}/graph/entry.go | 2 +- .../mesh-delivery-sdk}/graph/graph.go | 4 +- .../mesh-delivery-sdk}/graph/graph_test.go | 2 +- .../mesh-delivery-sdk}/graph/reads.go | 0 .../mesh-delivery-sdk}/graph/waits.go | 0 .../grouppackages/grouppackages.go | 4 +- .../mesh-delivery-sdk}/kept/kept.go | 0 .../mesh-delivery-sdk}/kept/kept_test.go | 0 .../mesh-delivery-sdk}/manifest_test.go | 0 .../mesh-delivery-sdk}/module.json | 0 .../packagename/packagename.go | 2 +- .../mesh-delivery-sdk}/parts/bus.go | 0 .../mesh-delivery-sdk}/parts/parts.go | 0 .../mesh-delivery-sdk}/parts/parts_test.go | 0 .../mesh-delivery-sdk}/parts/receive.go | 0 .../mesh-delivery-sdk}/parts/receive_test.go | 0 .../mesh-delivery-sdk}/seatdefs/domain.go | 0 .../mesh-delivery-sdk}/seatdefs/seatdefs.go | 2 +- .../sourcebranches/sourcebranches.go | 2 +- .../mesh-delivery-sdk}/trunk/packages.go | 0 .../mesh-delivery-sdk}/trunk/trunk.go | 0 .../mesh-delivery-sdk}/trunk/trunk_test.go | 2 +- .../mesh-delivery-sdk}/window/window.go | 0 .../mesh-delivery-sdk}/window/window_test.go | 0 .../cmd/mesh-delivery-teller/assignerasks.go | 2 +- .../mesh-delivery-teller/assignerasks_test.go | 2 +- .../mesh-delivery-teller/integration_test.go | 2 +- .../cmd/mesh-delivery-teller/room_test.go | 2 +- .../cmd/mesh-delivery-teller/teller.go | 2 +- .../cmd/mesh-delivery-teller/teller_test.go | 4 +- .../cmd/mesh-delivery-teller/viewanswers.go | 2 +- .../mesh-delivery-teller/viewanswers_test.go | 2 +- modules/mesh-delivery-teller/go.mod | 18 ++++----- .../internal/ends/ends.go | 2 +- .../cmd/mesh-delivery-cli/main_test.go | 10 ++--- .../mesh-delivery-view-tools/catalogread.go | 2 +- .../cmd/mesh-delivery-view-tools/main.go | 2 +- .../mesh-delivery-view-tools/owners_test.go | 6 +-- .../tiers_rows_test.go | 8 ++-- .../mesh-delivery-view/integration_test.go | 12 +++--- .../cmd/mesh-delivery-view/main.go | 4 +- modules/mesh-delivery-view/go.mod | 22 +++++----- .../internal/view/answers_test.go | 2 +- .../internal/view/asks_test.go | 4 +- .../internal/view/backlog.go | 2 +- .../internal/view/backlog_test.go | 2 +- .../internal/view/catalog.go | 4 +- .../view/fingerprints_newform_test.go | 2 +- .../internal/view/fingerprints_test.go | 6 +-- .../internal/view/history.go | 4 +- .../mesh-delivery-view/internal/view/holds.go | 4 +- .../internal/view/holds_test.go | 6 +-- .../internal/view/motion.go | 2 +- .../mesh-delivery-view/internal/view/names.go | 6 +-- .../mesh-delivery-view/internal/view/reach.go | 8 ++-- .../internal/view/reach_test.go | 12 +++--- .../mesh-delivery-view/internal/view/read.go | 8 ++-- .../internal/view/status.go | 2 +- .../mesh-delivery-view/internal/view/tiers.go | 8 ++-- .../mesh-delivery-view/internal/view/usage.go | 4 +- .../mesh-delivery-view/internal/view/view.go | 14 +++---- .../internal/view/view_test.go | 4 +- .../internal/view/wants_test.go | 10 ++--- modules/mesh-delivery-view/manifest_test.go | 4 +- .../mesh-delivery-view/viewstate/answerkey.go | 2 +- modules/mesh-delivery-view/viewstate/go.mod | 18 ++++----- modules/mesh-delivery-view/viewstate/reach.go | 2 +- .../viewstate/viewstate_test.go | 2 +- .../cmd/mesh-delivery-watchman/consumes.go | 10 ++--- .../integration_test.go | 6 +-- modules/mesh-delivery-watchman/go.mod | 26 ++++++------ .../internal/watch/busstate.go | 2 +- .../internal/watch/findings_test.go | 6 +-- .../internal/watch/mirror.go | 8 ++-- .../internal/watch/pipelines.go | 4 +- .../internal/watch/pipelines_test.go | 4 +- .../internal/watch/records.go | 2 +- .../internal/watch/verdicts.go | 2 +- .../internal/watch/waits.go | 2 +- .../internal/watch/waits_test.go | 2 +- .../internal/watch/watch_test.go | 4 +- .../cmd/mesh-grants/integration_test.go | 4 +- modules/mesh-grants/cmd/mesh-grants/main.go | 4 +- modules/mesh-grants/go.mod | 16 ++++---- modules/mesh-grants/grants_test.go | 6 +-- modules/mesh-grants/grantsstate/go.mod | 14 +++---- modules/mesh-grants/grantsstate/grants.go | 2 +- modules/mesh-grants/grantsstate/userlist.go | 2 +- .../internal/buscompose/buildbacklog.go | 2 +- .../internal/buscompose/buscompose_test.go | 2 +- .../mesh-grants/internal/grants/catalog.go | 6 +-- .../mesh-grants/internal/grants/firstviews.go | 4 +- modules/mesh-grants/internal/grants/grants.go | 2 +- modules/mesh-grants/internal/grants/inputs.go | 6 +-- .../mesh-grants/internal/grants/rootfree.go | 2 +- modules/mesh-grants/internal/grants/tools.go | 2 +- .../internal/grants/wantedkeep_test.go | 2 +- 769 files changed, 1277 insertions(+), 1277 deletions(-) delete mode 100644 contracts/go/clients/meshbuildsclient/go.mod delete mode 100644 contracts/go/clients/meshdeliverycheckerclient/go.mod delete mode 100644 contracts/go/clients/meshdeliveryclient/go.mod delete mode 100644 contracts/go/clients/meshpipelinerunnerclient/go.mod delete mode 100644 contracts/go/seats/containerimageregistry/go.mod delete mode 100644 contracts/go/seats/git/go.mod delete mode 100644 contracts/go/seats/gopackageregistry/go.mod delete mode 100644 contracts/go/seats/meshartifactsweep/go.mod delete mode 100644 contracts/go/seats/meshbuilds/go.mod delete mode 100644 contracts/go/seats/meshcatalog/go.mod delete mode 100644 contracts/go/seats/meshdelivery/go.mod delete mode 100644 contracts/go/seats/meshdeliverychecker/go.mod delete mode 100644 contracts/go/seats/meshpipelinerunner/go.mod delete mode 100644 contracts/go/seats/meshwants/go.mod delete mode 100644 contracts/go/seats/nodebuildgo/go.mod delete mode 100644 contracts/go/seats/nodebuildimage/go.mod delete mode 100644 contracts/go/seats/nodebuildnode/go.mod delete mode 100644 contracts/go/seats/npmpackageregistry/go.mod delete mode 100644 contracts/go/seats/ociartifactregistry/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/clients/containerimageregistryclient/client.go (94%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/containerimageregistryclient/client_test.go (91%) rename {contracts/go/clients/ociartifactregistryclient => modules/mesh-delivery-contracts/go/clients/containerimageregistryclient}/go.mod (53%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/containerimageregistryclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/containerimageregistryclient/reference/reference.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/containerimageregistryclient/reference/reference_test.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/gopackageregistryclient/client.go (94%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/gopackageregistryclient/client_test.go (92%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/gopackageregistryclient/go.mod (53%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/gopackageregistryclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshbuildsclient/client.go (96%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshbuildsclient/client_test.go (96%) create mode 100644 modules/mesh-delivery-contracts/go/clients/meshbuildsclient/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/branches.go (98%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/branches_test.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/candidate.go (96%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/catalog.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/catalog_test.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/catalog_view_test.go (98%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/entry.go (98%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/entry_test.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/fingerprint.go (92%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/go.mod (53%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/imports_test.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/manifest.go (96%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/module.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/registrations.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/registrations_test.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshcatalogclient/verdict.go (98%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliverycheckerclient/client.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliverycheckerclient/client_test.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliverycheckerclient/codec.go (98%) create mode 100644 modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliverycheckerclient/input.go (95%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/client.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/client_test.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/gate.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/gate_test.go (99%) create mode 100644 modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshdeliveryclient/switched.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshpipelinerunnerclient/client.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshpipelinerunnerclient/client_test.go (95%) create mode 100644 modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshpipelinerunnerclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/assignment.go (98%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/assignment_test.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/go.mod (62%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/placed.go (97%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/wants.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/meshwantsclient/wants_test.go (99%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/npmpackageregistryclient/client.go (94%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/npmpackageregistryclient/client_test.go (92%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/npmpackageregistryclient/go.mod (53%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/npmpackageregistryclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/ociartifactregistryclient/client.go (94%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/ociartifactregistryclient/client_test.go (92%) rename {contracts/go/clients/containerimageregistryclient => modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient}/go.mod (53%) rename {contracts => modules/mesh-delivery-contracts}/go/clients/ociartifactregistryclient/go.sum (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/containerimageregistry/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/containerimageregistry/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/containerimageregistry/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/git/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/git/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/git/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/gopackageregistry/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/gopackageregistry/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/gopackageregistry/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshartifactsweep/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshartifactsweep/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshartifactsweep/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshbuilds/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshbuilds/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshbuilds/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshcatalog/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshcatalog/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshcatalog/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshdelivery/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshdelivery/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshdelivery/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshdeliverychecker/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshdeliverychecker/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshpipelinerunner/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshpipelinerunner/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshwants/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/meshwants/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/meshwants/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildgo/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildgo/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/nodebuildgo/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildimage/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildimage/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/nodebuildimage/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildnode/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/nodebuildnode/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/nodebuildnode/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/npmpackageregistry/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/npmpackageregistry/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/npmpackageregistry/go.mod rename {contracts => modules/mesh-delivery-contracts}/go/seats/ociartifactregistry/contract.go (100%) rename {contracts => modules/mesh-delivery-contracts}/go/seats/ociartifactregistry/contract_test.go (100%) create mode 100644 modules/mesh-delivery-contracts/go/seats/ociartifactregistry/go.mod rename {contracts => modules/mesh-delivery-contracts}/module.json (100%) rename {contracts => modules/mesh-delivery-contracts}/parts/build-step.json (100%) rename {contracts => modules/mesh-delivery-contracts}/parts/registry.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/container-image-registry/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/container-image-registry/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/container-image-registry/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/container-image-registry/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/git/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/git/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/git/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/git/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/go-package-registry/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/go-package-registry/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/go-package-registry/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-artifact-store/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-artifact-sweep/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-artifact-sweep/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-artifact-sweep/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-artifact-sweep/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-builds/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-builds/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-builds/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-catalog/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-catalog/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-catalog/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-catalog/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery-checker/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery-checker/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery-checker/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery-checker/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-delivery/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-pipeline-runner/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-pipeline-runner/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-pipeline-runner/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-pipeline-runner/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-wants/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-wants/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-wants/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/mesh-wants/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-go/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-go/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-go/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-go/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-image/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-image/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-image/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-image/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-node/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-node/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-node/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/node-build-node/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/npm-package-registry/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/npm-package-registry/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/npm-package-registry/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/oci-artifact-registry/fixtures/events.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/oci-artifact-registry/fixtures/states.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/oci-artifact-registry/fixtures/verbs.json (100%) rename {contracts => modules/mesh-delivery-contracts}/seats/oci-artifact-registry/seat.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/parts/registry.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/containerimageregistry/parts/registry.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/git/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/git/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/git/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/git/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/parts/registry.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/gopackageregistry/parts/registry.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshartifactsweep/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshartifactsweep/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshartifactsweep/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshartifactsweep/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshbuilds/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshbuilds/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshbuilds/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshbuilds/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshcatalog/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshcatalog/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshcatalog/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshcatalog/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdelivery/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdelivery/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdelivery/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdelivery/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdeliverychecker/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdeliverychecker/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdeliverychecker/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshdeliverychecker/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshpipelinerunner/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshpipelinerunner/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshpipelinerunner/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshpipelinerunner/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshwants/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshwants/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshwants/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/meshwants/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/parts/build-step.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildgo/parts/build-step.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/parts/build-step.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildimage/parts/build-step.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/parts/build-step.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/nodebuildnode/parts/build-step.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/parts/registry.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/npmpackageregistry/parts/registry.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/index.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/index.js (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/package-lock.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/package.json (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/parts/registry.d.ts (100%) rename {contracts => modules/mesh-delivery-contracts}/ts/seats/ociartifactregistry/parts/registry.js (100%) rename {sdk => modules/mesh-delivery-sdk}/buildrecord/buildrecord.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildrecord/buildrecord_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildrecord/testdata/build-record-build-agent.json (100%) rename {sdk => modules/mesh-delivery-sdk}/buildrun/keys_test.go (93%) rename {sdk => modules/mesh-delivery-sdk}/buildrun/stale.go (99%) rename {sdk => modules/mesh-delivery-sdk}/buildrun/stale_test.go (99%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/ask.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/ask_test.go (99%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/busfree_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/capacity.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/doc.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/failure.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/helpers.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/keptartifact.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/launchers.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/launchers_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/passing.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/pause.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/pipelinestep.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/request.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/request_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/run.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/seat_acts_test.go (86%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/step.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/step_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/steps.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/toolchain.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/toolchain_test.go (95%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/toolchains.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/toolchains_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/buildstep/trees.go (100%) rename {sdk => modules/mesh-delivery-sdk}/catalogkey/key.go (100%) rename {sdk => modules/mesh-delivery-sdk}/catalogkey/key_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/composer/composer.go (100%) rename {sdk => modules/mesh-delivery-sdk}/composer/composer_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/forgekey/forgekey.go (100%) rename {sdk => modules/mesh-delivery-sdk}/forgekey/forgekey_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/go.mod (58%) rename {sdk => modules/mesh-delivery-sdk}/go.sum (100%) rename {sdk => modules/mesh-delivery-sdk}/graph/entry.go (91%) rename {sdk => modules/mesh-delivery-sdk}/graph/graph.go (99%) rename {sdk => modules/mesh-delivery-sdk}/graph/graph_test.go (99%) rename {sdk => modules/mesh-delivery-sdk}/graph/reads.go (100%) rename {sdk => modules/mesh-delivery-sdk}/graph/waits.go (100%) rename {sdk => modules/mesh-delivery-sdk}/grouppackages/grouppackages.go (94%) rename {sdk => modules/mesh-delivery-sdk}/kept/kept.go (100%) rename {sdk => modules/mesh-delivery-sdk}/kept/kept_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/manifest_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/module.json (100%) rename {sdk => modules/mesh-delivery-sdk}/packagename/packagename.go (96%) rename {sdk => modules/mesh-delivery-sdk}/parts/bus.go (100%) rename {sdk => modules/mesh-delivery-sdk}/parts/parts.go (100%) rename {sdk => modules/mesh-delivery-sdk}/parts/parts_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/parts/receive.go (100%) rename {sdk => modules/mesh-delivery-sdk}/parts/receive_test.go (100%) rename {sdk => modules/mesh-delivery-sdk}/seatdefs/domain.go (100%) rename {sdk => modules/mesh-delivery-sdk}/seatdefs/seatdefs.go (98%) rename {sdk => modules/mesh-delivery-sdk}/sourcebranches/sourcebranches.go (97%) rename {sdk => modules/mesh-delivery-sdk}/trunk/packages.go (100%) rename {sdk => modules/mesh-delivery-sdk}/trunk/trunk.go (100%) rename {sdk => modules/mesh-delivery-sdk}/trunk/trunk_test.go (98%) rename {sdk => modules/mesh-delivery-sdk}/window/window.go (100%) rename {sdk => modules/mesh-delivery-sdk}/window/window_test.go (100%) diff --git a/contracts/go/clients/meshbuildsclient/go.mod b/contracts/go/clients/meshbuildsclient/go.mod deleted file mode 100644 index f28889ab..00000000 --- a/contracts/go/clients/meshbuildsclient/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshbuildsclient - -go 1.26.0 - -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 diff --git a/contracts/go/clients/meshdeliverycheckerclient/go.mod b/contracts/go/clients/meshdeliverycheckerclient/go.mod deleted file mode 100644 index ba6062bf..00000000 --- a/contracts/go/clients/meshdeliverycheckerclient/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient - -go 1.26.0 - -require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 -) diff --git a/contracts/go/clients/meshdeliveryclient/go.mod b/contracts/go/clients/meshdeliveryclient/go.mod deleted file mode 100644 index 7b85ffc7..00000000 --- a/contracts/go/clients/meshdeliveryclient/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient - -go 1.26.0 - -require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 -) diff --git a/contracts/go/clients/meshpipelinerunnerclient/go.mod b/contracts/go/clients/meshpipelinerunnerclient/go.mod deleted file mode 100644 index cb8aa7cc..00000000 --- a/contracts/go/clients/meshpipelinerunnerclient/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshpipelinerunnerclient - -go 1.26.0 - -require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 -) diff --git a/contracts/go/seats/containerimageregistry/go.mod b/contracts/go/seats/containerimageregistry/go.mod deleted file mode 100644 index 26ccf02f..00000000 --- a/contracts/go/seats/containerimageregistry/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry - -go 1.26.0 diff --git a/contracts/go/seats/git/go.mod b/contracts/go/seats/git/go.mod deleted file mode 100644 index 1f36d290..00000000 --- a/contracts/go/seats/git/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/git - -go 1.26.0 diff --git a/contracts/go/seats/gopackageregistry/go.mod b/contracts/go/seats/gopackageregistry/go.mod deleted file mode 100644 index 065f758b..00000000 --- a/contracts/go/seats/gopackageregistry/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry - -go 1.26.0 diff --git a/contracts/go/seats/meshartifactsweep/go.mod b/contracts/go/seats/meshartifactsweep/go.mod deleted file mode 100644 index 77f0649b..00000000 --- a/contracts/go/seats/meshartifactsweep/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep - -go 1.26.0 diff --git a/contracts/go/seats/meshbuilds/go.mod b/contracts/go/seats/meshbuilds/go.mod deleted file mode 100644 index 784ddfa7..00000000 --- a/contracts/go/seats/meshbuilds/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds - -go 1.26.0 diff --git a/contracts/go/seats/meshcatalog/go.mod b/contracts/go/seats/meshcatalog/go.mod deleted file mode 100644 index e6fd10a2..00000000 --- a/contracts/go/seats/meshcatalog/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog - -go 1.26.0 diff --git a/contracts/go/seats/meshdelivery/go.mod b/contracts/go/seats/meshdelivery/go.mod deleted file mode 100644 index 12356bcf..00000000 --- a/contracts/go/seats/meshdelivery/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery - -go 1.26.0 diff --git a/contracts/go/seats/meshdeliverychecker/go.mod b/contracts/go/seats/meshdeliverychecker/go.mod deleted file mode 100644 index d50dcda1..00000000 --- a/contracts/go/seats/meshdeliverychecker/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker - -go 1.26.0 diff --git a/contracts/go/seats/meshpipelinerunner/go.mod b/contracts/go/seats/meshpipelinerunner/go.mod deleted file mode 100644 index 6ca3dc30..00000000 --- a/contracts/go/seats/meshpipelinerunner/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner - -go 1.26.0 diff --git a/contracts/go/seats/meshwants/go.mod b/contracts/go/seats/meshwants/go.mod deleted file mode 100644 index edcaa257..00000000 --- a/contracts/go/seats/meshwants/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants - -go 1.26.0 diff --git a/contracts/go/seats/nodebuildgo/go.mod b/contracts/go/seats/nodebuildgo/go.mod deleted file mode 100644 index 7d786c14..00000000 --- a/contracts/go/seats/nodebuildgo/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo - -go 1.26.0 diff --git a/contracts/go/seats/nodebuildimage/go.mod b/contracts/go/seats/nodebuildimage/go.mod deleted file mode 100644 index 33cb3f5b..00000000 --- a/contracts/go/seats/nodebuildimage/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage - -go 1.26.0 diff --git a/contracts/go/seats/nodebuildnode/go.mod b/contracts/go/seats/nodebuildnode/go.mod deleted file mode 100644 index 836a6dc8..00000000 --- a/contracts/go/seats/nodebuildnode/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode - -go 1.26.0 diff --git a/contracts/go/seats/npmpackageregistry/go.mod b/contracts/go/seats/npmpackageregistry/go.mod deleted file mode 100644 index acddbbfb..00000000 --- a/contracts/go/seats/npmpackageregistry/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry - -go 1.26.0 diff --git a/contracts/go/seats/ociartifactregistry/go.mod b/contracts/go/seats/ociartifactregistry/go.mod deleted file mode 100644 index f145223c..00000000 --- a/contracts/go/seats/ociartifactregistry/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry - -go 1.26.0 diff --git a/modules/mesh-delivery-assigner/asks/asks.go b/modules/mesh-delivery-assigner/asks/asks.go index 01cc61cd..3b178434 100644 --- a/modules/mesh-delivery-assigner/asks/asks.go +++ b/modules/mesh-delivery-assigner/asks/asks.go @@ -16,10 +16,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-assigner/asks/go.mod b/modules/mesh-delivery-assigner/asks/go.mod index 6ed0f8c5..07db4a1d 100644 --- a/modules/mesh-delivery-assigner/asks/go.mod +++ b/modules/mesh-delivery-assigner/asks/go.mod @@ -5,19 +5,19 @@ go 1.26.0 require ( git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/askagain_tool.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/askagain_tool.go index 762a44b1..93529ea5 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/askagain_tool.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/askagain_tool.go @@ -10,8 +10,8 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents" stdio "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended.go index 0dcbb895..98c0465d 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/process" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended_test.go index ffe0c50f..d73743e2 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/buildended_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-assigner/internal/assign" ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/composed.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/composed.go index 82b95a25..ebffbad0 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/composed.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/composed.go @@ -5,7 +5,7 @@ import ( "strings" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" ) // Every node's published compositions, read only to compare (novox/hq ADR 0593 §8): each node's engine writes its own diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graph_tools.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graph_tools.go index 5710deb4..9a6abb17 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graph_tools.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graph_tools.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/busstate" "mesh-delivery-assigner/internal/assigngraph" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept.go index 9ea4bbec..c013f018 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept.go @@ -10,8 +10,8 @@ import ( "strings" "time" - mcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + mcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" "mesh-delivery-assigner/internal/assign" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept_test.go index a40924b9..ad7637be 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/graphkept_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - mcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + mcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "mesh-delivery-assigner/internal/buckets" ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/halves.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/halves.go index 40fd4ee2..8d617071 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/halves.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/halves.go @@ -9,9 +9,9 @@ import ( "sync" "time" - mcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + mcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs.go index 0bbb0bf7..dd3bb904 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs_test.go index b1e754ba..071c6899 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/inputs_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // Design 47 G §354: the seat mesh-wants' verb `input` answers a kept step input by its digest, and assigner_inputs reads them. diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/integration_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/integration_test.go index 8cc79fdd..80f04ef5 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/integration_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/integration_test.go @@ -23,15 +23,15 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mdcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mdcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside.go index c8d18551..1af5f53c 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside.go @@ -18,9 +18,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside_test.go index 690716b4..4a06236e 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/outside_test.go @@ -12,9 +12,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "mesh-delivery-assigner/internal/assign" "mesh-delivery-assigner/internal/buckets" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass.go index 49a73c03..71581d0e 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass.go @@ -13,9 +13,9 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/motion" @@ -24,7 +24,7 @@ import ( oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient/enginereads" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass_test.go index f884f342..e8398ead 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pass_test.go @@ -17,13 +17,13 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" wdc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - mdseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + mdseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" @@ -39,7 +39,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient/enginereads" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "mesh-delivery-assigner/internal/assign" plc "mesh-delivery-assigner/internal/assignment" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go index 43fe85ed..63951fc7 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go @@ -14,11 +14,11 @@ import ( "github.com/nats-io/nats.go/jetstream" - mcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mprc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshpipelinerunnerclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - mpcat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - mpr "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + mcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mprc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + mpcat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + mpr "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines_test.go index 8b4a6da8..19a2d4a4 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - mpcat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - mpr "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + mpcat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + mpr "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/puts.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/puts.go index 727ec0b9..dab41719 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/puts.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/puts.go @@ -13,10 +13,10 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat.go index fb1a8330..51bcb989 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat.go @@ -16,9 +16,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - mdcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + mdcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools.go index c55cb433..3b524998 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools.go @@ -14,7 +14,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" mmac "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools_test.go index 8f486829..4d20b28c 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/seat_tools_test.go @@ -16,9 +16,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/seatlist" @@ -30,7 +30,7 @@ import ( "git.novox.be/novox/mesh-sdk/go/views" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "mesh-delivery-assigner/internal/assign" "mesh-delivery-assigner/internal/assigngraph" plc "mesh-delivery-assigner/internal/assignment" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tools.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tools.go index d7921b8c..c4e1a470 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tools.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tools.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" stdio "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/verbs.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/verbs.go index 9fa5ea2f..ec642a9c 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/verbs.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/verbs.go @@ -9,7 +9,7 @@ import ( "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "mesh-delivery-assigner/internal/assign" ) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/wants_tools.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/wants_tools.go index 6e492341..58e760f5 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/wants_tools.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/wants_tools.go @@ -12,9 +12,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshhandacts "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" stdio "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go index bb0c9fdb..e591751b 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go @@ -13,12 +13,12 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" wdc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/graph" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" mmac "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world_test.go index 7dcc316d..7cf9ea22 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" - "git.novox.be/novox/mesh-delivery/sdk/graph" ) // fakeManifests is the indexer's manifests bucket in memory. diff --git a/modules/mesh-delivery-assigner/go.mod b/modules/mesh-delivery-assigner/go.mod index e7424a86..0c0d4050 100644 --- a/modules/mesh-delivery-assigner/go.mod +++ b/modules/mesh-delivery-assigner/go.mod @@ -8,7 +8,7 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 @@ -27,7 +27,7 @@ require ( golang.org/x/time v0.16.0 // indirect ) -require git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 require ( git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient v0.0.0-00010101000000-000000000000 @@ -36,7 +36,7 @@ require ( git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds => ../mesh-delivery-builder/builds @@ -50,21 +50,21 @@ require git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdo require git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient v0.0.0-00010101000000-000000000000 -require git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient => ../../contracts/go/clients/meshcatalogclient +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient => ../mesh-delivery-contracts/go/clients/meshcatalogclient -require git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient => ../../contracts/go/clients/meshdeliveryclient +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient => ../mesh-delivery-contracts/go/clients/meshdeliveryclient -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog => ../../contracts/go/seats/meshcatalog +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog => ../mesh-delivery-contracts/go/seats/meshcatalog -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery => ../../contracts/go/seats/meshdelivery +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery => ../mesh-delivery-contracts/go/seats/meshdelivery require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 @@ -84,18 +84,18 @@ require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate v0 replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate => ../mesh-delivery-view/viewstate -require git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 -require git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient => ../../contracts/go/clients/meshdeliverycheckerclient +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient => ../mesh-delivery-contracts/go/clients/meshdeliverycheckerclient require git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go v0.0.0-00010101000000-000000000000 require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-networking/modules/mesh-connectivity-contracts/go/seats/theprivatenetwork v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-assigner/internal/assign/askjson.go b/modules/mesh-delivery-assigner/internal/assign/askjson.go index cbe97275..c7d9f48f 100644 --- a/modules/mesh-delivery-assigner/internal/assign/askjson.go +++ b/modules/mesh-delivery-assigner/internal/assign/askjson.go @@ -3,8 +3,8 @@ package assign import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "time" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" diff --git a/modules/mesh-delivery-assigner/internal/assign/asks.go b/modules/mesh-delivery-assigner/internal/assign/asks.go index 4ed5b876..59e1c8fd 100644 --- a/modules/mesh-delivery-assigner/internal/assign/asks.go +++ b/modules/mesh-delivery-assigner/internal/assign/asks.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" diff --git a/modules/mesh-delivery-assigner/internal/assign/asks_test.go b/modules/mesh-delivery-assigner/internal/assign/asks_test.go index f8c560a9..3e23b1db 100644 --- a/modules/mesh-delivery-assigner/internal/assign/asks_test.go +++ b/modules/mesh-delivery-assigner/internal/assign/asks_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" diff --git a/modules/mesh-delivery-assigner/internal/assign/ended.go b/modules/mesh-delivery-assigner/internal/assign/ended.go index 52e03a77..98985d51 100644 --- a/modules/mesh-delivery-assigner/internal/assign/ended.go +++ b/modules/mesh-delivery-assigner/internal/assign/ended.go @@ -10,8 +10,8 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents" "mesh-delivery-assigner/internal/puts" diff --git a/modules/mesh-delivery-assigner/internal/assign/put.go b/modules/mesh-delivery-assigner/internal/assign/put.go index eb139832..bec0609e 100644 --- a/modules/mesh-delivery-assigner/internal/assign/put.go +++ b/modules/mesh-delivery-assigner/internal/assign/put.go @@ -3,10 +3,10 @@ package assign import ( "fmt" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "mesh-delivery-assigner/internal/puts" "time" diff --git a/modules/mesh-delivery-assigner/internal/assign/seat.go b/modules/mesh-delivery-assigner/internal/assign/seat.go index 48b6ee28..df3b604d 100644 --- a/modules/mesh-delivery-assigner/internal/assign/seat.go +++ b/modules/mesh-delivery-assigner/internal/assign/seat.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" mmac "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" diff --git a/modules/mesh-delivery-assigner/internal/assign/verbs.go b/modules/mesh-delivery-assigner/internal/assign/verbs.go index 86466d74..a6d806f5 100644 --- a/modules/mesh-delivery-assigner/internal/assign/verbs.go +++ b/modules/mesh-delivery-assigner/internal/assign/verbs.go @@ -3,7 +3,7 @@ package assign import ( "slices" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // verbWaiting says why the module's want on node waits for a verb it invokes (novox/hq ADR 0614 §2): the first seat verb or diff --git a/modules/mesh-delivery-assigner/internal/assign/wants.go b/modules/mesh-delivery-assigner/internal/assign/wants.go index d0418df9..7412c757 100644 --- a/modules/mesh-delivery-assigner/internal/assign/wants.go +++ b/modules/mesh-delivery-assigner/internal/assign/wants.go @@ -4,9 +4,9 @@ import ( "fmt" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "maps" "mesh-delivery-assigner/internal/puts" @@ -19,7 +19,7 @@ import ( "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // Module is what the six rules read of one module (ADR 0429 §6, ADR 0528 clause 3): its newest fingerprint F at the diff --git a/modules/mesh-delivery-assigner/internal/assign/wants_test.go b/modules/mesh-delivery-assigner/internal/assign/wants_test.go index fce06ef2..d0f3be9f 100644 --- a/modules/mesh-delivery-assigner/internal/assign/wants_test.go +++ b/modules/mesh-delivery-assigner/internal/assign/wants_test.go @@ -3,10 +3,10 @@ package assign import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - mwc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + mwc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "mesh-delivery-assigner/internal/puts" "reflect" @@ -18,7 +18,7 @@ import ( "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) func fpOf(c byte) string { return meshcatalogclient.SourcePrefix2 + strings.Repeat(string(c), 64) } diff --git a/modules/mesh-delivery-assigner/internal/assigngraph/compute.go b/modules/mesh-delivery-assigner/internal/assigngraph/compute.go index a9667c8f..2825d6d5 100644 --- a/modules/mesh-delivery-assigner/internal/assigngraph/compute.go +++ b/modules/mesh-delivery-assigner/internal/assigngraph/compute.go @@ -14,8 +14,8 @@ import ( "strings" mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" "mesh-delivery-assigner/internal/assignment" diff --git a/modules/mesh-delivery-assigner/internal/assigngraph/graph_test.go b/modules/mesh-delivery-assigner/internal/assigngraph/graph_test.go index e2c92d67..767c88e6 100644 --- a/modules/mesh-delivery-assigner/internal/assigngraph/graph_test.go +++ b/modules/mesh-delivery-assigner/internal/assigngraph/graph_test.go @@ -10,9 +10,9 @@ import ( "time" mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) type memObjects map[string][]byte diff --git a/modules/mesh-delivery-assigner/internal/assigngraph/keep.go b/modules/mesh-delivery-assigner/internal/assigngraph/keep.go index 4440c469..7ce8600e 100644 --- a/modules/mesh-delivery-assigner/internal/assigngraph/keep.go +++ b/modules/mesh-delivery-assigner/internal/assigngraph/keep.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // RevisionsObjects is the local name of the kept data in the assigner's manifest's old `objects` section (design 47 diff --git a/modules/mesh-delivery-assigner/internal/assigngraph/verbs.go b/modules/mesh-delivery-assigner/internal/assigngraph/verbs.go index 69181919..3b7d2d6c 100644 --- a/modules/mesh-delivery-assigner/internal/assigngraph/verbs.go +++ b/modules/mesh-delivery-assigner/internal/assigngraph/verbs.go @@ -7,7 +7,7 @@ import ( "maps" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // ErrNoCandidate answers a verb asked of a candidate's revision: the assigner keeps none (the candidate's graph and the diff --git a/modules/mesh-delivery-assigner/internal/buckets/buckets.go b/modules/mesh-delivery-assigner/internal/buckets/buckets.go index 8a9d215e..0cf5be2d 100644 --- a/modules/mesh-delivery-assigner/internal/buckets/buckets.go +++ b/modules/mesh-delivery-assigner/internal/buckets/buckets.go @@ -7,10 +7,10 @@ package buckets import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" watchdogs "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" plc "mesh-delivery-assigner/internal/assignment" diff --git a/modules/mesh-delivery-assigner/internal/judge/judge.go b/modules/mesh-delivery-assigner/internal/judge/judge.go index 2b1d7b55..44b83b75 100644 --- a/modules/mesh-delivery-assigner/internal/judge/judge.go +++ b/modules/mesh-delivery-assigner/internal/judge/judge.go @@ -9,7 +9,7 @@ import ( "encoding/json" "fmt" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - mdcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" + mdcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" "reflect" "sort" "strconv" diff --git a/modules/mesh-delivery-assigner/internal/judge/judge_test.go b/modules/mesh-delivery-assigner/internal/judge/judge_test.go index 786b5d5d..4d2ed8cc 100644 --- a/modules/mesh-delivery-assigner/internal/judge/judge_test.go +++ b/modules/mesh-delivery-assigner/internal/judge/judge_test.go @@ -2,7 +2,7 @@ package judge import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - mdcc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" + mdcc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" "slices" "strings" "testing" diff --git a/modules/mesh-delivery-assigner/internal/puts/puts.go b/modules/mesh-delivery-assigner/internal/puts/puts.go index 58a6d053..06da4c03 100644 --- a/modules/mesh-delivery-assigner/internal/puts/puts.go +++ b/modules/mesh-delivery-assigner/internal/puts/puts.go @@ -10,7 +10,7 @@ import ( "time" nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-assigner/manifest_test.go b/modules/mesh-delivery-assigner/manifest_test.go index 5139cf28..94ad01ef 100644 --- a/modules/mesh-delivery-assigner/manifest_test.go +++ b/modules/mesh-delivery-assigner/manifest_test.go @@ -3,8 +3,8 @@ package manifest import ( "encoding/json" "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents" "os" "reflect" diff --git a/modules/mesh-delivery-builder/buildrun/asks.go b/modules/mesh-delivery-builder/buildrun/asks.go index 632eb504..26cc3e2c 100644 --- a/modules/mesh-delivery-builder/buildrun/asks.go +++ b/modules/mesh-delivery-builder/buildrun/asks.go @@ -13,7 +13,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/busretry" ) diff --git a/modules/mesh-delivery-builder/buildrun/asks_integration_test.go b/modules/mesh-delivery-builder/buildrun/asks_integration_test.go index eb012857..f268e8a9 100644 --- a/modules/mesh-delivery-builder/buildrun/asks_integration_test.go +++ b/modules/mesh-delivery-builder/buildrun/asks_integration_test.go @@ -11,7 +11,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/testbus" ) diff --git a/modules/mesh-delivery-builder/buildrun/asks_test.go b/modules/mesh-delivery-builder/buildrun/asks_test.go index 379a0579..fac93dbd 100644 --- a/modules/mesh-delivery-builder/buildrun/asks_test.go +++ b/modules/mesh-delivery-builder/buildrun/asks_test.go @@ -13,7 +13,7 @@ import ( "github.com/nats-io/nats.go" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/busretry" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-delivery-builder/buildrun/buildseats.go b/modules/mesh-delivery-builder/buildrun/buildseats.go index b4c75e11..43288e31 100644 --- a/modules/mesh-delivery-builder/buildrun/buildseats.go +++ b/modules/mesh-delivery-builder/buildrun/buildseats.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-builder/buildrun/choose.go b/modules/mesh-delivery-builder/buildrun/choose.go index b8997280..777edf9d 100644 --- a/modules/mesh-delivery-builder/buildrun/choose.go +++ b/modules/mesh-delivery-builder/buildrun/choose.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // ChooseNodes picks up to want build nodes for a language (ADR 0478 clause 3): the nodes whose toolchains key reports the diff --git a/modules/mesh-delivery-builder/buildrun/choose_test.go b/modules/mesh-delivery-builder/buildrun/choose_test.go index d39e70c6..705a878a 100644 --- a/modules/mesh-delivery-builder/buildrun/choose_test.go +++ b/modules/mesh-delivery-builder/buildrun/choose_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) const digest = "sha256:2222222222222222222222222222222222222222222222222222222222222222" diff --git a/modules/mesh-delivery-builder/buildrun/faults.go b/modules/mesh-delivery-builder/buildrun/faults.go index e1054451..0d9b4def 100644 --- a/modules/mesh-delivery-builder/buildrun/faults.go +++ b/modules/mesh-delivery-builder/buildrun/faults.go @@ -4,7 +4,7 @@ import ( "strings" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The words of a key that failed on a transport fault (design 47 G §568, A-76): `transport fault: , , diff --git a/modules/mesh-delivery-builder/buildrun/go.mod b/modules/mesh-delivery-builder/buildrun/go.mod index 9255332a..8db44536 100644 --- a/modules/mesh-delivery-builder/buildrun/go.mod +++ b/modules/mesh-delivery-builder/buildrun/go.mod @@ -7,9 +7,9 @@ require ( git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats.go v1.54.0 ) diff --git a/modules/mesh-delivery-builder/buildrun/heardends.go b/modules/mesh-delivery-builder/buildrun/heardends.go index f9c16ea6..965eda80 100644 --- a/modules/mesh-delivery-builder/buildrun/heardends.go +++ b/modules/mesh-delivery-builder/buildrun/heardends.go @@ -7,7 +7,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **A step's end is never only its own watch's to hear** (the lost check of 2026-10-28: mesh-catalog #553's verdict diff --git a/modules/mesh-delivery-builder/buildrun/lostask.go b/modules/mesh-delivery-builder/buildrun/lostask.go index a3392412..839bdc0a 100644 --- a/modules/mesh-delivery-builder/buildrun/lostask.go +++ b/modules/mesh-delivery-builder/buildrun/lostask.go @@ -12,7 +12,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/health" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-builder/buildrun/standing.go b/modules/mesh-delivery-builder/buildrun/standing.go index 379e0725..4ba65b08 100644 --- a/modules/mesh-delivery-builder/buildrun/standing.go +++ b/modules/mesh-delivery-builder/buildrun/standing.go @@ -10,8 +10,8 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-builder/buildrun/standing_test.go b/modules/mesh-delivery-builder/buildrun/standing_test.go index 192757c8..c7073583 100644 --- a/modules/mesh-delivery-builder/buildrun/standing_test.go +++ b/modules/mesh-delivery-builder/buildrun/standing_test.go @@ -13,7 +13,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // placing is a value of the state `assignments` placing modules on node. diff --git a/modules/mesh-delivery-builder/buildrun/steps.go b/modules/mesh-delivery-builder/buildrun/steps.go index 37566008..cf4ddaaf 100644 --- a/modules/mesh-delivery-builder/buildrun/steps.go +++ b/modules/mesh-delivery-builder/buildrun/steps.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Caller calls a tool of a module on one named machine (mesh-sdk process.Conn.CallOn; ADR 0469 clause 3). diff --git a/modules/mesh-delivery-builder/buildrun/steps_resume_test.go b/modules/mesh-delivery-builder/buildrun/steps_resume_test.go index cb8c4203..06e3513c 100644 --- a/modules/mesh-delivery-builder/buildrun/steps_resume_test.go +++ b/modules/mesh-delivery-builder/buildrun/steps_resume_test.go @@ -9,7 +9,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/busretry" ) diff --git a/modules/mesh-delivery-builder/buildrun/steps_test.go b/modules/mesh-delivery-builder/buildrun/steps_test.go index c94a6314..89174b09 100644 --- a/modules/mesh-delivery-builder/buildrun/steps_test.go +++ b/modules/mesh-delivery-builder/buildrun/steps_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) type call struct { diff --git a/modules/mesh-delivery-builder/buildrun/toolchaingate.go b/modules/mesh-delivery-builder/buildrun/toolchaingate.go index 122c2b6c..ef2b7ff0 100644 --- a/modules/mesh-delivery-builder/buildrun/toolchaingate.go +++ b/modules/mesh-delivery-builder/buildrun/toolchaingate.go @@ -9,9 +9,9 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // A build module writes . of its toolchains state on every node it runs on, and nothing deletes the key diff --git a/modules/mesh-delivery-builder/buildrun/toolchaingate_test.go b/modules/mesh-delivery-builder/buildrun/toolchaingate_test.go index 8f526bce..3e41cc44 100644 --- a/modules/mesh-delivery-builder/buildrun/toolchaingate_test.go +++ b/modules/mesh-delivery-builder/buildrun/toolchaingate_test.go @@ -11,8 +11,8 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func gateReport(t *testing.T, node, version string, at time.Time) (string, []byte) { diff --git a/modules/mesh-delivery-builder/buildrun/toolchains.go b/modules/mesh-delivery-builder/buildrun/toolchains.go index 12b47bb5..755dfe4a 100644 --- a/modules/mesh-delivery-builder/buildrun/toolchains.go +++ b/modules/mesh-delivery-builder/buildrun/toolchains.go @@ -4,7 +4,7 @@ import ( "sort" "sync" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // ToolchainsHeardState is the builder's old state section of the toolchains it heard (design 47 G §604, §546): one key diff --git a/modules/mesh-delivery-builder/buildrun/toolchains_test.go b/modules/mesh-delivery-builder/buildrun/toolchains_test.go index 82b78c5e..5f8fa1a8 100644 --- a/modules/mesh-delivery-builder/buildrun/toolchains_test.go +++ b/modules/mesh-delivery-builder/buildrun/toolchains_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func tc(language, version, digest string) buildstep.Toolchain { diff --git a/modules/mesh-delivery-builder/builds/builds.go b/modules/mesh-delivery-builder/builds/builds.go index 59a765e5..a434eec5 100644 --- a/modules/mesh-delivery-builder/builds/builds.go +++ b/modules/mesh-delivery-builder/builds/builds.go @@ -11,14 +11,14 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/kept" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-builder/builds/builds_test.go b/modules/mesh-delivery-builder/builds/builds_test.go index 8e272b67..dbc554fa 100644 --- a/modules/mesh-delivery-builder/builds/builds_test.go +++ b/modules/mesh-delivery-builder/builds/builds_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/sdk/buildrecord" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrecord" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-builder/builds/forms/forms.go b/modules/mesh-delivery-builder/builds/forms/forms.go index bd6d7ac8..73c24cde 100644 --- a/modules/mesh-delivery-builder/builds/forms/forms.go +++ b/modules/mesh-delivery-builder/builds/forms/forms.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - containerimageregistry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - ociartifactregistry "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + containerimageregistry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + ociartifactregistry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-builder/builds/go.mod b/modules/mesh-delivery-builder/builds/go.mod index 2ce35b5e..43c013de 100644 --- a/modules/mesh-delivery-builder/builds/go.mod +++ b/modules/mesh-delivery-builder/builds/go.mod @@ -3,11 +3,11 @@ module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect diff --git a/modules/mesh-delivery-builder/builds/log.go b/modules/mesh-delivery-builder/builds/log.go index 455000d2..3eed958b 100644 --- a/modules/mesh-delivery-builder/builds/log.go +++ b/modules/mesh-delivery-builder/builds/log.go @@ -6,7 +6,7 @@ import ( "sort" "time" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build.go index a91ec8a2..1524a176 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/buscalls" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build_test.go index 071a5ea4..7feed31e 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/build_test.go @@ -8,8 +8,8 @@ import ( "mesh-delivery-builder/internal/build" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §589, A-87: the tools bundle reads each watched branch's newest catalog graph entry of the module from the catalog diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go index 4f5603ab..805d2874 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go @@ -15,11 +15,11 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/seatlist" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/reservedname_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/reservedname_test.go index 26b51535..a91daa9e 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/reservedname_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/reservedname_test.go @@ -6,7 +6,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains.go index 06ec72b9..08765666 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains.go @@ -8,7 +8,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains_test.go index 70429914..cfaa9dd2 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/toolchains_test.go @@ -8,7 +8,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog.go index 79a4fc77..7e975128 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" "mesh-delivery-builder/internal/build" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog_test.go index 87768101..40ec236c 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalog_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // TestTheManifestOfAnEntryIsReadByItsDigest: the builder reads a manifest from the entry that holds it, by the entry's manifest diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalogholder_integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalogholder_integration_test.go index 699e8cb4..6461d173 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalogholder_integration_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/catalogholder_integration_test.go @@ -14,8 +14,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/seatlist" "git.novox.be/novox/mesh-sdk/go/seatlist/seatlisttest" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/gone_integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/gone_integration_test.go index 4c50f3ca..a76aaf99 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/gone_integration_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/gone_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" ) // A done key whose blob the artifact store no longer holds is built again, by the builder whole against the bus diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/held.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/held.go index 475c7050..2069c451 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/held.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/held.go @@ -11,7 +11,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "mesh-delivery-builder/internal/build" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go index fd9cd17c..06d3e574 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go @@ -27,13 +27,13 @@ import ( // another repository's, by its published version, so the builder is tested against the real pulling code. runner "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/buscompose" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views/viewstest" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go index 0b8c7e46..4aaa8bc2 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go @@ -31,11 +31,11 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/operatorask" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatlist" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/names.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/names.go index d53dc33e..1a97f7e0 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/names.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/names.go @@ -1,7 +1,7 @@ package main import ( - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // The holders and buckets the builder names, taken from its own manifest (module.json: its `reads`) and from the holders' diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/refused_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/refused_test.go index ab4875a0..80fcec9f 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/refused_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/refused_test.go @@ -27,10 +27,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish.go index 7d201fb3..2e0e8fa8 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish.go @@ -14,8 +14,8 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-builder/internal/versions" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish_test.go index 0532ed69..641cb9ae 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/republish_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go index 195107df..1582b99d 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" "strings" "sync/atomic" "time" @@ -13,8 +13,8 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go index 24a349b5..72c84c5a 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go @@ -10,9 +10,9 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-builder/internal/versions" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb.go index 49bd2b14..5eedc4a0 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb_test.go index ef87f65e..12da9d44 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reservedverb_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-builder/internal/versions" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/seats.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/seats.go index e3bff8b8..75e75287 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/seats.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/seats.go @@ -8,10 +8,10 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step.go index 87aabd3e..adc0a2bd 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step.go @@ -9,9 +9,9 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-builder/internal/build" diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step_integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step_integration_test.go index 8041973f..8c4a19ca 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step_integration_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/step_integration_test.go @@ -9,8 +9,8 @@ import ( "github.com/nats-io/nats.go" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // The runner's build step ask on the seat mesh-builds' accept subject, naming an entry by its fingerprint, is built through the diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/stored.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/stored.go index 0cf302c1..37cfc18f 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/stored.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/stored.go @@ -9,7 +9,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" "mesh-delivery-builder/internal/build" ) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains.go index b1168c3d..2581cd56 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains.go @@ -13,11 +13,11 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // toolchainReportedPrefixes are the subjects the three build seats say toolchain-reported on, a node its last token (design diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains_test.go index 60cc8989..30bd5ca2 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/toolchains_test.go @@ -13,8 +13,8 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // memState is the state toolchains-heard in memory. diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/versions.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/versions.go index e7d9d932..c0976448 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/versions.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/versions.go @@ -12,8 +12,8 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-builder/internal/build" diff --git a/modules/mesh-delivery-builder/go.mod b/modules/mesh-delivery-builder/go.mod index 18e70a23..1be7f8d2 100644 --- a/modules/mesh-delivery-builder/go.mod +++ b/modules/mesh-delivery-builder/go.mod @@ -11,18 +11,18 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/git v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 @@ -48,23 +48,23 @@ replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun require ( git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep v0.0.0-00010101000000-000000000000 require git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-00010101000000-000000000000 require git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep => ../../contracts/go/seats/meshartifactsweep +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep => ../mesh-delivery-contracts/go/seats/meshartifactsweep require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/ociartifactregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-builder/internal/build/askagain.go b/modules/mesh-delivery-builder/internal/build/askagain.go index 9c3ab4b1..3d235d02 100644 --- a/modules/mesh-delivery-builder/internal/build/askagain.go +++ b/modules/mesh-delivery-builder/internal/build/askagain.go @@ -13,7 +13,7 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **An ask that can no longer be answered is asked again** (novox/hq issue 1945). A build seat's stream gives an ask up diff --git a/modules/mesh-delivery-builder/internal/build/askfake_test.go b/modules/mesh-delivery-builder/internal/build/askfake_test.go index c5bcffb2..f7766958 100644 --- a/modules/mesh-delivery-builder/internal/build/askfake_test.go +++ b/modules/mesh-delivery-builder/internal/build/askfake_test.go @@ -7,7 +7,7 @@ import ( "maps" "strings" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The build runner a build node runs an ask with is mesh-build-go's (novox/hq ADR 0593 §1), another repository's, diff --git a/modules/mesh-delivery-builder/internal/build/buildread.go b/modules/mesh-delivery-builder/internal/build/buildread.go index 859e434c..11b06ff2 100644 --- a/modules/mesh-delivery-builder/internal/build/buildread.go +++ b/modules/mesh-delivery-builder/internal/build/buildread.go @@ -10,7 +10,7 @@ import ( "time" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" ) diff --git a/modules/mesh-delivery-builder/internal/build/candidates.go b/modules/mesh-delivery-builder/internal/build/candidates.go index 0c7ea2c0..fe62b3fc 100644 --- a/modules/mesh-delivery-builder/internal/build/candidates.go +++ b/modules/mesh-delivery-builder/internal/build/candidates.go @@ -4,7 +4,7 @@ import ( "context" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // agreedFor are the toolchains the build nodes agree on now, for the languages of the manifest's plan: the toolchains the diff --git a/modules/mesh-delivery-builder/internal/build/entry_test.go b/modules/mesh-delivery-builder/internal/build/entry_test.go index 0eaa2008..eba6952f 100644 --- a/modules/mesh-delivery-builder/internal/build/entry_test.go +++ b/modules/mesh-delivery-builder/internal/build/entry_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // TestAnEntryOfTheCatalogHalfIsTheFormTheBuilderBuildsBy: a catalog graph entry gives the builder its fingerprint, manifest digest, diff --git a/modules/mesh-delivery-builder/internal/build/fakes_test.go b/modules/mesh-delivery-builder/internal/build/fakes_test.go index fb490343..b7ece699 100644 --- a/modules/mesh-delivery-builder/internal/build/fakes_test.go +++ b/modules/mesh-delivery-builder/internal/build/fakes_test.go @@ -11,7 +11,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) type call struct { diff --git a/modules/mesh-delivery-builder/internal/build/fixtures_test.go b/modules/mesh-delivery-builder/internal/build/fixtures_test.go index 956a831c..2d43d88a 100644 --- a/modules/mesh-delivery-builder/internal/build/fixtures_test.go +++ b/modules/mesh-delivery-builder/internal/build/fixtures_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // result reads a captured step value of mesh-build-image (testdata/captured/README) and returns its result. diff --git a/modules/mesh-delivery-builder/internal/build/followups_test.go b/modules/mesh-delivery-builder/internal/build/followups_test.go index b2bfdd0b..82fd518a 100644 --- a/modules/mesh-delivery-builder/internal/build/followups_test.go +++ b/modules/mesh-delivery-builder/internal/build/followups_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // 1660: at start the builder closes a key left building for a fingerprint the module no longer has. diff --git a/modules/mesh-delivery-builder/internal/build/gone_test.go b/modules/mesh-delivery-builder/internal/build/gone_test.go index fea331ca..fdea85ef 100644 --- a/modules/mesh-delivery-builder/internal/build/gone_test.go +++ b/modules/mesh-delivery-builder/internal/build/gone_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" ) // A done key whose blob the artifact store no longer holds is built again (novox/hq issue 1937): on 2026-10-24 the diff --git a/modules/mesh-delivery-builder/internal/build/imports_test.go b/modules/mesh-delivery-builder/internal/build/imports_test.go index ac12fc0f..1d8fe7b3 100644 --- a/modules/mesh-delivery-builder/internal/build/imports_test.go +++ b/modules/mesh-delivery-builder/internal/build/imports_test.go @@ -7,7 +7,7 @@ import ( "testing" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // ADR 0593 §2 (F3): the imports a Go build module answers at a build's end reach the done key and the log's end entry, diff --git a/modules/mesh-delivery-builder/internal/build/numbers.go b/modules/mesh-delivery-builder/internal/build/numbers.go index 7b3a6521..15b1f888 100644 --- a/modules/mesh-delivery-builder/internal/build/numbers.go +++ b/modules/mesh-delivery-builder/internal/build/numbers.go @@ -3,15 +3,15 @@ package build import ( "context" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" "git.novox.be/novox/mesh-sdk/go/catalogue" "strconv" "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "mesh-delivery-builder/internal/versions" ) diff --git a/modules/mesh-delivery-builder/internal/build/queue.go b/modules/mesh-delivery-builder/internal/build/queue.go index 68d94081..ea5b9903 100644 --- a/modules/mesh-delivery-builder/internal/build/queue.go +++ b/modules/mesh-delivery-builder/internal/build/queue.go @@ -7,7 +7,7 @@ import ( "time" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **The tool builder_seat_queue reads a build seat's stream as the builder reads it** (novox/hq issue 1945 note 62; the diff --git a/modules/mesh-delivery-builder/internal/build/r4e_test.go b/modules/mesh-delivery-builder/internal/build/r4e_test.go index 63731dc6..c1957e8f 100644 --- a/modules/mesh-delivery-builder/internal/build/r4e_test.go +++ b/modules/mesh-delivery-builder/internal/build/r4e_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-builder/internal/build/reserve_test.go b/modules/mesh-delivery-builder/internal/build/reserve_test.go index c28993ad..8bd84216 100644 --- a/modules/mesh-delivery-builder/internal/build/reserve_test.go +++ b/modules/mesh-delivery-builder/internal/build/reserve_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/internal/build/retake.go b/modules/mesh-delivery-builder/internal/build/retake.go index 22dd339c..e27865d2 100644 --- a/modules/mesh-delivery-builder/internal/build/retake.go +++ b/modules/mesh-delivery-builder/internal/build/retake.go @@ -9,7 +9,7 @@ import ( "strings" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "mesh-delivery-builder/internal/versions" diff --git a/modules/mesh-delivery-builder/internal/build/retake_test.go b/modules/mesh-delivery-builder/internal/build/retake_test.go index c3b4ba0f..3d8ee4a9 100644 --- a/modules/mesh-delivery-builder/internal/build/retake_test.go +++ b/modules/mesh-delivery-builder/internal/build/retake_test.go @@ -8,7 +8,7 @@ import ( "testing" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" ) diff --git a/modules/mesh-delivery-builder/internal/build/run.go b/modules/mesh-delivery-builder/internal/build/run.go index 66c5ae51..a6a59251 100644 --- a/modules/mesh-delivery-builder/internal/build/run.go +++ b/modules/mesh-delivery-builder/internal/build/run.go @@ -14,15 +14,15 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - repotrunk "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + repotrunk "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/busretry" "git.novox.be/novox/mesh-sdk/go/catalogue" diff --git a/modules/mesh-delivery-builder/internal/build/run_test.go b/modules/mesh-delivery-builder/internal/build/run_test.go index 37c788f3..94060ed9 100644 --- a/modules/mesh-delivery-builder/internal/build/run_test.go +++ b/modules/mesh-delivery-builder/internal/build/run_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-delivery-builder/internal/build/step.go b/modules/mesh-delivery-builder/internal/build/step.go index e996f757..f92fa35d 100644 --- a/modules/mesh-delivery-builder/internal/build/step.go +++ b/modules/mesh-delivery-builder/internal/build/step.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // **A candidate's build is the runner's step ask** (design 47 G A-97, A-84, A-99): the runner's asking half asks the seat diff --git a/modules/mesh-delivery-builder/internal/build/step_test.go b/modules/mesh-delivery-builder/internal/build/step_test.go index 6cadbc28..225ff77e 100644 --- a/modules/mesh-delivery-builder/internal/build/step_test.go +++ b/modules/mesh-delivery-builder/internal/build/step_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-builder/internal/build/stuck.go b/modules/mesh-delivery-builder/internal/build/stuck.go index cf2fd1c5..677a09e2 100644 --- a/modules/mesh-delivery-builder/internal/build/stuck.go +++ b/modules/mesh-delivery-builder/internal/build/stuck.go @@ -15,7 +15,7 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The builder's tools (novox/hq issue 1945; the instruction "tools are how a module is spoken to"): builder_stuck reads diff --git a/modules/mesh-delivery-builder/internal/build/toolchains.go b/modules/mesh-delivery-builder/internal/build/toolchains.go index f2477c0a..72603b86 100644 --- a/modules/mesh-delivery-builder/internal/build/toolchains.go +++ b/modules/mesh-delivery-builder/internal/build/toolchains.go @@ -1,9 +1,9 @@ package build import ( - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // CatalogToolchains are the toolchains of a build, by language, as a module's value holds them (the catalog's form names diff --git a/modules/mesh-delivery-builder/internal/build/waits.go b/modules/mesh-delivery-builder/internal/build/waits.go index 2c1f2cf5..b0f6d225 100644 --- a/modules/mesh-delivery-builder/internal/build/waits.go +++ b/modules/mesh-delivery-builder/internal/build/waits.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **The builder's toolchain wait** (design 47 G §672, §267, §276): the builder holds an entry while its fingerprint names a diff --git a/modules/mesh-delivery-builder/internal/versions/entrynames.go b/modules/mesh-delivery-builder/internal/versions/entrynames.go index 3551f6f4..71b6e8d9 100644 --- a/modules/mesh-delivery-builder/internal/versions/entrynames.go +++ b/modules/mesh-delivery-builder/internal/versions/entrynames.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-builder/internal/versions/entrynames_test.go b/modules/mesh-delivery-builder/internal/versions/entrynames_test.go index 06e8ecf7..32644613 100644 --- a/modules/mesh-delivery-builder/internal/versions/entrynames_test.go +++ b/modules/mesh-delivery-builder/internal/versions/entrynames_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) func named(module, artifact, name string) meshcatalog.CatalogEntry { diff --git a/modules/mesh-delivery-builder/internal/versions/names.go b/modules/mesh-delivery-builder/internal/versions/names.go index a4b7e796..4eead917 100644 --- a/modules/mesh-delivery-builder/internal/versions/names.go +++ b/modules/mesh-delivery-builder/internal/versions/names.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // PackagesState is the indexer's packages state as the builder reads it (its manifest's reads grant): its keys, and one diff --git a/modules/mesh-delivery-builder/internal/versions/oldform.go b/modules/mesh-delivery-builder/internal/versions/oldform.go index 6f435865..5262b492 100644 --- a/modules/mesh-delivery-builder/internal/versions/oldform.go +++ b/modules/mesh-delivery-builder/internal/versions/oldform.go @@ -11,7 +11,7 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms" - "git.novox.be/novox/mesh-delivery/sdk/window" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/window" ) // The old reference form's window (design 51 *Every build keeps the old reference form*, ADR 0624 §1, ADR 0618 §2-§4, diff --git a/modules/mesh-delivery-builder/internal/versions/republish.go b/modules/mesh-delivery-builder/internal/versions/republish.go index e5950b5d..4a361b56 100644 --- a/modules/mesh-delivery-builder/internal/versions/republish.go +++ b/modules/mesh-delivery-builder/internal/versions/republish.go @@ -12,7 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // **A reserved version left unpublished is published again by the builder, on an event or by a person's tool** (design 47 diff --git a/modules/mesh-delivery-builder/internal/versions/republish_test.go b/modules/mesh-delivery-builder/internal/versions/republish_test.go index b8c65419..1fbe7274 100644 --- a/modules/mesh-delivery-builder/internal/versions/republish_test.go +++ b/modules/mesh-delivery-builder/internal/versions/republish_test.go @@ -10,7 +10,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) type queueMem struct { diff --git a/modules/mesh-delivery-builder/internal/versions/reserve.go b/modules/mesh-delivery-builder/internal/versions/reserve.go index 1a983510..fbe2e814 100644 --- a/modules/mesh-delivery-builder/internal/versions/reserve.go +++ b/modules/mesh-delivery-builder/internal/versions/reserve.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // **The reservation is one key per module and MAJOR.MINOR** (design 47 G §369, §52): the builder keeps in its old state diff --git a/modules/mesh-delivery-builder/internal/versions/reserve_test.go b/modules/mesh-delivery-builder/internal/versions/reserve_test.go index 49ab3a06..4fd7936f 100644 --- a/modules/mesh-delivery-builder/internal/versions/reserve_test.go +++ b/modules/mesh-delivery-builder/internal/versions/reserve_test.go @@ -5,7 +5,7 @@ import ( "context" "errors" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" "reflect" "testing" "time" diff --git a/modules/mesh-delivery-builder/internal/versions/reservedname_test.go b/modules/mesh-delivery-builder/internal/versions/reservedname_test.go index ee5b48f2..27896ed6 100644 --- a/modules/mesh-delivery-builder/internal/versions/reservedname_test.go +++ b/modules/mesh-delivery-builder/internal/versions/reservedname_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // TestReservedByNameAnswersFromTheViewAndTheCatalog: design 47 G §572, §582, A-70 — a package's name (an npm name or a Go diff --git a/modules/mesh-delivery-builder/internal/versions/tools.go b/modules/mesh-delivery-builder/internal/versions/tools.go index a375b67d..09ef4f7a 100644 --- a/modules/mesh-delivery-builder/internal/versions/tools.go +++ b/modules/mesh-delivery-builder/internal/versions/tools.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // The builder's tools of its versions (design 51 *Events of the builder*, *Tools of the builder*). diff --git a/modules/mesh-delivery-checker/checkermsg/checkermsg.go b/modules/mesh-delivery-checker/checkermsg/checkermsg.go index 37db5412..978f52f2 100644 --- a/modules/mesh-delivery-checker/checkermsg/checkermsg.go +++ b/modules/mesh-delivery-checker/checkermsg/checkermsg.go @@ -9,7 +9,7 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" ) // The events of the checker's stream checks. diff --git a/modules/mesh-delivery-checker/checkermsg/go.mod b/modules/mesh-delivery-checker/checkermsg/go.mod index 0575be60..7181d0e9 100644 --- a/modules/mesh-delivery-checker/checkermsg/go.mod +++ b/modules/mesh-delivery-checker/checkermsg/go.mod @@ -2,9 +2,9 @@ module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg go 1.26.0 -require git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-checking-program/main.go b/modules/mesh-delivery-checker/cmd/mesh-checking-program/main.go index facd8559..fc829bc8 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-checking-program/main.go +++ b/modules/mesh-delivery-checker/cmd/mesh-checking-program/main.go @@ -19,7 +19,7 @@ import ( "mesh-delivery-checker/rules" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func main() { diff --git a/modules/mesh-delivery-checker/cmd/mesh-checking-program/main_test.go b/modules/mesh-delivery-checker/cmd/mesh-checking-program/main_test.go index 6856bacb..cbd54007 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-checking-program/main_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-checking-program/main_test.go @@ -15,9 +15,9 @@ import ( "mesh-delivery-checker/rules" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/seatdefs" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/seatdefs" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main.go index 06dc3040..d17b15db 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main.go @@ -13,10 +13,10 @@ import ( "mesh-delivery-checker/internal/check" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main_test.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main_test.go index a765459f..1661701a 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker-tools/main_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "mesh-delivery-checker/internal/check" ) @@ -241,7 +241,7 @@ func TestTheTryToolsAskAndReadATry(t *testing.T) { // ADR 0501 §5, the agreed i t.Error("the verb tried a repository nothing checks") } // The seat's definition of the verb try gives the members the verb serves (ADR 0637 §6), as the tool takes them, and says so. - def, err := os.ReadFile("../../../../contracts/seats/mesh-delivery-checker/seat.json") + def, err := os.ReadFile("../../../mesh-delivery-contracts/seats/mesh-delivery-checker/seat.json") if err != nil { t.Fatal(err) } diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/bus.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/bus.go index d5323844..4342f010 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/bus.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/bus.go @@ -7,7 +7,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/engines.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/engines.go index 4127a564..884b9955 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/engines.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/engines.go @@ -19,11 +19,11 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" ne "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge.go index 95510f85..e00b1958 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge.go @@ -8,7 +8,7 @@ import ( "github.com/nats-io/nats.go" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "mesh-delivery-checker/internal/check" ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge_test.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge_test.go index 34382893..1803122e 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/forge_test.go @@ -14,10 +14,10 @@ import ( "mesh-delivery-checker/internal/check" ) -// seatAnswer is an answer of the seat git's verb file as its fixtures give it (contracts/seats/git/fixtures/verbs.json). +// seatAnswer is an answer of the seat git's verb file as its fixtures give it (modules/mesh-delivery-contracts/seats/git/fixtures/verbs.json). func seatAnswer(t *testing.T, name string) json.RawMessage { t.Helper() - raw, err := os.ReadFile(filepath.Join("..", "..", "..", "..", "contracts", "seats", "git", "fixtures", "verbs.json")) + raw, err := os.ReadFile(filepath.Join("..", "..", "..", "mesh-delivery-contracts", "seats", "git", "fixtures", "verbs.json")) if err != nil { t.Fatal(err) } diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/integration_test.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/integration_test.go index 102d4024..e9e38ad2 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/integration_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/integration_test.go @@ -35,16 +35,16 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" ne "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/announce" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge.go index 755b3cef..e7470824 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge.go @@ -18,15 +18,15 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // judgeDeps are the parts the judge of a check is made of. diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge_test.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge_test.go index 840c1c5a..6eadf082 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/judge_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/keys" "mesh-delivery-checker/internal/check" diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/main.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/main.go index 4cfe5513..9cdbc8ad 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/main.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/main.go @@ -27,11 +27,11 @@ import ( "mesh-delivery-checker/internal/check" "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/announce" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/packages.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/packages.go index 62b01d53..a1925e82 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/packages.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/packages.go @@ -4,8 +4,8 @@ import ( "strings" "sync" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // publishedPackages is the indexer's state `packages` as the checker follows it (novox/hq ADR 0593 §2): by mesh Go diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk.go index b5b639e1..4cbc5466 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk.go @@ -7,7 +7,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-checker/internal/check" ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk_test.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk_test.go index b2b738ec..611824a6 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk_test.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/trunk_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-checker/internal/check" ) diff --git a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/try_candidates.go b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/try_candidates.go index d2feeece..02120bb6 100644 --- a/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/try_candidates.go +++ b/modules/mesh-delivery-checker/cmd/mesh-delivery-checker/try_candidates.go @@ -7,8 +7,8 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-checker/internal/check" ) diff --git a/modules/mesh-delivery-checker/go.mod b/modules/mesh-delivery-checker/go.mod index 73fb6820..f4deb152 100644 --- a/modules/mesh-delivery-checker/go.mod +++ b/modules/mesh-delivery-checker/go.mod @@ -8,14 +8,14 @@ require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/git v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 @@ -41,7 +41,7 @@ require ( replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun => ../mesh-delivery-builder/buildrun -require git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 require ( git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg v0.0.0-00010101000000-000000000000 @@ -49,15 +49,15 @@ require ( replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg => ./checkermsg -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/ociartifactregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-checker/internal/check/adr548_test.go b/modules/mesh-delivery-checker/internal/check/adr548_test.go index 2d236d4b..10f18b30 100644 --- a/modules/mesh-delivery-checker/internal/check/adr548_test.go +++ b/modules/mesh-delivery-checker/internal/check/adr548_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // One check per delivery (novox/hq ADR 0548): the checker's part. A merge turn holds new checks off its repository (§3); diff --git a/modules/mesh-delivery-checker/internal/check/askagain.go b/modules/mesh-delivery-checker/internal/check/askagain.go index 4a9ec8c5..ace22f6b 100644 --- a/modules/mesh-delivery-checker/internal/check/askagain.go +++ b/modules/mesh-delivery-checker/internal/check/askagain.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **A check is asked again by hand** (the lost check of 2026-10-28; tools-are-how-a-module-is-spoken-to: every recovery diff --git a/modules/mesh-delivery-checker/internal/check/beside.go b/modules/mesh-delivery-checker/internal/check/beside.go index 215711b4..097d588b 100644 --- a/modules/mesh-delivery-checker/internal/check/beside.go +++ b/modules/mesh-delivery-checker/internal/check/beside.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // BesideRef is a sibling repository a repository's tests read, placed beside the fetched tree as a plain directory (ADR diff --git a/modules/mesh-delivery-checker/internal/check/binaries_test.go b/modules/mesh-delivery-checker/internal/check/binaries_test.go index 9e9376c5..dd5b1675 100644 --- a/modules/mesh-delivery-checker/internal/check/binaries_test.go +++ b/modules/mesh-delivery-checker/internal/check/binaries_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func TestAChangeWhoseFetchReportsProgramsFailsNamingEachFile(t *testing.T) { // 1577 diff --git a/modules/mesh-delivery-checker/internal/check/bounded.go b/modules/mesh-delivery-checker/internal/check/bounded.go index de61fc25..f444671d 100644 --- a/modules/mesh-delivery-checker/internal/check/bounded.go +++ b/modules/mesh-delivery-checker/internal/check/bounded.go @@ -6,7 +6,7 @@ import ( "sync" "sync/atomic" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // ReadWorkers is how many values a read tool asks the bus for at once. Each value is a round trip from the tool through the diff --git a/modules/mesh-delivery-checker/internal/check/build_change.go b/modules/mesh-delivery-checker/internal/check/build_change.go index bdd3dd46..45985c49 100644 --- a/modules/mesh-delivery-checker/internal/check/build_change.go +++ b/modules/mesh-delivery-checker/internal/check/build_change.go @@ -9,7 +9,7 @@ import ( "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // What the check builds of a candidate before it composes (novox/hq ADR 0603 §10). The builder builds every fingerprint the diff --git a/modules/mesh-delivery-checker/internal/check/builds.go b/modules/mesh-delivery-checker/internal/check/builds.go index ef5bd073..2493c1da 100644 --- a/modules/mesh-delivery-checker/internal/check/builds.go +++ b/modules/mesh-delivery-checker/internal/check/builds.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // The states of a build the status line says (ADR 0484 clause 7). diff --git a/modules/mesh-delivery-checker/internal/check/buildseats.go b/modules/mesh-delivery-checker/internal/check/buildseats.go index dfa8f7f8..25b6e944 100644 --- a/modules/mesh-delivery-checker/internal/check/buildseats.go +++ b/modules/mesh-delivery-checker/internal/check/buildseats.go @@ -1,7 +1,7 @@ package check import ( - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "mesh-delivery-checker/rules" ) diff --git a/modules/mesh-delivery-checker/internal/check/case.go b/modules/mesh-delivery-checker/internal/check/case.go index f33c96c9..1be72fdb 100644 --- a/modules/mesh-delivery-checker/internal/check/case.go +++ b/modules/mesh-delivery-checker/internal/check/case.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Pull is one pull request the checker judges: its head, the trunk head of its repository it is merged onto and the diff --git a/modules/mesh-delivery-checker/internal/check/checker.go b/modules/mesh-delivery-checker/internal/check/checker.go index 98f4530d..ee6bbf26 100644 --- a/modules/mesh-delivery-checker/internal/check/checker.go +++ b/modules/mesh-delivery-checker/internal/check/checker.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-checker/internal/check/checker_test.go b/modules/mesh-delivery-checker/internal/check/checker_test.go index b5efb00e..0d48110d 100644 --- a/modules/mesh-delivery-checker/internal/check/checker_test.go +++ b/modules/mesh-delivery-checker/internal/check/checker_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-checker/internal/check/composition_test.go b/modules/mesh-delivery-checker/internal/check/composition_test.go index 46437e5c..56f4f5ad 100644 --- a/modules/mesh-delivery-checker/internal/check/composition_test.go +++ b/modules/mesh-delivery-checker/internal/check/composition_test.go @@ -13,11 +13,11 @@ import ( nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" ne "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" buildsrec "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-checker/internal/check/couldnotrun.go b/modules/mesh-delivery-checker/internal/check/couldnotrun.go index 1884aa55..d2fbaf84 100644 --- a/modules/mesh-delivery-checker/internal/check/couldnotrun.go +++ b/modules/mesh-delivery-checker/internal/check/couldnotrun.go @@ -8,8 +8,8 @@ import ( "sort" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // A check that failed because a part of the mesh was not heard says `could not run`, naming the part, and releases its diff --git a/modules/mesh-delivery-checker/internal/check/declared.go b/modules/mesh-delivery-checker/internal/check/declared.go index 274a0ac2..95bf4c55 100644 --- a/modules/mesh-delivery-checker/internal/check/declared.go +++ b/modules/mesh-delivery-checker/internal/check/declared.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-checker/internal/check/digestform_test.go b/modules/mesh-delivery-checker/internal/check/digestform_test.go index 0e1a3f2e..1648c337 100644 --- a/modules/mesh-delivery-checker/internal/check/digestform_test.go +++ b/modules/mesh-delivery-checker/internal/check/digestform_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1930/AC3: given a check ask whose stored end keeps the digest's packages as a list of {package, digest} (issue 1930), diff --git a/modules/mesh-delivery-checker/internal/check/engines.go b/modules/mesh-delivery-checker/internal/check/engines.go index 5ffdd6c5..fa33dfee 100644 --- a/modules/mesh-delivery-checker/internal/check/engines.go +++ b/modules/mesh-delivery-checker/internal/check/engines.go @@ -13,10 +13,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" ne "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" ) // **A check's composition is the checker's, made from what each node's engine answers** (novox/hq ADR 0593 §7, §9). diff --git a/modules/mesh-delivery-checker/internal/check/engines_test.go b/modules/mesh-delivery-checker/internal/check/engines_test.go index 31ea8066..d04b3d2f 100644 --- a/modules/mesh-delivery-checker/internal/check/engines_test.go +++ b/modules/mesh-delivery-checker/internal/check/engines_test.go @@ -13,13 +13,13 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" ne "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // fakeEngines answers compose-candidate by node from memory; a node it holds no answer for never answers. diff --git a/modules/mesh-delivery-checker/internal/check/every_failure_test.go b/modules/mesh-delivery-checker/internal/check/every_failure_test.go index f9666ea2..6016ff00 100644 --- a/modules/mesh-delivery-checker/internal/check/every_failure_test.go +++ b/modules/mesh-delivery-checker/internal/check/every_failure_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // failingResult is a level's test result in which the named tests failed, each in its own package. diff --git a/modules/mesh-delivery-checker/internal/check/examiner_test.go b/modules/mesh-delivery-checker/internal/check/examiner_test.go index 32f9b140..02f7ddc1 100644 --- a/modules/mesh-delivery-checker/internal/check/examiner_test.go +++ b/modules/mesh-delivery-checker/internal/check/examiner_test.go @@ -24,13 +24,13 @@ import ( gobuild "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" "git.novox.be/novox/mesh-contracts/go/seats/meshconfig" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-checker/internal/check/failure_words_test.go b/modules/mesh-delivery-checker/internal/check/failure_words_test.go index 0ec67c82..37e2b87c 100644 --- a/modules/mesh-delivery-checker/internal/check/failure_words_test.go +++ b/modules/mesh-delivery-checker/internal/check/failure_words_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" ) // The failure the build module reported for group r4g on 2026-10-23: the test logged a line, then failed with a multi-line diff --git a/modules/mesh-delivery-checker/internal/check/gate_test.go b/modules/mesh-delivery-checker/internal/check/gate_test.go index 744f5510..63680278 100644 --- a/modules/mesh-delivery-checker/internal/check/gate_test.go +++ b/modules/mesh-delivery-checker/internal/check/gate_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) // What the gate reads of the checker (R4e, lead's interface with dev-r4e-gate): the verdict's heads are the gate's hash over diff --git a/modules/mesh-delivery-checker/internal/check/graph_edges.go b/modules/mesh-delivery-checker/internal/check/graph_edges.go index bb51c3b6..052d9c7d 100644 --- a/modules/mesh-delivery-checker/internal/check/graph_edges.go +++ b/modules/mesh-delivery-checker/internal/check/graph_edges.go @@ -8,12 +8,12 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/catalogue" "mesh-delivery-checker/rules" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // The module graph of a change (novox/hq ADR 0603 §2, ADR 0614 §6): the running checker gathers its ordering edges, the diff --git a/modules/mesh-delivery-checker/internal/check/judge.go b/modules/mesh-delivery-checker/internal/check/judge.go index 05172788..7248789f 100644 --- a/modules/mesh-delivery-checker/internal/check/judge.go +++ b/modules/mesh-delivery-checker/internal/check/judge.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // RunnerWorkspace is the runner the Go build module's digest and test steps are asked with when the merge changes the build diff --git a/modules/mesh-delivery-checker/internal/check/judged_test.go b/modules/mesh-delivery-checker/internal/check/judged_test.go index d35a0321..080e20c2 100644 --- a/modules/mesh-delivery-checker/internal/check/judged_test.go +++ b/modules/mesh-delivery-checker/internal/check/judged_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The judged_by answer of mesh-build-go's digest and test steps (ADR 0535 §5; the milestone file's interface for issue diff --git a/modules/mesh-delivery-checker/internal/check/kept.go b/modules/mesh-delivery-checker/internal/check/kept.go index 5b581634..e00b5b2f 100644 --- a/modules/mesh-delivery-checker/internal/check/kept.go +++ b/modules/mesh-delivery-checker/internal/check/kept.go @@ -7,8 +7,8 @@ import ( "sort" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // Kept is the checker's bucket of kept verdicts (ADR 0444, ADR 0484 clause 13): a passing verdict per package and level, diff --git a/modules/mesh-delivery-checker/internal/check/kept_test.go b/modules/mesh-delivery-checker/internal/check/kept_test.go index 64ba37c7..f6a7abd5 100644 --- a/modules/mesh-delivery-checker/internal/check/kept_test.go +++ b/modules/mesh-delivery-checker/internal/check/kept_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) var at0 = time.Date(2026, 10, 21, 19, 0, 0, 0, time.UTC) diff --git a/modules/mesh-delivery-checker/internal/check/line.go b/modules/mesh-delivery-checker/internal/check/line.go index 56ed9bbb..0dca6e35 100644 --- a/modules/mesh-delivery-checker/internal/check/line.go +++ b/modules/mesh-delivery-checker/internal/check/line.go @@ -7,9 +7,9 @@ import ( "strings" "unicode/utf8" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // MaxLine is the most characters a status's line has: the forge shows a status's description in a short space, and the full diff --git a/modules/mesh-delivery-checker/internal/check/line_test.go b/modules/mesh-delivery-checker/internal/check/line_test.go index 3d8043cd..2b80bb72 100644 --- a/modules/mesh-delivery-checker/internal/check/line_test.go +++ b/modules/mesh-delivery-checker/internal/check/line_test.go @@ -6,10 +6,10 @@ import ( "testing" "unicode/utf8" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func lineCase(t testing.TB, pulls ...meshcatalog.CandidatesByGroupValuePullsItem) (*Case, Pull) { diff --git a/modules/mesh-delivery-checker/internal/check/lostask.go b/modules/mesh-delivery-checker/internal/check/lostask.go index 9fbd0f15..5dae25be 100644 --- a/modules/mesh-delivery-checker/internal/check/lostask.go +++ b/modules/mesh-delivery-checker/internal/check/lostask.go @@ -3,10 +3,10 @@ package check import ( "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - sdkrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + sdkrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" ) // **An ask the build seat gave up on ends its step** (novox/hq issue 734): mesh-sdk buildrun.LostAskWaiter hands the diff --git a/modules/mesh-delivery-checker/internal/check/lostask_test.go b/modules/mesh-delivery-checker/internal/check/lostask_test.go index 43e49384..0e97b81a 100644 --- a/modules/mesh-delivery-checker/internal/check/lostask_test.go +++ b/modules/mesh-delivery-checker/internal/check/lostask_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - sdkrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + sdkrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // losingAsks is the build seat over a bus that gives up the first `lose` asks put (DEAD_LETTERS keeps them, as on diff --git a/modules/mesh-delivery-checker/internal/check/manifests_judge.go b/modules/mesh-delivery-checker/internal/check/manifests_judge.go index b8855c41..81337882 100644 --- a/modules/mesh-delivery-checker/internal/check/manifests_judge.go +++ b/modules/mesh-delivery-checker/internal/check/manifests_judge.go @@ -10,13 +10,13 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-delivery/sdk/packagename" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/packagename" ) // A change's manifests are judged by the indexer's judge (novox/hq ADR 0578 §2): the checker asks the Go build seat to diff --git a/modules/mesh-delivery-checker/internal/check/names.go b/modules/mesh-delivery-checker/internal/check/names.go index 44809d1b..73027652 100644 --- a/modules/mesh-delivery-checker/internal/check/names.go +++ b/modules/mesh-delivery-checker/internal/check/names.go @@ -3,8 +3,8 @@ package check import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // The holders and buckets the checker names. No contract names a holder (novox/hq ADR 0625 §4, ADR 0634 §1), so these are its diff --git a/modules/mesh-delivery-checker/internal/check/owed.go b/modules/mesh-delivery-checker/internal/check/owed.go index 6849e26f..4de3ad97 100644 --- a/modules/mesh-delivery-checker/internal/check/owed.go +++ b/modules/mesh-delivery-checker/internal/check/owed.go @@ -3,9 +3,9 @@ package check import ( "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // The checker's owed state holds the one act it owes, the status mesh/check on a pull request at a head: the gate's owed act diff --git a/modules/mesh-delivery-checker/internal/check/pins.go b/modules/mesh-delivery-checker/internal/check/pins.go index da1df31e..277bedc5 100644 --- a/modules/mesh-delivery-checker/internal/check/pins.go +++ b/modules/mesh-delivery-checker/internal/check/pins.go @@ -5,8 +5,8 @@ import ( "errors" "maps" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/grouppackages" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/grouppackages" ) // **A check builds against the group's own package heads, not against what a member names** (novox/hq ADR 0573 §2, §4; diff --git a/modules/mesh-delivery-checker/internal/check/pins_test.go b/modules/mesh-delivery-checker/internal/check/pins_test.go index eedb4e7e..e7cc68d2 100644 --- a/modules/mesh-delivery-checker/internal/check/pins_test.go +++ b/modules/mesh-delivery-checker/internal/check/pins_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/grouppackages" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/grouppackages" "git.novox.be/novox/mesh-sdk/go/catalogue" ) @@ -238,7 +238,7 @@ func TestACatalogueChangeHasTheCatalogueBesideItAtItsTrunk(t *testing.T) { // derived, not named in a rule (issue 1921); a version a build wrote, or a package outside the forge, is not. b.ex.Forge = headFiles{nodeEngineRepo + " go.mod " + hostRuns: "module github.com/novox/mesh-host\n\ngo 1.26\n\nrequire (\n" + "\tgit.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient v0.0.0-00010101000000-000000000000\n" + - "\tgit.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 // indirect\n" + + "\tgit.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 // indirect\n" + "\tgit.novox.be/novox/mesh-tools/go v0.1.2\n\tgithub.com/nats-io/nats.go v1.40.0\n)\n\n" + "require git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go v0.0.0-00010101000000-000000000000\n"} out := b.judge(t, caseOf(t, pullOf(catalogueRepository, 12, head1))) diff --git a/modules/mesh-delivery-checker/internal/check/preview.go b/modules/mesh-delivery-checker/internal/check/preview.go index c8897276..8cb11808 100644 --- a/modules/mesh-delivery-checker/internal/check/preview.go +++ b/modules/mesh-delivery-checker/internal/check/preview.go @@ -7,8 +7,8 @@ import ( "regexp" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) var digest64 = regexp.MustCompile(`^[0-9a-f]{64}$`) diff --git a/modules/mesh-delivery-checker/internal/check/programs.go b/modules/mesh-delivery-checker/internal/check/programs.go index e0ad2d5e..5ef36dc7 100644 --- a/modules/mesh-delivery-checker/internal/check/programs.go +++ b/modules/mesh-delivery-checker/internal/check/programs.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "mesh-delivery-checker/rules" diff --git a/modules/mesh-delivery-checker/internal/check/rank_test.go b/modules/mesh-delivery-checker/internal/check/rank_test.go index 14705018..4f3961cc 100644 --- a/modules/mesh-delivery-checker/internal/check/rank_test.go +++ b/modules/mesh-delivery-checker/internal/check/rank_test.go @@ -6,10 +6,10 @@ import ( "sync" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // The checker's ranked start of checks (ADR 0536 §4, issue 1897): a freed place goes to a head never judged (or asked again diff --git a/modules/mesh-delivery-checker/internal/check/read.go b/modules/mesh-delivery-checker/internal/check/read.go index 1056369d..3840af64 100644 --- a/modules/mesh-delivery-checker/internal/check/read.go +++ b/modules/mesh-delivery-checker/internal/check/read.go @@ -11,13 +11,13 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The read tools (novox/hq ADR 0484 clauses 8 and 13, issue 1686): what the checker stored, as stored, with the line of the diff --git a/modules/mesh-delivery-checker/internal/check/read_test.go b/modules/mesh-delivery-checker/internal/check/read_test.go index 80c1c1e1..1ba52ccd 100644 --- a/modules/mesh-delivery-checker/internal/check/read_test.go +++ b/modules/mesh-delivery-checker/internal/check/read_test.go @@ -11,12 +11,12 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" buildsrec "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) type fakeState map[string][]byte diff --git a/modules/mesh-delivery-checker/internal/check/results.go b/modules/mesh-delivery-checker/internal/check/results.go index 82a11225..d3accb7c 100644 --- a/modules/mesh-delivery-checker/internal/check/results.go +++ b/modules/mesh-delivery-checker/internal/check/results.go @@ -3,7 +3,7 @@ package check import ( "mesh-delivery-checker/rules" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The shapes of what the build modules' steps answer, as their code writes them (mesh-catalog modules/mesh-build-go diff --git a/modules/mesh-delivery-checker/internal/check/series.go b/modules/mesh-delivery-checker/internal/check/series.go index 1d61bb60..1a6d91db 100644 --- a/modules/mesh-delivery-checker/internal/check/series.go +++ b/modules/mesh-delivery-checker/internal/check/series.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-checker/internal/check/trunkview.go b/modules/mesh-delivery-checker/internal/check/trunkview.go index 75a1638d..d4f4f13d 100644 --- a/modules/mesh-delivery-checker/internal/check/trunkview.go +++ b/modules/mesh-delivery-checker/internal/check/trunkview.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // TrunkVerb is the key of the seat verb the trunk heads are asked by (design 47 G §197). diff --git a/modules/mesh-delivery-checker/internal/check/try.go b/modules/mesh-delivery-checker/internal/check/try.go index 8070e1eb..bb07ebae 100644 --- a/modules/mesh-delivery-checker/internal/check/try.go +++ b/modules/mesh-delivery-checker/internal/check/try.go @@ -14,13 +14,13 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-checker/internal/check/try_test.go b/modules/mesh-delivery-checker/internal/check/try_test.go index a134e869..f537225b 100644 --- a/modules/mesh-delivery-checker/internal/check/try_test.go +++ b/modules/mesh-delivery-checker/internal/check/try_test.go @@ -12,11 +12,11 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // memTries is the tries state as the tools see it, over a memKV. diff --git a/modules/mesh-delivery-checker/internal/check/verdictevent.go b/modules/mesh-delivery-checker/internal/check/verdictevent.go index fa784452..1fcfcc16 100644 --- a/modules/mesh-delivery-checker/internal/check/verdictevent.go +++ b/modules/mesh-delivery-checker/internal/check/verdictevent.go @@ -3,8 +3,8 @@ package check import ( "context" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // EventVerdict is the checker's event that says a pull request's check ended, with the generated files its steps found out diff --git a/modules/mesh-delivery-checker/rules/facts.go b/modules/mesh-delivery-checker/rules/facts.go index caee5d12..b913e864 100644 --- a/modules/mesh-delivery-checker/rules/facts.go +++ b/modules/mesh-delivery-checker/rules/facts.go @@ -13,9 +13,9 @@ import ( "path" "sort" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // FactsVersion is the version of Facts this program reads. A checking program built from a later change reads the facts diff --git a/modules/mesh-delivery-checker/rules/judged.go b/modules/mesh-delivery-checker/rules/judged.go index 7fad5525..e981fc24 100644 --- a/modules/mesh-delivery-checker/rules/judged.go +++ b/modules/mesh-delivery-checker/rules/judged.go @@ -9,11 +9,11 @@ import ( "sort" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" ) // The facts the manifest validator, the fetch's programs and the composer answered, and the rules that judge them diff --git a/modules/mesh-delivery-checker/rules/names.go b/modules/mesh-delivery-checker/rules/names.go index fabcbc3f..5915cdd8 100644 --- a/modules/mesh-delivery-checker/rules/names.go +++ b/modules/mesh-delivery-checker/rules/names.go @@ -1,6 +1,6 @@ package rules -import checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" +import checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" // FailedFirst names what failed: a test (its package and name) or a machine, with the words of the failure. It is the shape // of the verdict's `failed` and of each entry of its `failures` (the seat's two types of it have the same fields), so the diff --git a/modules/mesh-delivery-checker/rules/results.go b/modules/mesh-delivery-checker/rules/results.go index bfc9eff0..a0a3af40 100644 --- a/modules/mesh-delivery-checker/rules/results.go +++ b/modules/mesh-delivery-checker/rules/results.go @@ -1,6 +1,6 @@ package rules -import "git.novox.be/novox/mesh-delivery/sdk/buildstep" +import "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" // The shapes of a test step's answer, as the build modules' code writes them (mesh-catalog modules/mesh-build-go // cmd/mesh-build-go levels.go TestResult; modules/mesh-build-node cmd/mesh-build-node check.go TestResult). Only the diff --git a/modules/mesh-delivery-checker/rules/seats.go b/modules/mesh-delivery-checker/rules/seats.go index 1c51289a..1e3a37c8 100644 --- a/modules/mesh-delivery-checker/rules/seats.go +++ b/modules/mesh-delivery-checker/rules/seats.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/sdk/seatdefs" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/seatdefs" ) // The seat list a check judges and composes against (novox/hq ADR 0636 §1, §4, ADR 0644 §1; the lead's rulings Q2 on diff --git a/modules/mesh-delivery-checker/rules/words.go b/modules/mesh-delivery-checker/rules/words.go index 8e84c982..57c232d0 100644 --- a/modules/mesh-delivery-checker/rules/words.go +++ b/modules/mesh-delivery-checker/rules/words.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The words rules: how a failed test, a failed package and a list of failures are worded in a verdict (issue 1901, issue diff --git a/contracts/go/clients/containerimageregistryclient/client.go b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client.go similarity index 94% rename from contracts/go/clients/containerimageregistryclient/client.go rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client.go index 3616faf7..249d10ce 100644 --- a/contracts/go/clients/containerimageregistryclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // Call asks one verb of the seat, `seat:.`, with a body, and answers its JSON. diff --git a/contracts/go/clients/containerimageregistryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client_test.go similarity index 91% rename from contracts/go/clients/containerimageregistryclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client_test.go index 7b77d5f5..77dcdc57 100644 --- a/contracts/go/clients/containerimageregistryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/client_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The client publishes over its own seat's verbs alone (ADR 0627 §1): publish names every part, and only the part the diff --git a/contracts/go/clients/ociartifactregistryclient/go.mod b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/go.mod similarity index 53% rename from contracts/go/clients/ociartifactregistryclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/go.mod index 41d70d47..53b1054f 100644 --- a/contracts/go/clients/ociartifactregistryclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/go.mod @@ -1,10 +1,10 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/ociartifactregistryclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) require ( diff --git a/contracts/go/clients/containerimageregistryclient/go.sum b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/go.sum similarity index 100% rename from contracts/go/clients/containerimageregistryclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/go.sum diff --git a/contracts/go/clients/containerimageregistryclient/reference/reference.go b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference/reference.go similarity index 100% rename from contracts/go/clients/containerimageregistryclient/reference/reference.go rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference/reference.go diff --git a/contracts/go/clients/containerimageregistryclient/reference/reference_test.go b/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference/reference_test.go similarity index 100% rename from contracts/go/clients/containerimageregistryclient/reference/reference_test.go rename to modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference/reference_test.go diff --git a/contracts/go/clients/gopackageregistryclient/client.go b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client.go similarity index 94% rename from contracts/go/clients/gopackageregistryclient/client.go rename to modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client.go index 39cdb75f..4bbda8c8 100644 --- a/contracts/go/clients/gopackageregistryclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // Call asks one verb of the seat, `seat:.`, with a body, and answers its JSON. diff --git a/contracts/go/clients/gopackageregistryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client_test.go similarity index 92% rename from contracts/go/clients/gopackageregistryclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client_test.go index 3405e705..e5ca942f 100644 --- a/contracts/go/clients/gopackageregistryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/client_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The client publishes over its own seat's verbs alone (ADR 0627 §1): publish names every part, and only the part the diff --git a/contracts/go/clients/gopackageregistryclient/go.mod b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/go.mod similarity index 53% rename from contracts/go/clients/gopackageregistryclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/go.mod index 0d0d1bb9..2914dd30 100644 --- a/contracts/go/clients/gopackageregistryclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/go.mod @@ -1,10 +1,10 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) require ( diff --git a/contracts/go/clients/gopackageregistryclient/go.sum b/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/go.sum similarity index 100% rename from contracts/go/clients/gopackageregistryclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/gopackageregistryclient/go.sum diff --git a/contracts/go/clients/meshbuildsclient/client.go b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client.go similarity index 96% rename from contracts/go/clients/meshbuildsclient/client.go rename to modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client.go index e1f7c778..aa6ddf74 100644 --- a/contracts/go/clients/meshbuildsclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // Address is the seat verb asked, as a manifest's `invokes` names it. diff --git a/contracts/go/clients/meshbuildsclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client_test.go similarity index 96% rename from contracts/go/clients/meshbuildsclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client_test.go index 86e4b10c..6aeb9a24 100644 --- a/contracts/go/clients/meshbuildsclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/client_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) func answers(raw string, err error) Call { diff --git a/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/go.mod new file mode 100644 index 00000000..4c053eb4 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/clients/meshbuildsclient/go.mod @@ -0,0 +1,5 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshbuildsclient + +go 1.26.0 + +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 diff --git a/contracts/go/clients/meshcatalogclient/branches.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches.go similarity index 98% rename from contracts/go/clients/meshcatalogclient/branches.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches.go index 7c10d232..d9a149be 100644 --- a/contracts/go/clients/meshcatalogclient/branches.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches.go @@ -9,8 +9,8 @@ import ( "sync" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/sourcebranches" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/sourcebranches" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/contracts/go/clients/meshcatalogclient/branches_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches_test.go similarity index 97% rename from contracts/go/clients/meshcatalogclient/branches_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches_test.go index c2324293..34c5937b 100644 --- a/contracts/go/clients/meshcatalogclient/branches_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/branches_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/sourcebranches" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/sourcebranches" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshcatalogclient/candidate.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/candidate.go similarity index 96% rename from contracts/go/clients/meshcatalogclient/candidate.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/candidate.go index 41d60d5a..e609af0b 100644 --- a/contracts/go/clients/meshcatalogclient/candidate.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/candidate.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshcatalogclient/catalog.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog.go similarity index 99% rename from contracts/go/clients/meshcatalogclient/catalog.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog.go index a3c9afe5..c06d6453 100644 --- a/contracts/go/clients/meshcatalogclient/catalog.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog.go @@ -10,7 +10,7 @@ import ( "sync" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/contracts/go/clients/meshcatalogclient/catalog_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_test.go similarity index 99% rename from contracts/go/clients/meshcatalogclient/catalog_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_test.go index a1c7404b..b56f9be0 100644 --- a/contracts/go/clients/meshcatalogclient/catalog_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshcatalogclient/catalog_view_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_view_test.go similarity index 98% rename from contracts/go/clients/meshcatalogclient/catalog_view_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_view_test.go index f62ee9d3..6c74285e 100644 --- a/contracts/go/clients/meshcatalogclient/catalog_view_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/catalog_view_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshcatalogclient/entry.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry.go similarity index 98% rename from contracts/go/clients/meshcatalogclient/entry.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry.go index efcc5bf8..19e6ff16 100644 --- a/contracts/go/clients/meshcatalogclient/entry.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry.go @@ -6,7 +6,7 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshcatalogclient/entry_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry_test.go similarity index 97% rename from contracts/go/clients/meshcatalogclient/entry_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry_test.go index 0d282f3c..3a92d0a5 100644 --- a/contracts/go/clients/meshcatalogclient/entry_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/entry_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshcatalogclient/fingerprint.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/fingerprint.go similarity index 92% rename from contracts/go/clients/meshcatalogclient/fingerprint.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/fingerprint.go index af64bd7b..677e737d 100644 --- a/contracts/go/clients/meshcatalogclient/fingerprint.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/fingerprint.go @@ -5,7 +5,7 @@ package meshcatalogclient import ( - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" ) // SourcePrefix2 opens every source fingerprint of the form. diff --git a/contracts/go/clients/meshcatalogclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/go.mod similarity index 53% rename from contracts/go/clients/meshcatalogclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/go.mod index d53c1dfc..1a5d2464 100644 --- a/contracts/go/clients/meshcatalogclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/go.mod @@ -1,10 +1,10 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) diff --git a/contracts/go/clients/meshcatalogclient/go.sum b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/go.sum similarity index 100% rename from contracts/go/clients/meshcatalogclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/go.sum diff --git a/contracts/go/clients/meshcatalogclient/imports_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/imports_test.go similarity index 100% rename from contracts/go/clients/meshcatalogclient/imports_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/imports_test.go diff --git a/contracts/go/clients/meshcatalogclient/manifest.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/manifest.go similarity index 96% rename from contracts/go/clients/meshcatalogclient/manifest.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/manifest.go index 38c46616..460d1074 100644 --- a/contracts/go/clients/meshcatalogclient/manifest.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/manifest.go @@ -7,7 +7,7 @@ import ( "fmt" "unicode/utf8" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshcatalogclient/module.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/module.go similarity index 97% rename from contracts/go/clients/meshcatalogclient/module.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/module.go index 277e482f..87c4d7c8 100644 --- a/contracts/go/clients/meshcatalogclient/module.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/module.go @@ -6,8 +6,8 @@ import ( "path" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshcatalogclient/registrations.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations.go similarity index 97% rename from contracts/go/clients/meshcatalogclient/registrations.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations.go index 47a262c2..644808d9 100644 --- a/contracts/go/clients/meshcatalogclient/registrations.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/sdk/sourcebranches" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/sourcebranches" "slices" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshcatalogclient/registrations_test.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations_test.go similarity index 97% rename from contracts/go/clients/meshcatalogclient/registrations_test.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations_test.go index 66ff2546..2aca0466 100644 --- a/contracts/go/clients/meshcatalogclient/registrations_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/registrations_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // fakeRegistrations answers the verb registrations from the versions it keeps, and counts each ask. diff --git a/contracts/go/clients/meshcatalogclient/verdict.go b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/verdict.go similarity index 98% rename from contracts/go/clients/meshcatalogclient/verdict.go rename to modules/mesh-delivery-contracts/go/clients/meshcatalogclient/verdict.go index 0e398221..2f4bcdfb 100644 --- a/contracts/go/clients/meshcatalogclient/verdict.go +++ b/modules/mesh-delivery-contracts/go/clients/meshcatalogclient/verdict.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshdeliverycheckerclient/client.go b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client.go similarity index 99% rename from contracts/go/clients/meshdeliverycheckerclient/client.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client.go index 7e2acbf3..c9ccff63 100644 --- a/contracts/go/clients/meshdeliverycheckerclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client.go @@ -9,7 +9,7 @@ import ( pathpkg "path" "strings" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshdeliverycheckerclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client_test.go similarity index 99% rename from contracts/go/clients/meshdeliverycheckerclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client_test.go index 38c651c0..657889bc 100644 --- a/contracts/go/clients/meshdeliverycheckerclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/client_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) type verdict = checker.VerdictsByGroupHeadsValue diff --git a/contracts/go/clients/meshdeliverycheckerclient/codec.go b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/codec.go similarity index 98% rename from contracts/go/clients/meshdeliverycheckerclient/codec.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/codec.go index c684e73d..59162b97 100644 --- a/contracts/go/clients/meshdeliverycheckerclient/codec.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/codec.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/go.mod new file mode 100644 index 00000000..e8930ad4 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/go.mod @@ -0,0 +1,8 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient + +go 1.26.0 + +require ( + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 +) diff --git a/contracts/go/clients/meshdeliverycheckerclient/input.go b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/input.go similarity index 95% rename from contracts/go/clients/meshdeliverycheckerclient/input.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/input.go index 1594df80..106c908b 100644 --- a/contracts/go/clients/meshdeliverycheckerclient/input.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient/input.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" ) // InputVerb is the seat's verb input as a manifest's `invokes` names it and a run ask's input names it: asked of the diff --git a/contracts/go/clients/meshdeliveryclient/client.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client.go similarity index 99% rename from contracts/go/clients/meshdeliveryclient/client.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client.go index 590b5345..48a8236f 100644 --- a/contracts/go/clients/meshdeliveryclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshdeliveryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go similarity index 97% rename from contracts/go/clients/meshdeliveryclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go index 9fcfc582..a8f0e9e1 100644 --- a/contracts/go/clients/meshdeliveryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/client_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) // The keys, ids and acts equal what the gate and the teller have always written (the expected strings are the trunk's own diff --git a/contracts/go/clients/meshdeliveryclient/gate.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate.go similarity index 99% rename from contracts/go/clients/meshdeliveryclient/gate.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate.go index fa56a1c1..076ffc66 100644 --- a/contracts/go/clients/meshdeliveryclient/gate.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate.go @@ -9,7 +9,7 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshdeliveryclient/gate_test.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate_test.go similarity index 99% rename from contracts/go/clients/meshdeliveryclient/gate_test.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate_test.go index afcee870..0e751573 100644 --- a/contracts/go/clients/meshdeliveryclient/gate_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/gate_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.mod new file mode 100644 index 00000000..01d46bdf --- /dev/null +++ b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.mod @@ -0,0 +1,8 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient + +go 1.26.0 + +require ( + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 +) diff --git a/contracts/go/clients/meshdeliveryclient/go.sum b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.sum similarity index 100% rename from contracts/go/clients/meshdeliveryclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/go.sum diff --git a/contracts/go/clients/meshdeliveryclient/switched.go b/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/switched.go similarity index 100% rename from contracts/go/clients/meshdeliveryclient/switched.go rename to modules/mesh-delivery-contracts/go/clients/meshdeliveryclient/switched.go diff --git a/contracts/go/clients/meshpipelinerunnerclient/client.go b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client.go similarity index 97% rename from contracts/go/clients/meshpipelinerunnerclient/client.go rename to modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client.go index fd0c3f4c..6737b00b 100644 --- a/contracts/go/clients/meshpipelinerunnerclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshpipelinerunnerclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client_test.go similarity index 95% rename from contracts/go/clients/meshpipelinerunnerclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client_test.go index ee619155..dfab1a4d 100644 --- a/contracts/go/clients/meshpipelinerunnerclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/client_test.go @@ -3,7 +3,7 @@ package meshpipelinerunnerclient import ( "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) // A-D7: the subject carries the module, the branch and the commit or group, each escaped as a key's name is, and is diff --git a/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.mod new file mode 100644 index 00000000..a9b1b2b7 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.mod @@ -0,0 +1,8 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient + +go 1.26.0 + +require ( + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 +) diff --git a/contracts/go/clients/meshpipelinerunnerclient/go.sum b/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.sum similarity index 100% rename from contracts/go/clients/meshpipelinerunnerclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient/go.sum diff --git a/contracts/go/clients/meshwantsclient/assignment.go b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment.go similarity index 98% rename from contracts/go/clients/meshwantsclient/assignment.go rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment.go index 19a716b1..1dc8e403 100644 --- a/contracts/go/clients/meshwantsclient/assignment.go +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment.go @@ -8,7 +8,7 @@ import ( "sync" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/contracts/go/clients/meshwantsclient/assignment_test.go b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment_test.go similarity index 97% rename from contracts/go/clients/meshwantsclient/assignment_test.go rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment_test.go index 9d511a02..af734bc5 100644 --- a/contracts/go/clients/meshwantsclient/assignment_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/assignment_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // fakeWants answers the verb revision with its newest trunk revision, and counts each ask. diff --git a/contracts/go/clients/meshwantsclient/go.mod b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/go.mod similarity index 62% rename from contracts/go/clients/meshwantsclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/go.mod index 88f343dc..1dc95e2c 100644 --- a/contracts/go/clients/meshwantsclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/go.mod @@ -1,9 +1,9 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) diff --git a/contracts/go/clients/meshwantsclient/go.sum b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/go.sum similarity index 100% rename from contracts/go/clients/meshwantsclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/go.sum diff --git a/contracts/go/clients/meshwantsclient/placed.go b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/placed.go similarity index 97% rename from contracts/go/clients/meshwantsclient/placed.go rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/placed.go index 5ebbf357..6708af96 100644 --- a/contracts/go/clients/meshwantsclient/placed.go +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/placed.go @@ -6,7 +6,7 @@ import ( "sync" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // Placed is where the assignment half (the seat mesh-wants' assignment graph revisions; design 47 *The revision view*) diff --git a/contracts/go/clients/meshwantsclient/wants.go b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants.go similarity index 99% rename from contracts/go/clients/meshwantsclient/wants.go rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants.go index 1b79073e..6a4cd96f 100644 --- a/contracts/go/clients/meshwantsclient/wants.go +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/meshwantsclient/wants_test.go b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants_test.go similarity index 99% rename from contracts/go/clients/meshwantsclient/wants_test.go rename to modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants_test.go index a621583d..cb6ec2c7 100644 --- a/contracts/go/clients/meshwantsclient/wants_test.go +++ b/modules/mesh-delivery-contracts/go/clients/meshwantsclient/wants_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/contracts/go/clients/npmpackageregistryclient/client.go b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client.go similarity index 94% rename from contracts/go/clients/npmpackageregistryclient/client.go rename to modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client.go index 82625d6e..c35810ae 100644 --- a/contracts/go/clients/npmpackageregistryclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // Call asks one verb of the seat, `seat:.`, with a body, and answers its JSON. diff --git a/contracts/go/clients/npmpackageregistryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client_test.go similarity index 92% rename from contracts/go/clients/npmpackageregistryclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client_test.go index 916ba073..9f5e627c 100644 --- a/contracts/go/clients/npmpackageregistryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/client_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The client publishes over its own seat's verbs alone (ADR 0627 §1): publish names every part, and only the part the diff --git a/contracts/go/clients/npmpackageregistryclient/go.mod b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/go.mod similarity index 53% rename from contracts/go/clients/npmpackageregistryclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/go.mod index 98e83727..7eb2d1ee 100644 --- a/contracts/go/clients/npmpackageregistryclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/go.mod @@ -1,10 +1,10 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) require ( diff --git a/contracts/go/clients/npmpackageregistryclient/go.sum b/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/go.sum similarity index 100% rename from contracts/go/clients/npmpackageregistryclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient/go.sum diff --git a/contracts/go/clients/ociartifactregistryclient/client.go b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client.go similarity index 94% rename from contracts/go/clients/ociartifactregistryclient/client.go rename to modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client.go index 2892757d..68e1c6a8 100644 --- a/contracts/go/clients/ociartifactregistryclient/client.go +++ b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // Call asks one verb of the seat, `seat:.`, with a body, and answers its JSON. diff --git a/contracts/go/clients/ociartifactregistryclient/client_test.go b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client_test.go similarity index 92% rename from contracts/go/clients/ociartifactregistryclient/client_test.go rename to modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client_test.go index 6c340fd1..79ea86d4 100644 --- a/contracts/go/clients/ociartifactregistryclient/client_test.go +++ b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/client_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The client publishes over its own seat's verbs alone (ADR 0627 §1): publish names every part, and only the part the diff --git a/contracts/go/clients/containerimageregistryclient/go.mod b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/go.mod similarity index 53% rename from contracts/go/clients/containerimageregistryclient/go.mod rename to modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/go.mod index 17316125..8c3ad757 100644 --- a/contracts/go/clients/containerimageregistryclient/go.mod +++ b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/go.mod @@ -1,10 +1,10 @@ -module git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) require ( diff --git a/contracts/go/clients/ociartifactregistryclient/go.sum b/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/go.sum similarity index 100% rename from contracts/go/clients/ociartifactregistryclient/go.sum rename to modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient/go.sum diff --git a/contracts/go/seats/containerimageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go similarity index 100% rename from contracts/go/seats/containerimageregistry/contract.go rename to modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go diff --git a/contracts/go/seats/containerimageregistry/contract_test.go b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract_test.go similarity index 100% rename from contracts/go/seats/containerimageregistry/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/containerimageregistry/go.mod b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/go.mod new file mode 100644 index 00000000..4f84a803 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry + +go 1.26.0 diff --git a/contracts/go/seats/git/contract.go b/modules/mesh-delivery-contracts/go/seats/git/contract.go similarity index 100% rename from contracts/go/seats/git/contract.go rename to modules/mesh-delivery-contracts/go/seats/git/contract.go diff --git a/contracts/go/seats/git/contract_test.go b/modules/mesh-delivery-contracts/go/seats/git/contract_test.go similarity index 100% rename from contracts/go/seats/git/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/git/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/git/go.mod b/modules/mesh-delivery-contracts/go/seats/git/go.mod new file mode 100644 index 00000000..41e96f4a --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/git/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git + +go 1.26.0 diff --git a/contracts/go/seats/gopackageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go similarity index 100% rename from contracts/go/seats/gopackageregistry/contract.go rename to modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go diff --git a/contracts/go/seats/gopackageregistry/contract_test.go b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract_test.go similarity index 100% rename from contracts/go/seats/gopackageregistry/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/gopackageregistry/go.mod b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/go.mod new file mode 100644 index 00000000..a397a011 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry + +go 1.26.0 diff --git a/contracts/go/seats/meshartifactsweep/contract.go b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go similarity index 100% rename from contracts/go/seats/meshartifactsweep/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go diff --git a/contracts/go/seats/meshartifactsweep/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract_test.go similarity index 100% rename from contracts/go/seats/meshartifactsweep/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/go.mod b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/go.mod new file mode 100644 index 00000000..9c2cd6e6 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep + +go 1.26.0 diff --git a/contracts/go/seats/meshbuilds/contract.go b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go similarity index 100% rename from contracts/go/seats/meshbuilds/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go diff --git a/contracts/go/seats/meshbuilds/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go similarity index 100% rename from contracts/go/seats/meshbuilds/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshbuilds/go.mod b/modules/mesh-delivery-contracts/go/seats/meshbuilds/go.mod new file mode 100644 index 00000000..aa6f4aa2 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshbuilds/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds + +go 1.26.0 diff --git a/contracts/go/seats/meshcatalog/contract.go b/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go similarity index 100% rename from contracts/go/seats/meshcatalog/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go diff --git a/contracts/go/seats/meshcatalog/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract_test.go similarity index 100% rename from contracts/go/seats/meshcatalog/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshcatalog/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshcatalog/go.mod b/modules/mesh-delivery-contracts/go/seats/meshcatalog/go.mod new file mode 100644 index 00000000..d4fbc821 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshcatalog/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog + +go 1.26.0 diff --git a/contracts/go/seats/meshdelivery/contract.go b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go similarity index 100% rename from contracts/go/seats/meshdelivery/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go diff --git a/contracts/go/seats/meshdelivery/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract_test.go similarity index 100% rename from contracts/go/seats/meshdelivery/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshdelivery/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshdelivery/go.mod b/modules/mesh-delivery-contracts/go/seats/meshdelivery/go.mod new file mode 100644 index 00000000..4e1e0e7c --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshdelivery/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery + +go 1.26.0 diff --git a/contracts/go/seats/meshdeliverychecker/contract.go b/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/contract.go similarity index 100% rename from contracts/go/seats/meshdeliverychecker/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/contract.go diff --git a/contracts/go/seats/meshdeliverychecker/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/contract_test.go similarity index 100% rename from contracts/go/seats/meshdeliverychecker/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/go.mod b/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/go.mod new file mode 100644 index 00000000..50d16d24 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker + +go 1.26.0 diff --git a/contracts/go/seats/meshpipelinerunner/contract.go b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go similarity index 100% rename from contracts/go/seats/meshpipelinerunner/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go diff --git a/contracts/go/seats/meshpipelinerunner/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract_test.go similarity index 100% rename from contracts/go/seats/meshpipelinerunner/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/go.mod b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/go.mod new file mode 100644 index 00000000..332bfe8d --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner + +go 1.26.0 diff --git a/contracts/go/seats/meshwants/contract.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go similarity index 100% rename from contracts/go/seats/meshwants/contract.go rename to modules/mesh-delivery-contracts/go/seats/meshwants/contract.go diff --git a/contracts/go/seats/meshwants/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go similarity index 100% rename from contracts/go/seats/meshwants/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/meshwants/go.mod b/modules/mesh-delivery-contracts/go/seats/meshwants/go.mod new file mode 100644 index 00000000..18d6eb0f --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/meshwants/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants + +go 1.26.0 diff --git a/contracts/go/seats/nodebuildgo/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go similarity index 100% rename from contracts/go/seats/nodebuildgo/contract.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go diff --git a/contracts/go/seats/nodebuildgo/contract_test.go b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract_test.go similarity index 100% rename from contracts/go/seats/nodebuildgo/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildgo/go.mod b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/go.mod new file mode 100644 index 00000000..566451aa --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo + +go 1.26.0 diff --git a/contracts/go/seats/nodebuildimage/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go similarity index 100% rename from contracts/go/seats/nodebuildimage/contract.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go diff --git a/contracts/go/seats/nodebuildimage/contract_test.go b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract_test.go similarity index 100% rename from contracts/go/seats/nodebuildimage/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildimage/go.mod b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/go.mod new file mode 100644 index 00000000..3f58e3a1 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage + +go 1.26.0 diff --git a/contracts/go/seats/nodebuildnode/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go similarity index 100% rename from contracts/go/seats/nodebuildnode/contract.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go diff --git a/contracts/go/seats/nodebuildnode/contract_test.go b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract_test.go similarity index 100% rename from contracts/go/seats/nodebuildnode/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildnode/go.mod b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/go.mod new file mode 100644 index 00000000..ba46f1ae --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode + +go 1.26.0 diff --git a/contracts/go/seats/npmpackageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go similarity index 100% rename from contracts/go/seats/npmpackageregistry/contract.go rename to modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go diff --git a/contracts/go/seats/npmpackageregistry/contract_test.go b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract_test.go similarity index 100% rename from contracts/go/seats/npmpackageregistry/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/go.mod b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/go.mod new file mode 100644 index 00000000..d2f31733 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry + +go 1.26.0 diff --git a/contracts/go/seats/ociartifactregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go similarity index 100% rename from contracts/go/seats/ociartifactregistry/contract.go rename to modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go diff --git a/contracts/go/seats/ociartifactregistry/contract_test.go b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract_test.go similarity index 100% rename from contracts/go/seats/ociartifactregistry/contract_test.go rename to modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract_test.go diff --git a/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/go.mod b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/go.mod new file mode 100644 index 00000000..02168816 --- /dev/null +++ b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/go.mod @@ -0,0 +1,3 @@ +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry + +go 1.26.0 diff --git a/contracts/module.json b/modules/mesh-delivery-contracts/module.json similarity index 100% rename from contracts/module.json rename to modules/mesh-delivery-contracts/module.json diff --git a/contracts/parts/build-step.json b/modules/mesh-delivery-contracts/parts/build-step.json similarity index 100% rename from contracts/parts/build-step.json rename to modules/mesh-delivery-contracts/parts/build-step.json diff --git a/contracts/parts/registry.json b/modules/mesh-delivery-contracts/parts/registry.json similarity index 100% rename from contracts/parts/registry.json rename to modules/mesh-delivery-contracts/parts/registry.json diff --git a/contracts/seats/container-image-registry/fixtures/events.json b/modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/events.json similarity index 100% rename from contracts/seats/container-image-registry/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/events.json diff --git a/contracts/seats/container-image-registry/fixtures/states.json b/modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/states.json similarity index 100% rename from contracts/seats/container-image-registry/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/states.json diff --git a/contracts/seats/container-image-registry/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/verbs.json similarity index 100% rename from contracts/seats/container-image-registry/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/container-image-registry/fixtures/verbs.json diff --git a/contracts/seats/container-image-registry/seat.json b/modules/mesh-delivery-contracts/seats/container-image-registry/seat.json similarity index 100% rename from contracts/seats/container-image-registry/seat.json rename to modules/mesh-delivery-contracts/seats/container-image-registry/seat.json diff --git a/contracts/seats/git/fixtures/events.json b/modules/mesh-delivery-contracts/seats/git/fixtures/events.json similarity index 100% rename from contracts/seats/git/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/git/fixtures/events.json diff --git a/contracts/seats/git/fixtures/states.json b/modules/mesh-delivery-contracts/seats/git/fixtures/states.json similarity index 100% rename from contracts/seats/git/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/git/fixtures/states.json diff --git a/contracts/seats/git/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/git/fixtures/verbs.json similarity index 100% rename from contracts/seats/git/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/git/fixtures/verbs.json diff --git a/contracts/seats/git/seat.json b/modules/mesh-delivery-contracts/seats/git/seat.json similarity index 100% rename from contracts/seats/git/seat.json rename to modules/mesh-delivery-contracts/seats/git/seat.json diff --git a/contracts/seats/go-package-registry/fixtures/events.json b/modules/mesh-delivery-contracts/seats/go-package-registry/fixtures/events.json similarity index 100% rename from contracts/seats/go-package-registry/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/go-package-registry/fixtures/events.json diff --git a/contracts/seats/go-package-registry/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/go-package-registry/fixtures/verbs.json similarity index 100% rename from contracts/seats/go-package-registry/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/go-package-registry/fixtures/verbs.json diff --git a/contracts/seats/go-package-registry/seat.json b/modules/mesh-delivery-contracts/seats/go-package-registry/seat.json similarity index 100% rename from contracts/seats/go-package-registry/seat.json rename to modules/mesh-delivery-contracts/seats/go-package-registry/seat.json diff --git a/contracts/seats/mesh-artifact-store/seat.json b/modules/mesh-delivery-contracts/seats/mesh-artifact-store/seat.json similarity index 100% rename from contracts/seats/mesh-artifact-store/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-artifact-store/seat.json diff --git a/contracts/seats/mesh-artifact-sweep/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-artifact-sweep/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/events.json diff --git a/contracts/seats/mesh-artifact-sweep/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-artifact-sweep/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/states.json diff --git a/contracts/seats/mesh-artifact-sweep/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-artifact-sweep/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/fixtures/verbs.json diff --git a/contracts/seats/mesh-artifact-sweep/seat.json b/modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/seat.json similarity index 100% rename from contracts/seats/mesh-artifact-sweep/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-artifact-sweep/seat.json diff --git a/contracts/seats/mesh-builds/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-builds/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json diff --git a/contracts/seats/mesh-builds/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-builds/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/verbs.json diff --git a/contracts/seats/mesh-builds/seat.json b/modules/mesh-delivery-contracts/seats/mesh-builds/seat.json similarity index 100% rename from contracts/seats/mesh-builds/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-builds/seat.json diff --git a/contracts/seats/mesh-catalog/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-catalog/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/events.json diff --git a/contracts/seats/mesh-catalog/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-catalog/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/states.json diff --git a/contracts/seats/mesh-catalog/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-catalog/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-catalog/fixtures/verbs.json diff --git a/contracts/seats/mesh-catalog/seat.json b/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json similarity index 100% rename from contracts/seats/mesh-catalog/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json diff --git a/contracts/seats/mesh-delivery-checker/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-delivery-checker/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/events.json diff --git a/contracts/seats/mesh-delivery-checker/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-delivery-checker/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/states.json diff --git a/contracts/seats/mesh-delivery-checker/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-delivery-checker/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery-checker/fixtures/verbs.json diff --git a/contracts/seats/mesh-delivery-checker/seat.json b/modules/mesh-delivery-contracts/seats/mesh-delivery-checker/seat.json similarity index 100% rename from contracts/seats/mesh-delivery-checker/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery-checker/seat.json diff --git a/contracts/seats/mesh-delivery/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-delivery/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/events.json diff --git a/contracts/seats/mesh-delivery/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-delivery/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/states.json diff --git a/contracts/seats/mesh-delivery/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-delivery/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery/fixtures/verbs.json diff --git a/contracts/seats/mesh-delivery/seat.json b/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json similarity index 100% rename from contracts/seats/mesh-delivery/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json diff --git a/contracts/seats/mesh-pipeline-runner/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-pipeline-runner/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/events.json diff --git a/contracts/seats/mesh-pipeline-runner/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-pipeline-runner/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/states.json diff --git a/contracts/seats/mesh-pipeline-runner/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-pipeline-runner/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/fixtures/verbs.json diff --git a/contracts/seats/mesh-pipeline-runner/seat.json b/modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/seat.json similarity index 100% rename from contracts/seats/mesh-pipeline-runner/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-pipeline-runner/seat.json diff --git a/contracts/seats/mesh-wants/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json similarity index 100% rename from contracts/seats/mesh-wants/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json diff --git a/contracts/seats/mesh-wants/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json similarity index 100% rename from contracts/seats/mesh-wants/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json diff --git a/contracts/seats/mesh-wants/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/verbs.json similarity index 100% rename from contracts/seats/mesh-wants/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/verbs.json diff --git a/contracts/seats/mesh-wants/seat.json b/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json similarity index 100% rename from contracts/seats/mesh-wants/seat.json rename to modules/mesh-delivery-contracts/seats/mesh-wants/seat.json diff --git a/contracts/seats/node-build-go/fixtures/events.json b/modules/mesh-delivery-contracts/seats/node-build-go/fixtures/events.json similarity index 100% rename from contracts/seats/node-build-go/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/node-build-go/fixtures/events.json diff --git a/contracts/seats/node-build-go/fixtures/states.json b/modules/mesh-delivery-contracts/seats/node-build-go/fixtures/states.json similarity index 100% rename from contracts/seats/node-build-go/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/node-build-go/fixtures/states.json diff --git a/contracts/seats/node-build-go/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/node-build-go/fixtures/verbs.json similarity index 100% rename from contracts/seats/node-build-go/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/node-build-go/fixtures/verbs.json diff --git a/contracts/seats/node-build-go/seat.json b/modules/mesh-delivery-contracts/seats/node-build-go/seat.json similarity index 100% rename from contracts/seats/node-build-go/seat.json rename to modules/mesh-delivery-contracts/seats/node-build-go/seat.json diff --git a/contracts/seats/node-build-image/fixtures/events.json b/modules/mesh-delivery-contracts/seats/node-build-image/fixtures/events.json similarity index 100% rename from contracts/seats/node-build-image/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/node-build-image/fixtures/events.json diff --git a/contracts/seats/node-build-image/fixtures/states.json b/modules/mesh-delivery-contracts/seats/node-build-image/fixtures/states.json similarity index 100% rename from contracts/seats/node-build-image/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/node-build-image/fixtures/states.json diff --git a/contracts/seats/node-build-image/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/node-build-image/fixtures/verbs.json similarity index 100% rename from contracts/seats/node-build-image/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/node-build-image/fixtures/verbs.json diff --git a/contracts/seats/node-build-image/seat.json b/modules/mesh-delivery-contracts/seats/node-build-image/seat.json similarity index 100% rename from contracts/seats/node-build-image/seat.json rename to modules/mesh-delivery-contracts/seats/node-build-image/seat.json diff --git a/contracts/seats/node-build-node/fixtures/events.json b/modules/mesh-delivery-contracts/seats/node-build-node/fixtures/events.json similarity index 100% rename from contracts/seats/node-build-node/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/node-build-node/fixtures/events.json diff --git a/contracts/seats/node-build-node/fixtures/states.json b/modules/mesh-delivery-contracts/seats/node-build-node/fixtures/states.json similarity index 100% rename from contracts/seats/node-build-node/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/node-build-node/fixtures/states.json diff --git a/contracts/seats/node-build-node/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/node-build-node/fixtures/verbs.json similarity index 100% rename from contracts/seats/node-build-node/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/node-build-node/fixtures/verbs.json diff --git a/contracts/seats/node-build-node/seat.json b/modules/mesh-delivery-contracts/seats/node-build-node/seat.json similarity index 100% rename from contracts/seats/node-build-node/seat.json rename to modules/mesh-delivery-contracts/seats/node-build-node/seat.json diff --git a/contracts/seats/npm-package-registry/fixtures/events.json b/modules/mesh-delivery-contracts/seats/npm-package-registry/fixtures/events.json similarity index 100% rename from contracts/seats/npm-package-registry/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/npm-package-registry/fixtures/events.json diff --git a/contracts/seats/npm-package-registry/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/npm-package-registry/fixtures/verbs.json similarity index 100% rename from contracts/seats/npm-package-registry/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/npm-package-registry/fixtures/verbs.json diff --git a/contracts/seats/npm-package-registry/seat.json b/modules/mesh-delivery-contracts/seats/npm-package-registry/seat.json similarity index 100% rename from contracts/seats/npm-package-registry/seat.json rename to modules/mesh-delivery-contracts/seats/npm-package-registry/seat.json diff --git a/contracts/seats/oci-artifact-registry/fixtures/events.json b/modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/events.json similarity index 100% rename from contracts/seats/oci-artifact-registry/fixtures/events.json rename to modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/events.json diff --git a/contracts/seats/oci-artifact-registry/fixtures/states.json b/modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/states.json similarity index 100% rename from contracts/seats/oci-artifact-registry/fixtures/states.json rename to modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/states.json diff --git a/contracts/seats/oci-artifact-registry/fixtures/verbs.json b/modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/verbs.json similarity index 100% rename from contracts/seats/oci-artifact-registry/fixtures/verbs.json rename to modules/mesh-delivery-contracts/seats/oci-artifact-registry/fixtures/verbs.json diff --git a/contracts/seats/oci-artifact-registry/seat.json b/modules/mesh-delivery-contracts/seats/oci-artifact-registry/seat.json similarity index 100% rename from contracts/seats/oci-artifact-registry/seat.json rename to modules/mesh-delivery-contracts/seats/oci-artifact-registry/seat.json diff --git a/contracts/ts/seats/containerimageregistry/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/index.d.ts similarity index 100% rename from contracts/ts/seats/containerimageregistry/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/index.d.ts diff --git a/contracts/ts/seats/containerimageregistry/index.js b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/index.js similarity index 100% rename from contracts/ts/seats/containerimageregistry/index.js rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/index.js diff --git a/contracts/ts/seats/containerimageregistry/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/package-lock.json similarity index 100% rename from contracts/ts/seats/containerimageregistry/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/package-lock.json diff --git a/contracts/ts/seats/containerimageregistry/package.json b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/package.json similarity index 100% rename from contracts/ts/seats/containerimageregistry/package.json rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/package.json diff --git a/contracts/ts/seats/containerimageregistry/parts/registry.d.ts b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/parts/registry.d.ts similarity index 100% rename from contracts/ts/seats/containerimageregistry/parts/registry.d.ts rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/parts/registry.d.ts diff --git a/contracts/ts/seats/containerimageregistry/parts/registry.js b/modules/mesh-delivery-contracts/ts/seats/containerimageregistry/parts/registry.js similarity index 100% rename from contracts/ts/seats/containerimageregistry/parts/registry.js rename to modules/mesh-delivery-contracts/ts/seats/containerimageregistry/parts/registry.js diff --git a/contracts/ts/seats/git/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/git/index.d.ts similarity index 100% rename from contracts/ts/seats/git/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/git/index.d.ts diff --git a/contracts/ts/seats/git/index.js b/modules/mesh-delivery-contracts/ts/seats/git/index.js similarity index 100% rename from contracts/ts/seats/git/index.js rename to modules/mesh-delivery-contracts/ts/seats/git/index.js diff --git a/contracts/ts/seats/git/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/git/package-lock.json similarity index 100% rename from contracts/ts/seats/git/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/git/package-lock.json diff --git a/contracts/ts/seats/git/package.json b/modules/mesh-delivery-contracts/ts/seats/git/package.json similarity index 100% rename from contracts/ts/seats/git/package.json rename to modules/mesh-delivery-contracts/ts/seats/git/package.json diff --git a/contracts/ts/seats/gopackageregistry/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/index.d.ts similarity index 100% rename from contracts/ts/seats/gopackageregistry/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/index.d.ts diff --git a/contracts/ts/seats/gopackageregistry/index.js b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/index.js similarity index 100% rename from contracts/ts/seats/gopackageregistry/index.js rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/index.js diff --git a/contracts/ts/seats/gopackageregistry/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/package-lock.json similarity index 100% rename from contracts/ts/seats/gopackageregistry/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/package-lock.json diff --git a/contracts/ts/seats/gopackageregistry/package.json b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/package.json similarity index 100% rename from contracts/ts/seats/gopackageregistry/package.json rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/package.json diff --git a/contracts/ts/seats/gopackageregistry/parts/registry.d.ts b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/parts/registry.d.ts similarity index 100% rename from contracts/ts/seats/gopackageregistry/parts/registry.d.ts rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/parts/registry.d.ts diff --git a/contracts/ts/seats/gopackageregistry/parts/registry.js b/modules/mesh-delivery-contracts/ts/seats/gopackageregistry/parts/registry.js similarity index 100% rename from contracts/ts/seats/gopackageregistry/parts/registry.js rename to modules/mesh-delivery-contracts/ts/seats/gopackageregistry/parts/registry.js diff --git a/contracts/ts/seats/meshartifactsweep/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/index.d.ts similarity index 100% rename from contracts/ts/seats/meshartifactsweep/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/index.d.ts diff --git a/contracts/ts/seats/meshartifactsweep/index.js b/modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/index.js similarity index 100% rename from contracts/ts/seats/meshartifactsweep/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/index.js diff --git a/contracts/ts/seats/meshartifactsweep/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/package-lock.json similarity index 100% rename from contracts/ts/seats/meshartifactsweep/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/package-lock.json diff --git a/contracts/ts/seats/meshartifactsweep/package.json b/modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/package.json similarity index 100% rename from contracts/ts/seats/meshartifactsweep/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshartifactsweep/package.json diff --git a/contracts/ts/seats/meshbuilds/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts similarity index 100% rename from contracts/ts/seats/meshbuilds/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts diff --git a/contracts/ts/seats/meshbuilds/index.js b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js similarity index 100% rename from contracts/ts/seats/meshbuilds/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js diff --git a/contracts/ts/seats/meshbuilds/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/package-lock.json similarity index 100% rename from contracts/ts/seats/meshbuilds/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshbuilds/package-lock.json diff --git a/contracts/ts/seats/meshbuilds/package.json b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/package.json similarity index 100% rename from contracts/ts/seats/meshbuilds/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshbuilds/package.json diff --git a/contracts/ts/seats/meshcatalog/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshcatalog/index.d.ts similarity index 100% rename from contracts/ts/seats/meshcatalog/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshcatalog/index.d.ts diff --git a/contracts/ts/seats/meshcatalog/index.js b/modules/mesh-delivery-contracts/ts/seats/meshcatalog/index.js similarity index 100% rename from contracts/ts/seats/meshcatalog/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshcatalog/index.js diff --git a/contracts/ts/seats/meshcatalog/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshcatalog/package-lock.json similarity index 100% rename from contracts/ts/seats/meshcatalog/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshcatalog/package-lock.json diff --git a/contracts/ts/seats/meshcatalog/package.json b/modules/mesh-delivery-contracts/ts/seats/meshcatalog/package.json similarity index 100% rename from contracts/ts/seats/meshcatalog/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshcatalog/package.json diff --git a/contracts/ts/seats/meshdelivery/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts similarity index 100% rename from contracts/ts/seats/meshdelivery/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.d.ts diff --git a/contracts/ts/seats/meshdelivery/index.js b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.js similarity index 100% rename from contracts/ts/seats/meshdelivery/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshdelivery/index.js diff --git a/contracts/ts/seats/meshdelivery/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/package-lock.json similarity index 100% rename from contracts/ts/seats/meshdelivery/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshdelivery/package-lock.json diff --git a/contracts/ts/seats/meshdelivery/package.json b/modules/mesh-delivery-contracts/ts/seats/meshdelivery/package.json similarity index 100% rename from contracts/ts/seats/meshdelivery/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshdelivery/package.json diff --git a/contracts/ts/seats/meshdeliverychecker/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/index.d.ts similarity index 100% rename from contracts/ts/seats/meshdeliverychecker/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/index.d.ts diff --git a/contracts/ts/seats/meshdeliverychecker/index.js b/modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/index.js similarity index 100% rename from contracts/ts/seats/meshdeliverychecker/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/index.js diff --git a/contracts/ts/seats/meshdeliverychecker/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/package-lock.json similarity index 100% rename from contracts/ts/seats/meshdeliverychecker/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/package-lock.json diff --git a/contracts/ts/seats/meshdeliverychecker/package.json b/modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/package.json similarity index 100% rename from contracts/ts/seats/meshdeliverychecker/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshdeliverychecker/package.json diff --git a/contracts/ts/seats/meshpipelinerunner/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/index.d.ts similarity index 100% rename from contracts/ts/seats/meshpipelinerunner/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/index.d.ts diff --git a/contracts/ts/seats/meshpipelinerunner/index.js b/modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/index.js similarity index 100% rename from contracts/ts/seats/meshpipelinerunner/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/index.js diff --git a/contracts/ts/seats/meshpipelinerunner/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/package-lock.json similarity index 100% rename from contracts/ts/seats/meshpipelinerunner/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/package-lock.json diff --git a/contracts/ts/seats/meshpipelinerunner/package.json b/modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/package.json similarity index 100% rename from contracts/ts/seats/meshpipelinerunner/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshpipelinerunner/package.json diff --git a/contracts/ts/seats/meshwants/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts similarity index 100% rename from contracts/ts/seats/meshwants/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts diff --git a/contracts/ts/seats/meshwants/index.js b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.js similarity index 100% rename from contracts/ts/seats/meshwants/index.js rename to modules/mesh-delivery-contracts/ts/seats/meshwants/index.js diff --git a/contracts/ts/seats/meshwants/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/meshwants/package-lock.json similarity index 100% rename from contracts/ts/seats/meshwants/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/meshwants/package-lock.json diff --git a/contracts/ts/seats/meshwants/package.json b/modules/mesh-delivery-contracts/ts/seats/meshwants/package.json similarity index 100% rename from contracts/ts/seats/meshwants/package.json rename to modules/mesh-delivery-contracts/ts/seats/meshwants/package.json diff --git a/contracts/ts/seats/nodebuildgo/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/index.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildgo/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/index.d.ts diff --git a/contracts/ts/seats/nodebuildgo/index.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/index.js similarity index 100% rename from contracts/ts/seats/nodebuildgo/index.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/index.js diff --git a/contracts/ts/seats/nodebuildgo/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/package-lock.json similarity index 100% rename from contracts/ts/seats/nodebuildgo/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/package-lock.json diff --git a/contracts/ts/seats/nodebuildgo/package.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/package.json similarity index 100% rename from contracts/ts/seats/nodebuildgo/package.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/package.json diff --git a/contracts/ts/seats/nodebuildgo/parts/build-step.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/parts/build-step.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildgo/parts/build-step.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/parts/build-step.d.ts diff --git a/contracts/ts/seats/nodebuildgo/parts/build-step.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildgo/parts/build-step.js similarity index 100% rename from contracts/ts/seats/nodebuildgo/parts/build-step.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildgo/parts/build-step.js diff --git a/contracts/ts/seats/nodebuildimage/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/index.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildimage/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/index.d.ts diff --git a/contracts/ts/seats/nodebuildimage/index.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/index.js similarity index 100% rename from contracts/ts/seats/nodebuildimage/index.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/index.js diff --git a/contracts/ts/seats/nodebuildimage/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/package-lock.json similarity index 100% rename from contracts/ts/seats/nodebuildimage/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/package-lock.json diff --git a/contracts/ts/seats/nodebuildimage/package.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/package.json similarity index 100% rename from contracts/ts/seats/nodebuildimage/package.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/package.json diff --git a/contracts/ts/seats/nodebuildimage/parts/build-step.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/parts/build-step.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildimage/parts/build-step.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/parts/build-step.d.ts diff --git a/contracts/ts/seats/nodebuildimage/parts/build-step.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildimage/parts/build-step.js similarity index 100% rename from contracts/ts/seats/nodebuildimage/parts/build-step.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildimage/parts/build-step.js diff --git a/contracts/ts/seats/nodebuildnode/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/index.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildnode/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/index.d.ts diff --git a/contracts/ts/seats/nodebuildnode/index.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/index.js similarity index 100% rename from contracts/ts/seats/nodebuildnode/index.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/index.js diff --git a/contracts/ts/seats/nodebuildnode/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/package-lock.json similarity index 100% rename from contracts/ts/seats/nodebuildnode/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/package-lock.json diff --git a/contracts/ts/seats/nodebuildnode/package.json b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/package.json similarity index 100% rename from contracts/ts/seats/nodebuildnode/package.json rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/package.json diff --git a/contracts/ts/seats/nodebuildnode/parts/build-step.d.ts b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/parts/build-step.d.ts similarity index 100% rename from contracts/ts/seats/nodebuildnode/parts/build-step.d.ts rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/parts/build-step.d.ts diff --git a/contracts/ts/seats/nodebuildnode/parts/build-step.js b/modules/mesh-delivery-contracts/ts/seats/nodebuildnode/parts/build-step.js similarity index 100% rename from contracts/ts/seats/nodebuildnode/parts/build-step.js rename to modules/mesh-delivery-contracts/ts/seats/nodebuildnode/parts/build-step.js diff --git a/contracts/ts/seats/npmpackageregistry/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/index.d.ts similarity index 100% rename from contracts/ts/seats/npmpackageregistry/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/index.d.ts diff --git a/contracts/ts/seats/npmpackageregistry/index.js b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/index.js similarity index 100% rename from contracts/ts/seats/npmpackageregistry/index.js rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/index.js diff --git a/contracts/ts/seats/npmpackageregistry/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/package-lock.json similarity index 100% rename from contracts/ts/seats/npmpackageregistry/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/package-lock.json diff --git a/contracts/ts/seats/npmpackageregistry/package.json b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/package.json similarity index 100% rename from contracts/ts/seats/npmpackageregistry/package.json rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/package.json diff --git a/contracts/ts/seats/npmpackageregistry/parts/registry.d.ts b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/parts/registry.d.ts similarity index 100% rename from contracts/ts/seats/npmpackageregistry/parts/registry.d.ts rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/parts/registry.d.ts diff --git a/contracts/ts/seats/npmpackageregistry/parts/registry.js b/modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/parts/registry.js similarity index 100% rename from contracts/ts/seats/npmpackageregistry/parts/registry.js rename to modules/mesh-delivery-contracts/ts/seats/npmpackageregistry/parts/registry.js diff --git a/contracts/ts/seats/ociartifactregistry/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/index.d.ts similarity index 100% rename from contracts/ts/seats/ociartifactregistry/index.d.ts rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/index.d.ts diff --git a/contracts/ts/seats/ociartifactregistry/index.js b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/index.js similarity index 100% rename from contracts/ts/seats/ociartifactregistry/index.js rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/index.js diff --git a/contracts/ts/seats/ociartifactregistry/package-lock.json b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/package-lock.json similarity index 100% rename from contracts/ts/seats/ociartifactregistry/package-lock.json rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/package-lock.json diff --git a/contracts/ts/seats/ociartifactregistry/package.json b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/package.json similarity index 100% rename from contracts/ts/seats/ociartifactregistry/package.json rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/package.json diff --git a/contracts/ts/seats/ociartifactregistry/parts/registry.d.ts b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/parts/registry.d.ts similarity index 100% rename from contracts/ts/seats/ociartifactregistry/parts/registry.d.ts rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/parts/registry.d.ts diff --git a/contracts/ts/seats/ociartifactregistry/parts/registry.js b/modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/parts/registry.js similarity index 100% rename from contracts/ts/seats/ociartifactregistry/parts/registry.js rename to modules/mesh-delivery-contracts/ts/seats/ociartifactregistry/parts/registry.js diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main.go index 4bc1619d..6a381e25 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main.go @@ -15,7 +15,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main_test.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main_test.go index d065eac3..c39fecb5 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main_test.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge-tools/main_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-forge-bridge/internal/bridge" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/gate_test.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/gate_test.go index 942df8cd..8ab15e0c 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/gate_test.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/gate_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-forge-bridge/internal/gitfixture" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groupask.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groupask.go index 6ccd2b76..ef54a70f 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groupask.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groupask.go @@ -8,7 +8,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "mesh-delivery-forge-bridge/internal/groups" ) diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups.go index 1a4d65c9..aade6a14 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups.go @@ -6,7 +6,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" groupkeys "mesh-delivery-forge-bridge/internal/groups" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups_test.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups_test.go index 3c24b39e..34b8b28f 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups_test.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/groups_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" groupkeys "mesh-delivery-forge-bridge/internal/groups" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/integration_test.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/integration_test.go index f0365727..bfb7b416 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/integration_test.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/integration_test.go @@ -21,9 +21,9 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main.go index f91af302..6a9c63ea 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main.go @@ -21,9 +21,9 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-forge-bridge/internal/bridge" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main_test.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main_test.go index 865a7c88..da888759 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main_test.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/main_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-sdk/go/process" "github.com/nats-io/nats.go" @@ -55,7 +55,7 @@ func (p *fakePub) Publish(_ context.Context, subject string, payload []byte, _ . return &jetstream.PubAck{}, nil } -// body is the seat git's pull.updated (contracts/seats/git), the head head_sha laid over it when given. +// body is the seat git's pull.updated (modules/mesh-delivery-contracts/seats/git), the head head_sha laid over it when given. func body(m map[string]any) []byte { e := map[string]any{"repository": "novox/mesh-delivery", "number": 12, "branch": "feat/x", "head": head, "base": "main", "change": map[string]any{"paths": []string{"modules/a/x.go"}, "module-dirs": []string{"modules/a"}}} diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/open.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/open.go index 93f4d07b..9441a818 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/open.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/open.go @@ -10,7 +10,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-forge-bridge/internal/bridge" diff --git a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/owed.go b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/owed.go index 7066e2bc..9384e1c4 100644 --- a/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/owed.go +++ b/modules/mesh-delivery-forge-bridge/cmd/mesh-delivery-forge-bridge/owed.go @@ -13,10 +13,10 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-forge-bridge/forgemsg/forge.go b/modules/mesh-delivery-forge-bridge/forgemsg/forge.go index 03568714..ccba891b 100644 --- a/modules/mesh-delivery-forge-bridge/forgemsg/forge.go +++ b/modules/mesh-delivery-forge-bridge/forgemsg/forge.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-forge-bridge/forgemsg/forge_test.go b/modules/mesh-delivery-forge-bridge/forgemsg/forge_test.go index 18c75b4c..41fde65b 100644 --- a/modules/mesh-delivery-forge-bridge/forgemsg/forge_test.go +++ b/modules/mesh-delivery-forge-bridge/forgemsg/forge_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-forge-bridge/forgemsg/go.mod b/modules/mesh-delivery-forge-bridge/forgemsg/go.mod index 87820559..ddbc1c3e 100644 --- a/modules/mesh-delivery-forge-bridge/forgemsg/go.mod +++ b/modules/mesh-delivery-forge-bridge/forgemsg/go.mod @@ -5,8 +5,8 @@ go 1.26.0 require git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect diff --git a/modules/mesh-delivery-forge-bridge/go.mod b/modules/mesh-delivery-forge-bridge/go.mod index e7af2fcd..e8f3740d 100644 --- a/modules/mesh-delivery-forge-bridge/go.mod +++ b/modules/mesh-delivery-forge-bridge/go.mod @@ -4,11 +4,11 @@ go 1.26.0 require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/git v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/bridge.go b/modules/mesh-delivery-forge-bridge/internal/bridge/bridge.go index 1a7a7439..d27bb022 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/bridge.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/bridge.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/bridge_test.go b/modules/mesh-delivery-forge-bridge/internal/bridge/bridge_test.go index 2ab29a65..5b6b2efb 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/bridge_test.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/bridge_test.go @@ -15,7 +15,7 @@ import ( const head = "0123456789abcdef0123456789abcdef01234567" -// updated is the body of the seat git's pull.updated (contracts/seats/git): the pull request, its base's head and its +// updated is the body of the seat git's pull.updated (modules/mesh-delivery-contracts/seats/git): the pull request, its base's head and its // change. extra names the parts a test changes by their short names (owner, repo, number, head for the branch, // head_sha for the commit, base, module_dirs, module_dirs_said), a nil value leaving the part out (seatPull). func updated(extra map[string]any) []byte { diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/call.go b/modules/mesh-delivery-forge-bridge/internal/bridge/call.go index fee308e4..012fdea5 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/call.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/call.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" ) // Caller calls a seat's verb by its manifest key (`seat:.`) with a JSON body and returns its answer: the diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/forgemade.go b/modules/mesh-delivery-forge-bridge/internal/bridge/forgemade.go index 022b74fb..487fa233 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/forgemade.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/forgemade.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" ) // ForgePull is a pull request as the forge itself says it: what the bridge needs of a merge made on the forge, not diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/owed.go b/modules/mesh-delivery-forge-bridge/internal/bridge/owed.go index 4fd274da..425865ae 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/owed.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/owed.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + checker "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" ) diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/owed_test.go b/modules/mesh-delivery-forge-bridge/internal/bridge/owed_test.go index bdc235e6..394ab724 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/owed_test.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/owed_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-forge-bridge/internal/gitfixture" diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/tags.go b/modules/mesh-delivery-forge-bridge/internal/bridge/tags.go index df9d4380..67e4be34 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/tags.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/tags.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - git "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + git "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" ) // TagsTool is the forge bridge's tool bridge_tags (novox/hq design 51 *The floor*): a package's git tags, which the diff --git a/modules/mesh-delivery-forge-bridge/internal/gitfixture/gitfixture.go b/modules/mesh-delivery-forge-bridge/internal/gitfixture/gitfixture.go index 29641622..e6a5a938 100644 --- a/modules/mesh-delivery-forge-bridge/internal/gitfixture/gitfixture.go +++ b/modules/mesh-delivery-forge-bridge/internal/gitfixture/gitfixture.go @@ -1,4 +1,4 @@ -// Package gitfixture reads the seat git's own fixtures (contracts/seats/git/fixtures/verbs.json), so the bridge's unit +// Package gitfixture reads the seat git's own fixtures (modules/mesh-delivery-contracts/seats/git/fixtures/verbs.json), so the bridge's unit // fakes answer what the seat's holder answers and nothing the contract does not say (design 47 *The seat `git`*). package gitfixture @@ -22,7 +22,7 @@ func All(t testing.TB, name, of string) []json.RawMessage { func Seat(t testing.TB, seat, file, name, of string) []json.RawMessage { t.Helper() _, here, _, _ := runtime.Caller(0) - raw, err := os.ReadFile(filepath.Join(filepath.Dir(here), "../../../../contracts/seats", seat, "fixtures", file+".json")) + raw, err := os.ReadFile(filepath.Join(filepath.Dir(here), "../../../mesh-delivery-contracts/seats", seat, "fixtures", file+".json")) if err != nil { t.Fatal(err) } diff --git a/modules/mesh-delivery-forge-bridge/internal/groups/groups.go b/modules/mesh-delivery-forge-bridge/internal/groups/groups.go index 5cfde96d..ca759043 100644 --- a/modules/mesh-delivery-forge-bridge/internal/groups/groups.go +++ b/modules/mesh-delivery-forge-bridge/internal/groups/groups.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/catalog.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/catalog.go index 511ca138..52b5aea2 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/catalog.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/catalog.go @@ -3,12 +3,12 @@ package main import ( "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "mesh-delivery-indexer/internal/index" ) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/views.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/views.go index 9a36fcf2..e86d9f46 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/views.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/views.go @@ -6,8 +6,8 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/buildmodules.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/buildmodules.go index 26c70d7c..f26ab1d2 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/buildmodules.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/buildmodules.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/integration_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/integration_test.go index b63124c0..21b60028 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/integration_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/integration_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" @@ -30,21 +30,21 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/buscompose" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatdef" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" @@ -696,7 +696,7 @@ func startIndexerRun(t *testing.T, put func(context.Context, buildLog), before . } // The build seats and their holders as the mesh has them (design 47:482-485 and 1583: a language's build module is the -// module claiming the seat whose `acts` is step build on that language): the seat definitions as contracts/seats// +// module claiming the seat whose `acts` is step build on that language): the seat definitions as modules/mesh-delivery-contracts/seats// // seat.json has them (acts included) and the manifests as the catalog's modules/mesh-build-go and mesh-build-node claim them. var buildSeatFixtures = []struct{ seat, language, module, stream string }{ {"node-build-go", "go", "mesh-build-go", "toolchains-go"}, diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main.go index 33917197..70451ace 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main.go @@ -22,10 +22,10 @@ import ( "syscall" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main_test.go index 9eade6df..eea5e715 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/main_test.go @@ -14,7 +14,7 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named.go index c1218c42..c99ab795 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named.go @@ -11,10 +11,10 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "mesh-delivery-indexer/internal/fingerprint" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_events.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_events.go index b0442561..e2ec583f 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_events.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_events.go @@ -6,7 +6,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go index ec59b489..980e96bd 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "errors" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "mesh-delivery-indexer/internal/index" "slices" "strings" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/objects.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/objects.go index 7b250e47..345d7996 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/objects.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/objects.go @@ -12,7 +12,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/packages_integration_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/packages_integration_test.go index 9061d7c6..95af6046 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/packages_integration_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/packages_integration_test.go @@ -6,26 +6,26 @@ import ( "context" "encoding/json" "errors" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "os" "strings" "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/buscompose" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/seatdef" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "mesh-delivery-indexer/internal/fingerprint" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/registry.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/registry.go index a57c2dbb..b8040c5c 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/registry.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/registry.go @@ -9,8 +9,8 @@ import ( mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/operatorask" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/seatdefs.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/seatdefs.go index 44ca3c0e..2fa8f9e6 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/seatdefs.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/seatdefs.go @@ -8,7 +8,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/series.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/series.go index 4502a816..ff1b77f2 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/series.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/series.go @@ -6,8 +6,8 @@ import ( "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" "mesh-delivery-indexer/internal/index" ) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/source.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/source.go index f7a37cac..b7c6e267 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/source.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/source.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/keys" "github.com/nats-io/nats.go/jetstream" ) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/steps.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/steps.go index 4bd55f18..1dea5455 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/steps.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/steps.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "mesh-delivery-indexer/internal/index" ) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/toolchains_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/toolchains_test.go index ea81a11c..f7da01a3 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/toolchains_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/toolchains_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/verdicts.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/verdicts.go index 25a07db1..0ee37ae0 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/verdicts.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/verdicts.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-sdk/go/process" "github.com/nats-io/nats.go" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/versions.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/versions.go index 1f0cdcd5..3e750328 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/versions.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/versions.go @@ -12,10 +12,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/views.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/views.go index 3bba0087..eb692696 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/views.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/views.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "strings" "sync/atomic" "time" @@ -18,7 +18,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient/heard" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/views" "mesh-delivery-indexer/internal/index" diff --git a/modules/mesh-delivery-indexer/cmd/mesh-judge/main.go b/modules/mesh-delivery-indexer/cmd/mesh-judge/main.go index 0ca1dd94..0fb0713a 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-judge/main.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-judge/main.go @@ -13,7 +13,7 @@ import ( "io" "os" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "mesh-delivery-indexer/judge" ) diff --git a/modules/mesh-delivery-indexer/go.mod b/modules/mesh-delivery-indexer/go.mod index 0770c340..b0a7e3c9 100644 --- a/modules/mesh-delivery-indexer/go.mod +++ b/modules/mesh-delivery-indexer/go.mod @@ -7,17 +7,17 @@ require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/git v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 @@ -44,12 +44,12 @@ require ( git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) require git.novox.be/novox/mesh-contracts/go/seats/meshbroker v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein => ./takein @@ -74,8 +74,8 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-networking/modules/mesh-connectivity-contracts/go/seats/theprivatenetwork v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint.go b/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint.go index 69ea9f49..b5309795 100644 --- a/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint.go +++ b/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint.go @@ -15,10 +15,10 @@ import ( "sort" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // NoPackageVersion opens the reason a module has no fingerprint while a mesh package it uses has no published version diff --git a/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint_test.go b/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint_test.go index a0ba0a22..f143ee14 100644 --- a/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint_test.go +++ b/modules/mesh-delivery-indexer/internal/fingerprint/fingerprint_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) const sdk = "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-delivery-indexer/internal/index/accepted.go b/modules/mesh-delivery-indexer/internal/index/accepted.go index 0180466b..c7fcdba5 100644 --- a/modules/mesh-delivery-indexer/internal/index/accepted.go +++ b/modules/mesh-delivery-indexer/internal/index/accepted.go @@ -9,8 +9,8 @@ import ( "time" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" "mesh-delivery-indexer/judge" diff --git a/modules/mesh-delivery-indexer/internal/index/accepted_problems_test.go b/modules/mesh-delivery-indexer/internal/index/accepted_problems_test.go index c27764d7..0336b34a 100644 --- a/modules/mesh-delivery-indexer/internal/index/accepted_problems_test.go +++ b/modules/mesh-delivery-indexer/internal/index/accepted_problems_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §668, §692: manifest-accepted's problems are the validator's strings, the same the verdict writes as diff --git a/modules/mesh-delivery-indexer/internal/index/artifacts.go b/modules/mesh-delivery-indexer/internal/index/artifacts.go index 70490183..e12e23e1 100644 --- a/modules/mesh-delivery-indexer/internal/index/artifacts.go +++ b/modules/mesh-delivery-indexer/internal/index/artifacts.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/packagename" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/packagename" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-indexer/internal/index/branch_builds.go b/modules/mesh-delivery-indexer/internal/index/branch_builds.go index e72cb362..d30a7320 100644 --- a/modules/mesh-delivery-indexer/internal/index/branch_builds.go +++ b/modules/mesh-delivery-indexer/internal/index/branch_builds.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/branch_builds_test.go b/modules/mesh-delivery-indexer/internal/index/branch_builds_test.go index 7741d14e..ef4bd473 100644 --- a/modules/mesh-delivery-indexer/internal/index/branch_builds_test.go +++ b/modules/mesh-delivery-indexer/internal/index/branch_builds_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §374, A-83, A-85: a build of a watched branch other than the first releases no version; its edge entries are kept diff --git a/modules/mesh-delivery-indexer/internal/index/branch_take_in.go b/modules/mesh-delivery-indexer/internal/index/branch_take_in.go index 82258df1..0f274de0 100644 --- a/modules/mesh-delivery-indexer/internal/index/branch_take_in.go +++ b/modules/mesh-delivery-indexer/internal/index/branch_take_in.go @@ -5,7 +5,7 @@ import ( "errors" "maps" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-indexer/internal/index/branch_take_in_test.go b/modules/mesh-delivery-indexer/internal/index/branch_take_in_test.go index 9c9ba9b8..253245a2 100644 --- a/modules/mesh-delivery-indexer/internal/index/branch_take_in_test.go +++ b/modules/mesh-delivery-indexer/internal/index/branch_take_in_test.go @@ -8,8 +8,8 @@ import ( "slices" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) // Design 47 G §13, §14, §291, A-93: a watched branch other than the first is taken in as a pure computation from the merged diff --git a/modules/mesh-delivery-indexer/internal/index/builds.go b/modules/mesh-delivery-indexer/internal/index/builds.go index 36676d0c..95acab90 100644 --- a/modules/mesh-delivery-indexer/internal/index/builds.go +++ b/modules/mesh-delivery-indexer/internal/index/builds.go @@ -9,8 +9,8 @@ import ( "time" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildrecord" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrecord" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // Builds holds the builder's log (mesh-delivery-builder.build-log, novox/hq ADR 0571 clause 1) for what the indexer reads diff --git a/modules/mesh-delivery-indexer/internal/index/bus_state.go b/modules/mesh-delivery-indexer/internal/index/bus_state.go index a5476f2b..c921e53b 100644 --- a/modules/mesh-delivery-indexer/internal/index/bus_state.go +++ b/modules/mesh-delivery-indexer/internal/index/bus_state.go @@ -4,7 +4,7 @@ import ( "fmt" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-indexer/internal/index/candidate_manifests_test.go b/modules/mesh-delivery-indexer/internal/index/candidate_manifests_test.go index 3241672b..613b979d 100644 --- a/modules/mesh-delivery-indexer/internal/index/candidate_manifests_test.go +++ b/modules/mesh-delivery-indexer/internal/index/candidate_manifests_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/candidate_values.go b/modules/mesh-delivery-indexer/internal/index/candidate_values.go index e4ec0401..e4512045 100644 --- a/modules/mesh-delivery-indexer/internal/index/candidate_values.go +++ b/modules/mesh-delivery-indexer/internal/index/candidate_values.go @@ -7,14 +7,14 @@ import ( "reflect" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The values of the state candidates (novox/hq ADR 0437 §5, ADR 0453 clauses 6 and 16): the contract's types, written by diff --git a/modules/mesh-delivery-indexer/internal/index/candidates.go b/modules/mesh-delivery-indexer/internal/index/candidates.go index ef191266..cce9eba5 100644 --- a/modules/mesh-delivery-indexer/internal/index/candidates.go +++ b/modules/mesh-delivery-indexer/internal/index/candidates.go @@ -13,13 +13,13 @@ import ( "sync/atomic" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-delivery-indexer/internal/index/catalog.go b/modules/mesh-delivery-indexer/internal/index/catalog.go index 15cf4a51..bca1a826 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog.go @@ -11,8 +11,8 @@ import ( "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // The seat mesh-catalog's verbs, answered from the indexer's own states (novox/hq ADR 0604 §1, §2): modules, module, diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_branches_test.go b/modules/mesh-delivery-indexer/internal/index/catalog_branches_test.go index f74724fd..d7e625f9 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_branches_test.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_branches_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G A-85, §291: the indexer keeps a catalog revision per watched branch, trunk. for the first and diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_graph.go b/modules/mesh-delivery-indexer/internal/index/catalog_graph.go index 9a47267a..82fe97ef 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_graph.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_graph.go @@ -10,8 +10,8 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_graph_test.go b/modules/mesh-delivery-indexer/internal/index/catalog_graph_test.go index cc84ab53..d1066aee 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_graph_test.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_graph_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_revisions.go b/modules/mesh-delivery-indexer/internal/index/catalog_revisions.go index c5e321ce..cc0508d4 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_revisions.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_revisions.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_test.go b/modules/mesh-delivery-indexer/internal/index/catalog_test.go index d14c3353..cbe98ec9 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_test.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // capturedKeys are the field names of the first object at path (a list's first element when the value is a list) in the diff --git a/modules/mesh-delivery-indexer/internal/index/config_readers.go b/modules/mesh-delivery-indexer/internal/index/config_readers.go index 9e96556a..9a096388 100644 --- a/modules/mesh-delivery-indexer/internal/index/config_readers.go +++ b/modules/mesh-delivery-indexer/internal/index/config_readers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // ConfigReadersTool is the indexer's tool that says who reads a module's config keys (design 32 *A value no longer diff --git a/modules/mesh-delivery-indexer/internal/index/control_records.go b/modules/mesh-delivery-indexer/internal/index/control_records.go index 43bdd299..c13e960b 100644 --- a/modules/mesh-delivery-indexer/internal/index/control_records.go +++ b/modules/mesh-delivery-indexer/internal/index/control_records.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/control_records_test.go b/modules/mesh-delivery-indexer/internal/index/control_records_test.go index 5cb909fa..5a039ff5 100644 --- a/modules/mesh-delivery-indexer/internal/index/control_records_test.go +++ b/modules/mesh-delivery-indexer/internal/index/control_records_test.go @@ -10,12 +10,12 @@ import ( "time" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-delivery-indexer/internal/index/domain.go b/modules/mesh-delivery-indexer/internal/index/domain.go index 6d91f79b..99d7f0d1 100644 --- a/modules/mesh-delivery-indexer/internal/index/domain.go +++ b/modules/mesh-delivery-indexer/internal/index/domain.go @@ -7,7 +7,7 @@ package index import ( "encoding/json" - "git.novox.be/novox/mesh-delivery/sdk/seatdefs" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/seatdefs" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-indexer/internal/index/entry_verb.go b/modules/mesh-delivery-indexer/internal/index/entry_verb.go index 3ef54387..5d01dd64 100644 --- a/modules/mesh-delivery-indexer/internal/index/entry_verb.go +++ b/modules/mesh-delivery-indexer/internal/index/entry_verb.go @@ -7,7 +7,7 @@ import ( "fmt" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/entry_verb_test.go b/modules/mesh-delivery-indexer/internal/index/entry_verb_test.go index 3b576575..eadddd19 100644 --- a/modules/mesh-delivery-indexer/internal/index/entry_verb_test.go +++ b/modules/mesh-delivery-indexer/internal/index/entry_verb_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §675: the entry kept for a build-input fingerprint is found by it, through the key entry-index holds for the diff --git a/modules/mesh-delivery-indexer/internal/index/events.go b/modules/mesh-delivery-indexer/internal/index/events.go index 9a27e1ea..225cf090 100644 --- a/modules/mesh-delivery-indexer/internal/index/events.go +++ b/modules/mesh-delivery-indexer/internal/index/events.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strconv" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/fingerprints.go b/modules/mesh-delivery-indexer/internal/index/fingerprints.go index a70ddf57..a275cffa 100644 --- a/modules/mesh-delivery-indexer/internal/index/fingerprints.go +++ b/modules/mesh-delivery-indexer/internal/index/fingerprints.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-indexer/internal/index/form.go b/modules/mesh-delivery-indexer/internal/index/form.go index 150bdb51..2546ccdc 100644 --- a/modules/mesh-delivery-indexer/internal/index/form.go +++ b/modules/mesh-delivery-indexer/internal/index/form.go @@ -4,9 +4,9 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/graph.go b/modules/mesh-delivery-indexer/internal/index/graph.go index f3b2f867..e8b307d5 100644 --- a/modules/mesh-delivery-indexer/internal/index/graph.go +++ b/modules/mesh-delivery-indexer/internal/index/graph.go @@ -7,12 +7,12 @@ import ( "maps" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // The module graph (novox/hq ADR 0603 §2): at every recompute the indexer writes, in its state graph diff --git a/modules/mesh-delivery-indexer/internal/index/imports.go b/modules/mesh-delivery-indexer/internal/index/imports.go index acd6e152..f59e9324 100644 --- a/modules/mesh-delivery-indexer/internal/index/imports.go +++ b/modules/mesh-delivery-indexer/internal/index/imports.go @@ -7,10 +7,10 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/imports_test.go b/modules/mesh-delivery-indexer/internal/index/imports_test.go index 36a35559..118986d8 100644 --- a/modules/mesh-delivery-indexer/internal/index/imports_test.go +++ b/modules/mesh-delivery-indexer/internal/index/imports_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-indexer/internal/index/index_test.go b/modules/mesh-delivery-indexer/internal/index/index_test.go index 92fbeebb..ccc22680 100644 --- a/modules/mesh-delivery-indexer/internal/index/index_test.go +++ b/modules/mesh-delivery-indexer/internal/index/index_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/inputs.go b/modules/mesh-delivery-indexer/internal/index/inputs.go index 317a77ad..563cbd36 100644 --- a/modules/mesh-delivery-indexer/internal/index/inputs.go +++ b/modules/mesh-delivery-indexer/internal/index/inputs.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "mesh-delivery-indexer/internal/fingerprint" diff --git a/modules/mesh-delivery-indexer/internal/index/inputs_test.go b/modules/mesh-delivery-indexer/internal/index/inputs_test.go index 77adda62..cfd34caa 100644 --- a/modules/mesh-delivery-indexer/internal/index/inputs_test.go +++ b/modules/mesh-delivery-indexer/internal/index/inputs_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/manifests.go b/modules/mesh-delivery-indexer/internal/index/manifests.go index 1e13ae35..f6d5d4ad 100644 --- a/modules/mesh-delivery-indexer/internal/index/manifests.go +++ b/modules/mesh-delivery-indexer/internal/index/manifests.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/manifests_test.go b/modules/mesh-delivery-indexer/internal/index/manifests_test.go index 09143762..4e64d16f 100644 --- a/modules/mesh-delivery-indexer/internal/index/manifests_test.go +++ b/modules/mesh-delivery-indexer/internal/index/manifests_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/modules.go b/modules/mesh-delivery-indexer/internal/index/modules.go index 6e282924..6aacb8ab 100644 --- a/modules/mesh-delivery-indexer/internal/index/modules.go +++ b/modules/mesh-delivery-indexer/internal/index/modules.go @@ -7,10 +7,10 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-delivery-indexer/internal/index/modules_test.go b/modules/mesh-delivery-indexer/internal/index/modules_test.go index 30b398f4..37da44eb 100644 --- a/modules/mesh-delivery-indexer/internal/index/modules_test.go +++ b/modules/mesh-delivery-indexer/internal/index/modules_test.go @@ -12,11 +12,11 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/moves.go b/modules/mesh-delivery-indexer/internal/index/moves.go index 1bd78520..841ebf15 100644 --- a/modules/mesh-delivery-indexer/internal/index/moves.go +++ b/modules/mesh-delivery-indexer/internal/index/moves.go @@ -8,7 +8,7 @@ import ( "strings" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/named.go b/modules/mesh-delivery-indexer/internal/index/named.go index af942343..74a1d429 100644 --- a/modules/mesh-delivery-indexer/internal/index/named.go +++ b/modules/mesh-delivery-indexer/internal/index/named.go @@ -11,7 +11,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/named_test.go b/modules/mesh-delivery-indexer/internal/index/named_test.go index 72623093..a0313027 100644 --- a/modules/mesh-delivery-indexer/internal/index/named_test.go +++ b/modules/mesh-delivery-indexer/internal/index/named_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/newform_test.go b/modules/mesh-delivery-indexer/internal/index/newform_test.go index d788f43d..1e169d64 100644 --- a/modules/mesh-delivery-indexer/internal/index/newform_test.go +++ b/modules/mesh-delivery-indexer/internal/index/newform_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" ) func TestAGoModuleAtAMergeHasItsManifestItsInputsAndNoFingerprintOfTheNewForm(t *testing.T) { // 1444/AC1 diff --git a/modules/mesh-delivery-indexer/internal/index/order.go b/modules/mesh-delivery-indexer/internal/index/order.go index 1ceaa773..00344d4a 100644 --- a/modules/mesh-delivery-indexer/internal/index/order.go +++ b/modules/mesh-delivery-indexer/internal/index/order.go @@ -10,7 +10,7 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-indexer/internal/index/own.go b/modules/mesh-delivery-indexer/internal/index/own.go index 3e137453..2e903596 100644 --- a/modules/mesh-delivery-indexer/internal/index/own.go +++ b/modules/mesh-delivery-indexer/internal/index/own.go @@ -7,10 +7,10 @@ import ( "path" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // From R4e the indexer lists a repository's modules from what it holds itself (novox/hq ADR 0501 clause 6, issue 1851): diff --git a/modules/mesh-delivery-indexer/internal/index/package_users.go b/modules/mesh-delivery-indexer/internal/index/package_users.go index 2b965547..3e41a135 100644 --- a/modules/mesh-delivery-indexer/internal/index/package_users.go +++ b/modules/mesh-delivery-indexer/internal/index/package_users.go @@ -6,9 +6,9 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-indexer/internal/index/packages.go b/modules/mesh-delivery-indexer/internal/index/packages.go index 5013979f..e25f07e4 100644 --- a/modules/mesh-delivery-indexer/internal/index/packages.go +++ b/modules/mesh-delivery-indexer/internal/index/packages.go @@ -13,9 +13,9 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/packages_values.go b/modules/mesh-delivery-indexer/internal/index/packages_values.go index 31932492..9f64525e 100644 --- a/modules/mesh-delivery-indexer/internal/index/packages_values.go +++ b/modules/mesh-delivery-indexer/internal/index/packages_values.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/paths_backfill_test.go b/modules/mesh-delivery-indexer/internal/index/paths_backfill_test.go index 4eeae90f..4d9e85db 100644 --- a/modules/mesh-delivery-indexer/internal/index/paths_backfill_test.go +++ b/modules/mesh-delivery-indexer/internal/index/paths_backfill_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/buildrecord" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrecord" ) // Issue 1614: a modules key written before the indexer learned paths (mesh-tools and node-tools live) gets its directory diff --git a/modules/mesh-delivery-indexer/internal/index/pending.go b/modules/mesh-delivery-indexer/internal/index/pending.go index a14af783..db632c15 100644 --- a/modules/mesh-delivery-indexer/internal/index/pending.go +++ b/modules/mesh-delivery-indexer/internal/index/pending.go @@ -10,20 +10,20 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/busretry" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-indexer/judge" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // The take-in step (novox/hq ADR 0633): a source revision is taken in only by the indexer it names. A merged message is diff --git a/modules/mesh-delivery-indexer/internal/index/pending_test.go b/modules/mesh-delivery-indexer/internal/index/pending_test.go index af407cd6..b7261c76 100644 --- a/modules/mesh-delivery-indexer/internal/index/pending_test.go +++ b/modules/mesh-delivery-indexer/internal/index/pending_test.go @@ -13,11 +13,11 @@ import ( mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/buscompose" "git.novox.be/novox/mesh-sdk/go/busretry" diff --git a/modules/mesh-delivery-indexer/internal/index/pending_tools.go b/modules/mesh-delivery-indexer/internal/index/pending_tools.go index 4ab76300..5557a43a 100644 --- a/modules/mesh-delivery-indexer/internal/index/pending_tools.go +++ b/modules/mesh-delivery-indexer/internal/index/pending_tools.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" stdio "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-delivery-indexer/internal/index/previews.go b/modules/mesh-delivery-indexer/internal/index/previews.go index 99ec49c5..14d0fd53 100644 --- a/modules/mesh-delivery-indexer/internal/index/previews.go +++ b/modules/mesh-delivery-indexer/internal/index/previews.go @@ -8,12 +8,12 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/grouppackages" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/grouppackages" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/previews_test.go b/modules/mesh-delivery-indexer/internal/index/previews_test.go index efd893b2..03766078 100644 --- a/modules/mesh-delivery-indexer/internal/index/previews_test.go +++ b/modules/mesh-delivery-indexer/internal/index/previews_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-checker/checkermsg" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "mesh-delivery-indexer/internal/fingerprint" diff --git a/modules/mesh-delivery-indexer/internal/index/previews_values.go b/modules/mesh-delivery-indexer/internal/index/previews_values.go index c4d8b5c3..c6fa71ec 100644 --- a/modules/mesh-delivery-indexer/internal/index/previews_values.go +++ b/modules/mesh-delivery-indexer/internal/index/previews_values.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/registered.go b/modules/mesh-delivery-indexer/internal/index/registered.go index ce5fc2aa..a2903d16 100644 --- a/modules/mesh-delivery-indexer/internal/index/registered.go +++ b/modules/mesh-delivery-indexer/internal/index/registered.go @@ -8,9 +8,9 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/registered_test.go b/modules/mesh-delivery-indexer/internal/index/registered_test.go index ad4eb251..d872c3ba 100644 --- a/modules/mesh-delivery-indexer/internal/index/registered_test.go +++ b/modules/mesh-delivery-indexer/internal/index/registered_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/registrations.go b/modules/mesh-delivery-indexer/internal/index/registrations.go index 1591de9e..776e116e 100644 --- a/modules/mesh-delivery-indexer/internal/index/registrations.go +++ b/modules/mesh-delivery-indexer/internal/index/registrations.go @@ -14,8 +14,8 @@ import ( mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/registrations_test.go b/modules/mesh-delivery-indexer/internal/index/registrations_test.go index 40e931f0..253f88aa 100644 --- a/modules/mesh-delivery-indexer/internal/index/registrations_test.go +++ b/modules/mesh-delivery-indexer/internal/index/registrations_test.go @@ -11,8 +11,8 @@ import ( mma "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - gitseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + gitseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // regRig is a Registry on memory states with a fake router: asks it was given, the cancelled ones, the history and the events. diff --git a/modules/mesh-delivery-indexer/internal/index/registrations_tools.go b/modules/mesh-delivery-indexer/internal/index/registrations_tools.go index 290b6847..8ff28321 100644 --- a/modules/mesh-delivery-indexer/internal/index/registrations_tools.go +++ b/modules/mesh-delivery-indexer/internal/index/registrations_tools.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-indexer/internal/index/remove_test.go b/modules/mesh-delivery-indexer/internal/index/remove_test.go index e5864ca2..2efc5314 100644 --- a/modules/mesh-delivery-indexer/internal/index/remove_test.go +++ b/modules/mesh-delivery-indexer/internal/index/remove_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) func twoModules(t *testing.T) (*Indexer, *memStore) { diff --git a/modules/mesh-delivery-indexer/internal/index/requirements.go b/modules/mesh-delivery-indexer/internal/index/requirements.go index 0f7a622e..51f70b71 100644 --- a/modules/mesh-delivery-indexer/internal/index/requirements.go +++ b/modules/mesh-delivery-indexer/internal/index/requirements.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/revision_tools.go b/modules/mesh-delivery-indexer/internal/index/revision_tools.go index d746eed0..a5a235cf 100644 --- a/modules/mesh-delivery-indexer/internal/index/revision_tools.go +++ b/modules/mesh-delivery-indexer/internal/index/revision_tools.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-indexer/internal/index/revision_verb.go b/modules/mesh-delivery-indexer/internal/index/revision_verb.go index d2ecc045..d279affc 100644 --- a/modules/mesh-delivery-indexer/internal/index/revision_verb.go +++ b/modules/mesh-delivery-indexer/internal/index/revision_verb.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-indexer/internal/index/run_inputs.go b/modules/mesh-delivery-indexer/internal/index/run_inputs.go index ccb5070b..236fa226 100644 --- a/modules/mesh-delivery-indexer/internal/index/run_inputs.go +++ b/modules/mesh-delivery-indexer/internal/index/run_inputs.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/seatdefs.go b/modules/mesh-delivery-indexer/internal/index/seatdefs.go index 8d3906c9..8d911f71 100644 --- a/modules/mesh-delivery-indexer/internal/index/seatdefs.go +++ b/modules/mesh-delivery-indexer/internal/index/seatdefs.go @@ -29,11 +29,11 @@ import ( mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/seatdefs" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/seatdefs" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-indexer/internal/index/seatsof.go b/modules/mesh-delivery-indexer/internal/index/seatsof.go index 1b64e474..56c64c40 100644 --- a/modules/mesh-delivery-indexer/internal/index/seatsof.go +++ b/modules/mesh-delivery-indexer/internal/index/seatsof.go @@ -13,7 +13,7 @@ import ( "maps" "slices" - "git.novox.be/novox/mesh-delivery/sdk/seatdefs" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/seatdefs" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-indexer/internal/index/seed.go b/modules/mesh-delivery-indexer/internal/index/seed.go index 1ef74b8c..0c61b385 100644 --- a/modules/mesh-delivery-indexer/internal/index/seed.go +++ b/modules/mesh-delivery-indexer/internal/index/seed.go @@ -9,7 +9,7 @@ import ( "strings" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // SeedModule is one module the trunk revision holds, as the seed reads it (design 47 G §8): its origin and the path of its diff --git a/modules/mesh-delivery-indexer/internal/index/seed_steps.go b/modules/mesh-delivery-indexer/internal/index/seed_steps.go index a4bd5faf..c945beb8 100644 --- a/modules/mesh-delivery-indexer/internal/index/seed_steps.go +++ b/modules/mesh-delivery-indexer/internal/index/seed_steps.go @@ -9,8 +9,8 @@ import ( "time" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-indexer/internal/index/seed_steps_test.go b/modules/mesh-delivery-indexer/internal/index/seed_steps_test.go index a903f7ff..a970271e 100644 --- a/modules/mesh-delivery-indexer/internal/index/seed_steps_test.go +++ b/modules/mesh-delivery-indexer/internal/index/seed_steps_test.go @@ -8,8 +8,8 @@ import ( "time" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/modules/mesh-delivery-indexer/internal/index/series.go b/modules/mesh-delivery-indexer/internal/index/series.go index a5afb85a..bc54b86c 100644 --- a/modules/mesh-delivery-indexer/internal/index/series.go +++ b/modules/mesh-delivery-indexer/internal/index/series.go @@ -9,14 +9,14 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" - "git.novox.be/novox/mesh-delivery/sdk/packagename" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/packagename" ) // The packages state per series (DLV-I5; milestone § 2 item 1; design 51 *The versions*, ADR 0606 §1, ADR 0609 §1): beside diff --git a/modules/mesh-delivery-indexer/internal/index/source.go b/modules/mesh-delivery-indexer/internal/index/source.go index 702990d1..739ff2e0 100644 --- a/modules/mesh-delivery-indexer/internal/index/source.go +++ b/modules/mesh-delivery-indexer/internal/index/source.go @@ -11,9 +11,9 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/process" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // The gate's source revision of a watched branch (design 47 G §15, §115), read through the seat mesh-delivery's verb source diff --git a/modules/mesh-delivery-indexer/internal/index/source_test.go b/modules/mesh-delivery-indexer/internal/index/source_test.go index 9fc5b906..96fc8758 100644 --- a/modules/mesh-delivery-indexer/internal/index/source_test.go +++ b/modules/mesh-delivery-indexer/internal/index/source_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) const otherMerge = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" diff --git a/modules/mesh-delivery-indexer/internal/index/takein.go b/modules/mesh-delivery-indexer/internal/index/takein.go index a9c02c1a..f007fddb 100644 --- a/modules/mesh-delivery-indexer/internal/index/takein.go +++ b/modules/mesh-delivery-indexer/internal/index/takein.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // The indexer's doing tool (novox/hq issue 1945; the instruction "tools are how a module is spoken to"): indexer_take_in diff --git a/modules/mesh-delivery-indexer/internal/index/taken.go b/modules/mesh-delivery-indexer/internal/index/taken.go index 8b07f0ed..433dc4d1 100644 --- a/modules/mesh-delivery-indexer/internal/index/taken.go +++ b/modules/mesh-delivery-indexer/internal/index/taken.go @@ -11,7 +11,7 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/process" ) diff --git a/modules/mesh-delivery-indexer/internal/index/toolchains.go b/modules/mesh-delivery-indexer/internal/index/toolchains.go index b3e9940a..68b4df02 100644 --- a/modules/mesh-delivery-indexer/internal/index/toolchains.go +++ b/modules/mesh-delivery-indexer/internal/index/toolchains.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" "mesh-delivery-indexer/judge" diff --git a/modules/mesh-delivery-indexer/internal/index/toolchains_test.go b/modules/mesh-delivery-indexer/internal/index/toolchains_test.go index aab661ed..960d7023 100644 --- a/modules/mesh-delivery-indexer/internal/index/toolchains_test.go +++ b/modules/mesh-delivery-indexer/internal/index/toolchains_test.go @@ -14,20 +14,20 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/views" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "mesh-delivery-indexer/internal/fingerprint" ) diff --git a/modules/mesh-delivery-indexer/internal/index/toolchains_values.go b/modules/mesh-delivery-indexer/internal/index/toolchains_values.go index 4875e50c..863d0553 100644 --- a/modules/mesh-delivery-indexer/internal/index/toolchains_values.go +++ b/modules/mesh-delivery-indexer/internal/index/toolchains_values.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/trycandidates.go b/modules/mesh-delivery-indexer/internal/index/trycandidates.go index db949fc4..9c00c6d0 100644 --- a/modules/mesh-delivery-indexer/internal/index/trycandidates.go +++ b/modules/mesh-delivery-indexer/internal/index/trycandidates.go @@ -19,10 +19,10 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdeliverychecker" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/verdicts.go b/modules/mesh-delivery-indexer/internal/index/verdicts.go index 987ee838..9886a233 100644 --- a/modules/mesh-delivery-indexer/internal/index/verdicts.go +++ b/modules/mesh-delivery-indexer/internal/index/verdicts.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/verdicts_test.go b/modules/mesh-delivery-indexer/internal/index/verdicts_test.go index b19ec0fd..920a3acf 100644 --- a/modules/mesh-delivery-indexer/internal/index/verdicts_test.go +++ b/modules/mesh-delivery-indexer/internal/index/verdicts_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-forge-bridge/forgemsg" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-indexer/internal/index/versions.go b/modules/mesh-delivery-indexer/internal/index/versions.go index e0596ceb..d662be41 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions.go +++ b/modules/mesh-delivery-indexer/internal/index/versions.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/versions_edges.go b/modules/mesh-delivery-indexer/internal/index/versions_edges.go index 7691a6e6..a4380010 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions_edges.go +++ b/modules/mesh-delivery-indexer/internal/index/versions_edges.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/versions_fill.go b/modules/mesh-delivery-indexer/internal/index/versions_fill.go index 49d29256..9f520236 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions_fill.go +++ b/modules/mesh-delivery-indexer/internal/index/versions_fill.go @@ -12,7 +12,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" mcc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/versions_fill_edges.go b/modules/mesh-delivery-indexer/internal/index/versions_fill_edges.go index a47075f6..7a2268e9 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions_fill_edges.go +++ b/modules/mesh-delivery-indexer/internal/index/versions_fill_edges.go @@ -10,8 +10,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/internal/index/versions_test.go b/modules/mesh-delivery-indexer/internal/index/versions_test.go index 8920edf1..9acc013b 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions_test.go +++ b/modules/mesh-delivery-indexer/internal/index/versions_test.go @@ -12,10 +12,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" ) // Design 47 G §349: a version is released once every artifact the module's entry names is published at it, said once as diff --git a/modules/mesh-delivery-indexer/internal/index/views.go b/modules/mesh-delivery-indexer/internal/index/views.go index 9aacd256..cc1a7ddc 100644 --- a/modules/mesh-delivery-indexer/internal/index/views.go +++ b/modules/mesh-delivery-indexer/internal/index/views.go @@ -1,7 +1,7 @@ package index import ( - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-indexer/internal/index/wanted_names_test.go b/modules/mesh-delivery-indexer/internal/index/wanted_names_test.go index aa103b5c..3946769a 100644 --- a/modules/mesh-delivery-indexer/internal/index/wanted_names_test.go +++ b/modules/mesh-delivery-indexer/internal/index/wanted_names_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-indexer/judge/busstate_test.go b/modules/mesh-delivery-indexer/judge/busstate_test.go index b924043b..8fa1d166 100644 --- a/modules/mesh-delivery-indexer/judge/busstate_test.go +++ b/modules/mesh-delivery-indexer/judge/busstate_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-indexer/judge/judge.go b/modules/mesh-delivery-indexer/judge/judge.go index 5ca9ce1f..00c5b15a 100644 --- a/modules/mesh-delivery-indexer/judge/judge.go +++ b/modules/mesh-delivery-indexer/judge/judge.go @@ -27,7 +27,7 @@ import ( "git.novox.be/novox/mesh-sdk/go/seatdef" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-delivery-indexer/judge/judge_test.go b/modules/mesh-delivery-indexer/judge/judge_test.go index 44df30da..b87cf831 100644 --- a/modules/mesh-delivery-indexer/judge/judge_test.go +++ b/modules/mesh-delivery-indexer/judge/judge_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/sdk/composer" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" ) diff --git a/modules/mesh-delivery-indexer/judge/packagenames.go b/modules/mesh-delivery-indexer/judge/packagenames.go index 2803fb21..4510921d 100644 --- a/modules/mesh-delivery-indexer/judge/packagenames.go +++ b/modules/mesh-delivery-indexer/judge/packagenames.go @@ -5,7 +5,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // PackageNameProblems refuses a revision in which two modules' entries carry the same package name in one ecosystem, naming diff --git a/modules/mesh-delivery-indexer/judge/packagenames_test.go b/modules/mesh-delivery-indexer/judge/packagenames_test.go index bea3e51d..67e1ef7d 100644 --- a/modules/mesh-delivery-indexer/judge/packagenames_test.go +++ b/modules/mesh-delivery-indexer/judge/packagenames_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §491: two modules whose entries carry one Go module path are both refused, naming both; one name in two diff --git a/modules/mesh-delivery-indexer/manifest_test.go b/modules/mesh-delivery-indexer/manifest_test.go index 8abc4779..56b7eeda 100644 --- a/modules/mesh-delivery-indexer/manifest_test.go +++ b/modules/mesh-delivery-indexer/manifest_test.go @@ -3,7 +3,7 @@ package manifest import ( "bytes" "encoding/json" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/git" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "io/fs" "os" "path/filepath" diff --git a/modules/mesh-delivery-indexer/takein/go.mod b/modules/mesh-delivery-indexer/takein/go.mod index 1114d9f6..5bca42db 100644 --- a/modules/mesh-delivery-indexer/takein/go.mod +++ b/modules/mesh-delivery-indexer/takein/go.mod @@ -3,11 +3,11 @@ module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../../mesh-delivery-sdk -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect diff --git a/modules/mesh-delivery-indexer/takein/takein.go b/modules/mesh-delivery-indexer/takein/takein.go index 59141f58..cc3570d5 100644 --- a/modules/mesh-delivery-indexer/takein/takein.go +++ b/modules/mesh-delivery-indexer/takein/takein.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/takein/takein_test.go b/modules/mesh-delivery-indexer/takein/takein_test.go index 8aef1dbd..8d971c64 100644 --- a/modules/mesh-delivery-indexer/takein/takein_test.go +++ b/modules/mesh-delivery-indexer/takein/takein_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-indexer/takein/taken.go b/modules/mesh-delivery-indexer/takein/taken.go index e7cd3ea8..13a9f693 100644 --- a/modules/mesh-delivery-indexer/takein/taken.go +++ b/modules/mesh-delivery-indexer/takein/taken.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline-tools/main.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline-tools/main.go index dcc14e41..64776e43 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline-tools/main.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline-tools/main.go @@ -12,7 +12,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" "git.novox.be/novox/mesh-sdk/go/views" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" stdio "git.novox.be/novox/mesh-sdk/go" "mesh-delivery-pipeline/internal/pipeline" diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/main.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/main.go index 23a357aa..2190fdfb 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/main.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/main.go @@ -16,7 +16,7 @@ import ( "github.com/nats-io/nats.go" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-pipeline/internal/pipeline" diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/run_integration_test.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/run_integration_test.go index a143be7d..5637d20c 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/run_integration_test.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/run_integration_test.go @@ -15,9 +15,9 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/testbus" ) diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/start.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/start.go index 6942aba5..5c933297 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/start.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/start.go @@ -8,8 +8,8 @@ import ( "github.com/nats-io/nats.go/jetstream" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/steps.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/steps.go index 8e6c7ae4..5e4aa9e7 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/steps.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/steps.go @@ -9,9 +9,9 @@ import ( "github.com/nats-io/nats.go/jetstream" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs.go index b082fef0..6ddf5016 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs.go @@ -9,7 +9,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-pipeline/internal/pipeline" diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs_test.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs_test.go index 5f85c5f2..9b5fb4d6 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs_test.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/verbs_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) // A write verb is answered only for a caller the bus proved, and its input is the verb's own (design 47 G §394, A-107). diff --git a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/views.go b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/views.go index 3228a10c..363c34db 100644 --- a/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/views.go +++ b/modules/mesh-delivery-pipeline/cmd/mesh-delivery-pipeline/views.go @@ -6,8 +6,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-delivery-pipeline/go.mod b/modules/mesh-delivery-pipeline/go.mod index 50178e66..5b811d62 100644 --- a/modules/mesh-delivery-pipeline/go.mod +++ b/modules/mesh-delivery-pipeline/go.mod @@ -3,7 +3,7 @@ module mesh-delivery-pipeline go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats.go v1.54.0 ) @@ -11,15 +11,15 @@ require ( require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshpipelinerunnerclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 github.com/klauspost/compress v1.20.1 // indirect github.com/nats-io/nkeys v0.4.16 // indirect github.com/nats-io/nuid v1.0.1 // indirect diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/approval.go b/modules/mesh-delivery-pipeline/internal/pipeline/approval.go index e0367e8b..2756fa75 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/approval.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/approval.go @@ -10,7 +10,7 @@ import ( "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/bounds.go b/modules/mesh-delivery-pipeline/internal/pipeline/bounds.go index 94d3757f..c4a107b2 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/bounds.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/bounds.go @@ -6,10 +6,10 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - nodebuildimage "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - nodebuildnode "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + nodebuildimage "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + nodebuildnode "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" ) // AskBound is how long an ask on a build seat's work queue may wait for its holder to take it (design 47 G §535, §647): five diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/place.go b/modules/mesh-delivery-pipeline/internal/pipeline/place.go index 6530c35e..05eee910 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/place.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/place.go @@ -8,13 +8,13 @@ import ( "strings" "time" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - nodebuildimage "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - nodebuildnode "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + nodebuildimage "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + nodebuildnode "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" ) // StepAsker puts one step's ask on a build seat's work queue, at the subject accept names (the seat's accepted kind `step` diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/place_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/place_test.go index 6ae3bc11..f5fb7fd4 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/place_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/place_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" ) func stepSeatOf(t *testing.T, name string) StepSeat { diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/read.go b/modules/mesh-delivery-pipeline/internal/pipeline/read.go index 0fd36d66..ced5a604 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/read.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/read.go @@ -9,7 +9,7 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) // Kept is one of the runner's old state sections as it reads them: every key, and one key's value (nil when absent). diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/read_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/read_test.go index af516211..601e639c 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/read_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/read_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) type memKept map[string]json.RawMessage diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/registrations.go b/modules/mesh-delivery-pipeline/internal/pipeline/registrations.go index fbe903d5..27bdbe82 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/registrations.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/registrations.go @@ -6,8 +6,8 @@ import ( "sort" "sync" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) // Status is a step's status for one artifact of a module, read from the module's registration and never from a diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/registrations_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/registrations_test.go index 7ff4f096..03eae010 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/registrations_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/registrations_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // The policy, the build seat by language and the views per watched branch (design 47 G §21, §23, §323, §195). diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/start.go b/modules/mesh-delivery-pipeline/internal/pipeline/start.go index b31097da..9e5737aa 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/start.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/start.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - runnerclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshpipelinerunnerclient" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + runnerclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshpipelinerunnerclient" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/start_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/start_test.go index 32843100..7fcfec71 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/start_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/start_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) type created map[string][]byte diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/steps.go b/modules/mesh-delivery-pipeline/internal/pipeline/steps.go index 21063641..fd2c3fa3 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/steps.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/steps.go @@ -8,12 +8,12 @@ import ( "time" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - nodebuildimage "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - nodebuildnode "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + nodebuildimage "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + nodebuildnode "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go index fec31c8c..7f8e832e 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go @@ -8,9 +8,9 @@ import ( "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/toolchain.go b/modules/mesh-delivery-pipeline/internal/pipeline/toolchain.go index dc4607fe..cb467b34 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/toolchain.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/toolchain.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strings" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" ) // ToolchainOf reads a toolchain-agreed as the toolchain a step ask names: its language and version (design 47 G §416, A-104). diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/verbs.go b/modules/mesh-delivery-pipeline/internal/pipeline/verbs.go index e664c149..65a924a6 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/verbs.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/verbs.go @@ -6,10 +6,10 @@ import ( "strings" "time" - builds "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/verbs_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/verbs_test.go index 77f7ea31..602f33c2 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/verbs_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/verbs_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + catalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-pipeline/manifest_test.go b/modules/mesh-delivery-pipeline/manifest_test.go index 8467fb0d..a1ffc26d 100644 --- a/modules/mesh-delivery-pipeline/manifest_test.go +++ b/modules/mesh-delivery-pipeline/manifest_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" "git.novox.be/novox/mesh-sdk/go/catalogue" ) @@ -94,7 +94,7 @@ func TestManifest(t *testing.T) { // §610, A-75: no verb of the runner's definition names its callers, so the class's default holds for each. func TestNoVerbNamesItsCallers(t *testing.T) { - raw, err := os.ReadFile("../../contracts/seats/mesh-pipeline-runner/seat.json") + raw, err := os.ReadFile("../mesh-delivery-contracts/seats/mesh-pipeline-runner/seat.json") if err != nil { t.Fatal(err) } diff --git a/sdk/buildrecord/buildrecord.go b/modules/mesh-delivery-sdk/buildrecord/buildrecord.go similarity index 100% rename from sdk/buildrecord/buildrecord.go rename to modules/mesh-delivery-sdk/buildrecord/buildrecord.go diff --git a/sdk/buildrecord/buildrecord_test.go b/modules/mesh-delivery-sdk/buildrecord/buildrecord_test.go similarity index 100% rename from sdk/buildrecord/buildrecord_test.go rename to modules/mesh-delivery-sdk/buildrecord/buildrecord_test.go diff --git a/sdk/buildrecord/testdata/build-record-build-agent.json b/modules/mesh-delivery-sdk/buildrecord/testdata/build-record-build-agent.json similarity index 100% rename from sdk/buildrecord/testdata/build-record-build-agent.json rename to modules/mesh-delivery-sdk/buildrecord/testdata/build-record-build-agent.json diff --git a/sdk/buildrun/keys_test.go b/modules/mesh-delivery-sdk/buildrun/keys_test.go similarity index 93% rename from sdk/buildrun/keys_test.go rename to modules/mesh-delivery-sdk/buildrun/keys_test.go index 8ce937d1..a4a75e2f 100644 --- a/sdk/buildrun/keys_test.go +++ b/modules/mesh-delivery-sdk/buildrun/keys_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // keys is a steps state in memory: every value put, in order, per key, and a signal for each end. diff --git a/sdk/buildrun/stale.go b/modules/mesh-delivery-sdk/buildrun/stale.go similarity index 99% rename from sdk/buildrun/stale.go rename to modules/mesh-delivery-sdk/buildrun/stale.go index 08160833..c97a79c3 100644 --- a/sdk/buildrun/stale.go +++ b/modules/mesh-delivery-sdk/buildrun/stale.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "fmt" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "os" "strconv" "strings" diff --git a/sdk/buildrun/stale_test.go b/modules/mesh-delivery-sdk/buildrun/stale_test.go similarity index 99% rename from sdk/buildrun/stale_test.go rename to modules/mesh-delivery-sdk/buildrun/stale_test.go index 9ceea9af..5b777adf 100644 --- a/sdk/buildrun/stale_test.go +++ b/modules/mesh-delivery-sdk/buildrun/stale_test.go @@ -3,7 +3,7 @@ package buildrun import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "strings" "testing" "time" diff --git a/sdk/buildstep/ask.go b/modules/mesh-delivery-sdk/buildstep/ask.go similarity index 100% rename from sdk/buildstep/ask.go rename to modules/mesh-delivery-sdk/buildstep/ask.go diff --git a/sdk/buildstep/ask_test.go b/modules/mesh-delivery-sdk/buildstep/ask_test.go similarity index 99% rename from sdk/buildstep/ask_test.go rename to modules/mesh-delivery-sdk/buildstep/ask_test.go index 88558bee..f63c248b 100644 --- a/sdk/buildstep/ask_test.go +++ b/modules/mesh-delivery-sdk/buildstep/ask_test.go @@ -495,7 +495,7 @@ func TestTheThreeSeatsFixturesFitTheNeutralForms(t *testing.T) { } seen := 0 for _, seat := range []string{"node-build-go", "node-build-image", "node-build-node"} { - raw, err := os.ReadFile(filepath.Join("..", "..", "contracts", "seats", seat, "fixtures", "states.json")) + raw, err := os.ReadFile(filepath.Join("..", "..", "mesh-delivery-contracts", "seats", seat, "fixtures", "states.json")) if err != nil { t.Fatal(err) } @@ -536,7 +536,7 @@ func TestTheThreeSeatsFixturesFitTheNeutralForms(t *testing.T) { // 086 A-D31: each seat's step-ended fixtures are the neutral StepEnded, said on their node's subject. ended := 0 for _, seat := range []string{"node-build-go", "node-build-image", "node-build-node"} { - raw, err := os.ReadFile(filepath.Join("..", "..", "contracts", "seats", seat, "fixtures", "events.json")) + raw, err := os.ReadFile(filepath.Join("..", "..", "mesh-delivery-contracts", "seats", seat, "fixtures", "events.json")) if err != nil { t.Fatal(err) } diff --git a/sdk/buildstep/busfree_test.go b/modules/mesh-delivery-sdk/buildstep/busfree_test.go similarity index 100% rename from sdk/buildstep/busfree_test.go rename to modules/mesh-delivery-sdk/buildstep/busfree_test.go diff --git a/sdk/buildstep/capacity.go b/modules/mesh-delivery-sdk/buildstep/capacity.go similarity index 100% rename from sdk/buildstep/capacity.go rename to modules/mesh-delivery-sdk/buildstep/capacity.go diff --git a/sdk/buildstep/doc.go b/modules/mesh-delivery-sdk/buildstep/doc.go similarity index 100% rename from sdk/buildstep/doc.go rename to modules/mesh-delivery-sdk/buildstep/doc.go diff --git a/sdk/buildstep/failure.go b/modules/mesh-delivery-sdk/buildstep/failure.go similarity index 100% rename from sdk/buildstep/failure.go rename to modules/mesh-delivery-sdk/buildstep/failure.go diff --git a/sdk/buildstep/helpers.go b/modules/mesh-delivery-sdk/buildstep/helpers.go similarity index 100% rename from sdk/buildstep/helpers.go rename to modules/mesh-delivery-sdk/buildstep/helpers.go diff --git a/sdk/buildstep/keptartifact.go b/modules/mesh-delivery-sdk/buildstep/keptartifact.go similarity index 100% rename from sdk/buildstep/keptartifact.go rename to modules/mesh-delivery-sdk/buildstep/keptartifact.go diff --git a/sdk/buildstep/launchers.go b/modules/mesh-delivery-sdk/buildstep/launchers.go similarity index 100% rename from sdk/buildstep/launchers.go rename to modules/mesh-delivery-sdk/buildstep/launchers.go diff --git a/sdk/buildstep/launchers_test.go b/modules/mesh-delivery-sdk/buildstep/launchers_test.go similarity index 100% rename from sdk/buildstep/launchers_test.go rename to modules/mesh-delivery-sdk/buildstep/launchers_test.go diff --git a/sdk/buildstep/passing.go b/modules/mesh-delivery-sdk/buildstep/passing.go similarity index 100% rename from sdk/buildstep/passing.go rename to modules/mesh-delivery-sdk/buildstep/passing.go diff --git a/sdk/buildstep/pause.go b/modules/mesh-delivery-sdk/buildstep/pause.go similarity index 100% rename from sdk/buildstep/pause.go rename to modules/mesh-delivery-sdk/buildstep/pause.go diff --git a/sdk/buildstep/pipelinestep.go b/modules/mesh-delivery-sdk/buildstep/pipelinestep.go similarity index 100% rename from sdk/buildstep/pipelinestep.go rename to modules/mesh-delivery-sdk/buildstep/pipelinestep.go diff --git a/sdk/buildstep/request.go b/modules/mesh-delivery-sdk/buildstep/request.go similarity index 100% rename from sdk/buildstep/request.go rename to modules/mesh-delivery-sdk/buildstep/request.go diff --git a/sdk/buildstep/request_test.go b/modules/mesh-delivery-sdk/buildstep/request_test.go similarity index 100% rename from sdk/buildstep/request_test.go rename to modules/mesh-delivery-sdk/buildstep/request_test.go diff --git a/sdk/buildstep/run.go b/modules/mesh-delivery-sdk/buildstep/run.go similarity index 100% rename from sdk/buildstep/run.go rename to modules/mesh-delivery-sdk/buildstep/run.go diff --git a/sdk/buildstep/seat_acts_test.go b/modules/mesh-delivery-sdk/buildstep/seat_acts_test.go similarity index 86% rename from sdk/buildstep/seat_acts_test.go rename to modules/mesh-delivery-sdk/buildstep/seat_acts_test.go index 848bdd93..53198d98 100644 --- a/sdk/buildstep/seat_acts_test.go +++ b/modules/mesh-delivery-sdk/buildstep/seat_acts_test.go @@ -8,7 +8,7 @@ import ( // The seat's `build` acting rule matches an artifact by its kind, an image having no language (design 47 G §324, §397). func TestTheSeatsBuildRuleActsOnTheKindImage(t *testing.T) { - raw, err := os.ReadFile("../../contracts/seats/node-build-image/seat.json") + raw, err := os.ReadFile("../../mesh-delivery-contracts/seats/node-build-image/seat.json") if err != nil { t.Fatal(err) } diff --git a/sdk/buildstep/step.go b/modules/mesh-delivery-sdk/buildstep/step.go similarity index 100% rename from sdk/buildstep/step.go rename to modules/mesh-delivery-sdk/buildstep/step.go diff --git a/sdk/buildstep/step_test.go b/modules/mesh-delivery-sdk/buildstep/step_test.go similarity index 100% rename from sdk/buildstep/step_test.go rename to modules/mesh-delivery-sdk/buildstep/step_test.go diff --git a/sdk/buildstep/steps.go b/modules/mesh-delivery-sdk/buildstep/steps.go similarity index 100% rename from sdk/buildstep/steps.go rename to modules/mesh-delivery-sdk/buildstep/steps.go diff --git a/sdk/buildstep/toolchain.go b/modules/mesh-delivery-sdk/buildstep/toolchain.go similarity index 100% rename from sdk/buildstep/toolchain.go rename to modules/mesh-delivery-sdk/buildstep/toolchain.go diff --git a/sdk/buildstep/toolchain_test.go b/modules/mesh-delivery-sdk/buildstep/toolchain_test.go similarity index 95% rename from sdk/buildstep/toolchain_test.go rename to modules/mesh-delivery-sdk/buildstep/toolchain_test.go index 01afe441..7bfeb77d 100644 --- a/sdk/buildstep/toolchain_test.go +++ b/modules/mesh-delivery-sdk/buildstep/toolchain_test.go @@ -15,7 +15,7 @@ import ( func TestTheToolchainsValueAndKeyAreTheSeatsLayout(t *testing.T) { read := 0 for _, seat := range []string{"node-build-go", "node-build-image", "node-build-node"} { - raw, err := os.ReadFile(filepath.Join("..", "..", "contracts", "seats", seat, "fixtures", "states.json")) + raw, err := os.ReadFile(filepath.Join("..", "..", "mesh-delivery-contracts", "seats", seat, "fixtures", "states.json")) if err != nil { t.Fatal(err) } diff --git a/sdk/buildstep/toolchains.go b/modules/mesh-delivery-sdk/buildstep/toolchains.go similarity index 100% rename from sdk/buildstep/toolchains.go rename to modules/mesh-delivery-sdk/buildstep/toolchains.go diff --git a/sdk/buildstep/toolchains_test.go b/modules/mesh-delivery-sdk/buildstep/toolchains_test.go similarity index 100% rename from sdk/buildstep/toolchains_test.go rename to modules/mesh-delivery-sdk/buildstep/toolchains_test.go diff --git a/sdk/buildstep/trees.go b/modules/mesh-delivery-sdk/buildstep/trees.go similarity index 100% rename from sdk/buildstep/trees.go rename to modules/mesh-delivery-sdk/buildstep/trees.go diff --git a/sdk/catalogkey/key.go b/modules/mesh-delivery-sdk/catalogkey/key.go similarity index 100% rename from sdk/catalogkey/key.go rename to modules/mesh-delivery-sdk/catalogkey/key.go diff --git a/sdk/catalogkey/key_test.go b/modules/mesh-delivery-sdk/catalogkey/key_test.go similarity index 100% rename from sdk/catalogkey/key_test.go rename to modules/mesh-delivery-sdk/catalogkey/key_test.go diff --git a/sdk/composer/composer.go b/modules/mesh-delivery-sdk/composer/composer.go similarity index 100% rename from sdk/composer/composer.go rename to modules/mesh-delivery-sdk/composer/composer.go diff --git a/sdk/composer/composer_test.go b/modules/mesh-delivery-sdk/composer/composer_test.go similarity index 100% rename from sdk/composer/composer_test.go rename to modules/mesh-delivery-sdk/composer/composer_test.go diff --git a/sdk/forgekey/forgekey.go b/modules/mesh-delivery-sdk/forgekey/forgekey.go similarity index 100% rename from sdk/forgekey/forgekey.go rename to modules/mesh-delivery-sdk/forgekey/forgekey.go diff --git a/sdk/forgekey/forgekey_test.go b/modules/mesh-delivery-sdk/forgekey/forgekey_test.go similarity index 100% rename from sdk/forgekey/forgekey_test.go rename to modules/mesh-delivery-sdk/forgekey/forgekey_test.go diff --git a/sdk/go.mod b/modules/mesh-delivery-sdk/go.mod similarity index 58% rename from sdk/go.mod rename to modules/mesh-delivery-sdk/go.mod index a7bf4f30..e7970a52 100644 --- a/sdk/go.mod +++ b/modules/mesh-delivery-sdk/go.mod @@ -1,4 +1,4 @@ -module git.novox.be/novox/mesh-delivery/sdk +module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk go 1.26.0 @@ -6,7 +6,7 @@ require git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 require ( git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 github.com/klauspost/compress v1.20.1 // indirect github.com/nats-io/nats.go v1.54.0 // indirect github.com/nats-io/nkeys v0.4.16 // indirect @@ -15,4 +15,4 @@ require ( golang.org/x/sys v0.48.0 // indirect ) -require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 diff --git a/sdk/go.sum b/modules/mesh-delivery-sdk/go.sum similarity index 100% rename from sdk/go.sum rename to modules/mesh-delivery-sdk/go.sum diff --git a/sdk/graph/entry.go b/modules/mesh-delivery-sdk/graph/entry.go similarity index 91% rename from sdk/graph/entry.go rename to modules/mesh-delivery-sdk/graph/entry.go index 09cb1784..49341939 100644 --- a/sdk/graph/entry.go +++ b/modules/mesh-delivery-sdk/graph/entry.go @@ -4,7 +4,7 @@ import ( "maps" "slices" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // NodeOf is the node of the module graph a catalog graph entry carries, as the indexer took it in (design 47, *Two diff --git a/sdk/graph/graph.go b/modules/mesh-delivery-sdk/graph/graph.go similarity index 99% rename from sdk/graph/graph.go rename to modules/mesh-delivery-sdk/graph/graph.go index c8086e93..560004c0 100644 --- a/sdk/graph/graph.go +++ b/modules/mesh-delivery-sdk/graph/graph.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" diff --git a/sdk/graph/graph_test.go b/modules/mesh-delivery-sdk/graph/graph_test.go similarity index 99% rename from sdk/graph/graph_test.go rename to modules/mesh-delivery-sdk/graph/graph_test.go index 54379bba..405b67f7 100644 --- a/sdk/graph/graph_test.go +++ b/modules/mesh-delivery-sdk/graph/graph_test.go @@ -9,7 +9,7 @@ import ( "testing" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/sdk/graph/reads.go b/modules/mesh-delivery-sdk/graph/reads.go similarity index 100% rename from sdk/graph/reads.go rename to modules/mesh-delivery-sdk/graph/reads.go diff --git a/sdk/graph/waits.go b/modules/mesh-delivery-sdk/graph/waits.go similarity index 100% rename from sdk/graph/waits.go rename to modules/mesh-delivery-sdk/graph/waits.go diff --git a/sdk/grouppackages/grouppackages.go b/modules/mesh-delivery-sdk/grouppackages/grouppackages.go similarity index 94% rename from sdk/grouppackages/grouppackages.go rename to modules/mesh-delivery-sdk/grouppackages/grouppackages.go index 5e562269..43ae1433 100644 --- a/sdk/grouppackages/grouppackages.go +++ b/modules/mesh-delivery-sdk/grouppackages/grouppackages.go @@ -10,8 +10,8 @@ import ( "git.novox.be/novox/mesh-sdk/go/sdkversion" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // rootOf is the module a member of repo stands for when no package of it is known: its root module path, or for the diff --git a/sdk/kept/kept.go b/modules/mesh-delivery-sdk/kept/kept.go similarity index 100% rename from sdk/kept/kept.go rename to modules/mesh-delivery-sdk/kept/kept.go diff --git a/sdk/kept/kept_test.go b/modules/mesh-delivery-sdk/kept/kept_test.go similarity index 100% rename from sdk/kept/kept_test.go rename to modules/mesh-delivery-sdk/kept/kept_test.go diff --git a/sdk/manifest_test.go b/modules/mesh-delivery-sdk/manifest_test.go similarity index 100% rename from sdk/manifest_test.go rename to modules/mesh-delivery-sdk/manifest_test.go diff --git a/sdk/module.json b/modules/mesh-delivery-sdk/module.json similarity index 100% rename from sdk/module.json rename to modules/mesh-delivery-sdk/module.json diff --git a/sdk/packagename/packagename.go b/modules/mesh-delivery-sdk/packagename/packagename.go similarity index 96% rename from sdk/packagename/packagename.go rename to modules/mesh-delivery-sdk/packagename/packagename.go index 93b8ba34..ac4f87f9 100644 --- a/sdk/packagename/packagename.go +++ b/modules/mesh-delivery-sdk/packagename/packagename.go @@ -12,7 +12,7 @@ import ( "path" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/sdk/parts/bus.go b/modules/mesh-delivery-sdk/parts/bus.go similarity index 100% rename from sdk/parts/bus.go rename to modules/mesh-delivery-sdk/parts/bus.go diff --git a/sdk/parts/parts.go b/modules/mesh-delivery-sdk/parts/parts.go similarity index 100% rename from sdk/parts/parts.go rename to modules/mesh-delivery-sdk/parts/parts.go diff --git a/sdk/parts/parts_test.go b/modules/mesh-delivery-sdk/parts/parts_test.go similarity index 100% rename from sdk/parts/parts_test.go rename to modules/mesh-delivery-sdk/parts/parts_test.go diff --git a/sdk/parts/receive.go b/modules/mesh-delivery-sdk/parts/receive.go similarity index 100% rename from sdk/parts/receive.go rename to modules/mesh-delivery-sdk/parts/receive.go diff --git a/sdk/parts/receive_test.go b/modules/mesh-delivery-sdk/parts/receive_test.go similarity index 100% rename from sdk/parts/receive_test.go rename to modules/mesh-delivery-sdk/parts/receive_test.go diff --git a/sdk/seatdefs/domain.go b/modules/mesh-delivery-sdk/seatdefs/domain.go similarity index 100% rename from sdk/seatdefs/domain.go rename to modules/mesh-delivery-sdk/seatdefs/domain.go diff --git a/sdk/seatdefs/seatdefs.go b/modules/mesh-delivery-sdk/seatdefs/seatdefs.go similarity index 98% rename from sdk/seatdefs/seatdefs.go rename to modules/mesh-delivery-sdk/seatdefs/seatdefs.go index ca186252..99cf16ca 100644 --- a/sdk/seatdefs/seatdefs.go +++ b/modules/mesh-delivery-sdk/seatdefs/seatdefs.go @@ -13,7 +13,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/seatdef" ) diff --git a/sdk/sourcebranches/sourcebranches.go b/modules/mesh-delivery-sdk/sourcebranches/sourcebranches.go similarity index 97% rename from sdk/sourcebranches/sourcebranches.go rename to modules/mesh-delivery-sdk/sourcebranches/sourcebranches.go index d544f228..b0a11ca9 100644 --- a/sdk/sourcebranches/sourcebranches.go +++ b/modules/mesh-delivery-sdk/sourcebranches/sourcebranches.go @@ -10,7 +10,7 @@ import ( "slices" "time" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/sdk/trunk/packages.go b/modules/mesh-delivery-sdk/trunk/packages.go similarity index 100% rename from sdk/trunk/packages.go rename to modules/mesh-delivery-sdk/trunk/packages.go diff --git a/sdk/trunk/trunk.go b/modules/mesh-delivery-sdk/trunk/trunk.go similarity index 100% rename from sdk/trunk/trunk.go rename to modules/mesh-delivery-sdk/trunk/trunk.go diff --git a/sdk/trunk/trunk_test.go b/modules/mesh-delivery-sdk/trunk/trunk_test.go similarity index 98% rename from sdk/trunk/trunk_test.go rename to modules/mesh-delivery-sdk/trunk/trunk_test.go index fd7c3e6e..b098f048 100644 --- a/sdk/trunk/trunk_test.go +++ b/modules/mesh-delivery-sdk/trunk/trunk_test.go @@ -35,7 +35,7 @@ func TestSameRepository(t *testing.T) { // 1281/AC1 } func TestAnImportSetHoldsMeshPackagesSortedAndEachOnce(t *testing.T) { - a, b := ForgeModulePrefix+"mesh-sdk/go", ForgeModulePrefix+"mesh-delivery/sdk" + a, b := ForgeModulePrefix+"mesh-sdk/go", ForgeModulePrefix+"mesh-delivery/modules/mesh-delivery-sdk" if err := CheckImports([]string{b, a}); err != nil { t.Errorf("a sorted set is refused: %v", err) } diff --git a/sdk/window/window.go b/modules/mesh-delivery-sdk/window/window.go similarity index 100% rename from sdk/window/window.go rename to modules/mesh-delivery-sdk/window/window.go diff --git a/sdk/window/window_test.go b/modules/mesh-delivery-sdk/window/window_test.go similarity index 100% rename from sdk/window/window_test.go rename to modules/mesh-delivery-sdk/window/window_test.go diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks.go index e5f7ab28..34140d08 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks.go @@ -10,8 +10,8 @@ import ( stdio "git.novox.be/novox/mesh-sdk/go" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents" ) diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks_test.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks_test.go index 1604f9df..bcaa9cee 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks_test.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/assignerasks_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) // 1906/H1: given the assigner's hold ask in its bucket and no answer, when the teller hears the key, then it raises the ask on diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/integration_test.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/integration_test.go index 2ae5d2ad..89677e59 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/integration_test.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/integration_test.go @@ -21,8 +21,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-teller/internal/ends" diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/room_test.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/room_test.go index 2b87c8fb..b82eb585 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/room_test.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/room_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) // roomRefusal is the router's words when an asker already holds occ.MostOpen open asks, as the live router said them to diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller.go index f66012b6..c5b27f0e 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller.go @@ -13,7 +13,7 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller_test.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller_test.go index 4310edeb..425273fb 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller_test.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/teller_test.go @@ -15,8 +15,8 @@ import ( "git.novox.be/novox/mesh-sdk/go/process" "github.com/nats-io/nats.go/jetstream" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - meshdelivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + meshdelivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers.go index 9134f65f..b07b2665 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers_test.go b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers_test.go index c2b9b126..3e92d3f2 100644 --- a/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers_test.go +++ b/modules/mesh-delivery-teller/cmd/mesh-delivery-teller/viewanswers_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-teller/go.mod b/modules/mesh-delivery-teller/go.mod index a8b768e0..c41a8430 100644 --- a/modules/mesh-delivery-teller/go.mod +++ b/modules/mesh-delivery-teller/go.mod @@ -4,12 +4,12 @@ go 1.26.0 require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 @@ -33,7 +33,7 @@ require ( git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-teller/tellerevents => ./tellerevents @@ -44,10 +44,10 @@ require ( git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-teller/internal/ends/ends.go b/modules/mesh-delivery-teller/internal/ends/ends.go index f9bd4ae0..761a421c 100644 --- a/modules/mesh-delivery-teller/internal/ends/ends.go +++ b/modules/mesh-delivery-teller/internal/ends/ends.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) const ( diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go index 93dba240..c2c8770a 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-cli/main_test.go @@ -17,12 +17,12 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/catalogread.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/catalogread.go index 97803058..2ec90638 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/catalogread.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/catalogread.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "sort" "sync" "time" diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go index 73d70683..9be22969 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/main.go @@ -18,8 +18,8 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/busretry" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go index 5944e570..a4883180 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/owners_test.go @@ -3,15 +3,15 @@ package main import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "mesh-delivery-view/internal/view" "sort" "strings" "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/tiers_rows_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/tiers_rows_test.go index 94ead707..615b516a 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/tiers_rows_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view-tools/tiers_rows_test.go @@ -14,12 +14,12 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // encoded is v as its contract's encoder writes it, failing the test when it refuses. diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go index a4bb8fd6..b17e78d6 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go @@ -23,14 +23,14 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views/viewstest" "github.com/nats-io/nats-server/v2/server" diff --git a/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go b/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go index 771b2a5d..bee31ef3 100644 --- a/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go +++ b/modules/mesh-delivery-view/cmd/mesh-delivery-view/main.go @@ -11,7 +11,7 @@ import ( "encoding/json" "errors" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "io" "log" "mesh-delivery-view/internal/view" @@ -23,8 +23,8 @@ import ( "time" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/trunk" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" "github.com/nats-io/nats.go" diff --git a/modules/mesh-delivery-view/go.mod b/modules/mesh-delivery-view/go.mod index b86a0904..8cf7924c 100644 --- a/modules/mesh-delivery-view/go.mod +++ b/modules/mesh-delivery-view/go.mod @@ -10,11 +10,11 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 @@ -45,10 +45,10 @@ require ( require ( git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein => ../mesh-delivery-indexer/takein @@ -62,8 +62,8 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-view/internal/view/answers_test.go b/modules/mesh-delivery-view/internal/view/answers_test.go index 26368532..67b2eb85 100644 --- a/modules/mesh-delivery-view/internal/view/answers_test.go +++ b/modules/mesh-delivery-view/internal/view/answers_test.go @@ -12,8 +12,8 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-view/internal/view/asks_test.go b/modules/mesh-delivery-view/internal/view/asks_test.go index 23ca7a31..68f6fb43 100644 --- a/modules/mesh-delivery-view/internal/view/asks_test.go +++ b/modules/mesh-delivery-view/internal/view/asks_test.go @@ -12,8 +12,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) const askHeadA = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" diff --git a/modules/mesh-delivery-view/internal/view/backlog.go b/modules/mesh-delivery-view/internal/view/backlog.go index 3fe7b11b..de184851 100644 --- a/modules/mesh-delivery-view/internal/view/backlog.go +++ b/modules/mesh-delivery-view/internal/view/backlog.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "github.com/nats-io/nats.go/jetstream" ) diff --git a/modules/mesh-delivery-view/internal/view/backlog_test.go b/modules/mesh-delivery-view/internal/view/backlog_test.go index 4e704170..a8fc1687 100644 --- a/modules/mesh-delivery-view/internal/view/backlog_test.go +++ b/modules/mesh-delivery-view/internal/view/backlog_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "github.com/nats-io/nats.go/jetstream" ) diff --git a/modules/mesh-delivery-view/internal/view/catalog.go b/modules/mesh-delivery-view/internal/view/catalog.go index 385de245..8d6889ae 100644 --- a/modules/mesh-delivery-view/internal/view/catalog.go +++ b/modules/mesh-delivery-view/internal/view/catalog.go @@ -9,8 +9,8 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // CatalogSeat is the seat whose verb `revision` and event `catalog-revision` the view reads the modules from, as its diff --git a/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go b/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go index 9355d5a4..c39adafd 100644 --- a/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go +++ b/modules/mesh-delivery-view/internal/view/fingerprints_newform_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // I5 (issue 1851): from R4e the indexer writes the new form alone, and a module's fingerprint is built by the builder's key diff --git a/modules/mesh-delivery-view/internal/view/fingerprints_test.go b/modules/mesh-delivery-view/internal/view/fingerprints_test.go index 9df82a7f..3a937fe8 100644 --- a/modules/mesh-delivery-view/internal/view/fingerprints_test.go +++ b/modules/mesh-delivery-view/internal/view/fingerprints_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) const ( diff --git a/modules/mesh-delivery-view/internal/view/history.go b/modules/mesh-delivery-view/internal/view/history.go index 61fc424a..cdcc5355 100644 --- a/modules/mesh-delivery-view/internal/view/history.go +++ b/modules/mesh-delivery-view/internal/view/history.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) const ( diff --git a/modules/mesh-delivery-view/internal/view/holds.go b/modules/mesh-delivery-view/internal/view/holds.go index 9819e9d4..62b95f2c 100644 --- a/modules/mesh-delivery-view/internal/view/holds.go +++ b/modules/mesh-delivery-view/internal/view/holds.go @@ -11,9 +11,9 @@ import ( "time" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-view/internal/view/holds_test.go b/modules/mesh-delivery-view/internal/view/holds_test.go index e16977f2..910456d6 100644 --- a/modules/mesh-delivery-view/internal/view/holds_test.go +++ b/modules/mesh-delivery-view/internal/view/holds_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" ) diff --git a/modules/mesh-delivery-view/internal/view/motion.go b/modules/mesh-delivery-view/internal/view/motion.go index 09b517e1..4e16e75d 100644 --- a/modules/mesh-delivery-view/internal/view/motion.go +++ b/modules/mesh-delivery-view/internal/view/motion.go @@ -2,7 +2,7 @@ package view import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-sdk/go/motion" ) diff --git a/modules/mesh-delivery-view/internal/view/names.go b/modules/mesh-delivery-view/internal/view/names.go index 24e69c85..55f5b112 100644 --- a/modules/mesh-delivery-view/internal/view/names.go +++ b/modules/mesh-delivery-view/internal/view/names.go @@ -3,9 +3,9 @@ package view import ( "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/sdk/trunk" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-view/internal/view/reach.go b/modules/mesh-delivery-view/internal/view/reach.go index d74e058c..cf21c245 100644 --- a/modules/mesh-delivery-view/internal/view/reach.go +++ b/modules/mesh-delivery-view/internal/view/reach.go @@ -7,12 +7,12 @@ import ( "strings" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/trunk" ) // How far each repository reached (novox/hq ADR 0556 clauses 2 and 3, issue 1280). The view keeps, per repository the gate's diff --git a/modules/mesh-delivery-view/internal/view/reach_test.go b/modules/mesh-delivery-view/internal/view/reach_test.go index 5d53d583..06c58aa2 100644 --- a/modules/mesh-delivery-view/internal/view/reach_test.go +++ b/modules/mesh-delivery-view/internal/view/reach_test.go @@ -7,15 +7,15 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/trunk" ) // 1280 (ADR 0556 clauses 2 and 3): the view derives, per repository, how far each module reached and the reached head, writes diff --git a/modules/mesh-delivery-view/internal/view/read.go b/modules/mesh-delivery-view/internal/view/read.go index 63d09362..df828161 100644 --- a/modules/mesh-delivery-view/internal/view/read.go +++ b/modules/mesh-delivery-view/internal/view/read.go @@ -16,13 +16,13 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/trunk" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-delivery-view/internal/view/status.go b/modules/mesh-delivery-view/internal/view/status.go index 9cac369f..c11991a5 100644 --- a/modules/mesh-delivery-view/internal/view/status.go +++ b/modules/mesh-delivery-view/internal/view/status.go @@ -12,7 +12,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" healers "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhealers" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-sdk/go/motion" ) diff --git a/modules/mesh-delivery-view/internal/view/tiers.go b/modules/mesh-delivery-view/internal/view/tiers.go index 1d720ef5..03aa92cf 100644 --- a/modules/mesh-delivery-view/internal/view/tiers.go +++ b/modules/mesh-delivery-view/internal/view/tiers.go @@ -12,12 +12,12 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" - "git.novox.be/novox/mesh-delivery/sdk/graph" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/graph" ) // The tiers of a source revision are a view, worked out at each call and never stored (novox/hq ADR 0603 §1, §6): the diff --git a/modules/mesh-delivery-view/internal/view/usage.go b/modules/mesh-delivery-view/internal/view/usage.go index 368a2605..a030f938 100644 --- a/modules/mesh-delivery-view/internal/view/usage.go +++ b/modules/mesh-delivery-view/internal/view/usage.go @@ -22,8 +22,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" buildseats "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildrun" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // BuildUsageTool is the view's tool of the build nodes' use. diff --git a/modules/mesh-delivery-view/internal/view/view.go b/modules/mesh-delivery-view/internal/view/view.go index 49db0b8e..170e8cf5 100644 --- a/modules/mesh-delivery-view/internal/view/view.go +++ b/modules/mesh-delivery-view/internal/view/view.go @@ -17,17 +17,17 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrecord" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" - "git.novox.be/novox/mesh-delivery/sdk/buildrecord" - "git.novox.be/novox/mesh-delivery/sdk/trunk" "git.novox.be/novox/mesh-sdk/go/motion" ) diff --git a/modules/mesh-delivery-view/internal/view/view_test.go b/modules/mesh-delivery-view/internal/view/view_test.go index ea375a82..ff52bf09 100644 --- a/modules/mesh-delivery-view/internal/view/view_test.go +++ b/modules/mesh-delivery-view/internal/view/view_test.go @@ -16,8 +16,8 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" healers "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhealers" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/motion" ) diff --git a/modules/mesh-delivery-view/internal/view/wants_test.go b/modules/mesh-delivery-view/internal/view/wants_test.go index 23a84f33..d4c3d6b7 100644 --- a/modules/mesh-delivery-view/internal/view/wants_test.go +++ b/modules/mesh-delivery-view/internal/view/wants_test.go @@ -9,11 +9,11 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) const ( diff --git a/modules/mesh-delivery-view/manifest_test.go b/modules/mesh-delivery-view/manifest_test.go index d0e3e918..14e10a64 100644 --- a/modules/mesh-delivery-view/manifest_test.go +++ b/modules/mesh-delivery-view/manifest_test.go @@ -3,7 +3,7 @@ package manifest import ( "bytes" "encoding/json" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "io/fs" "mesh-delivery-view/internal/view" "os" @@ -14,7 +14,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-view/viewstate/answerkey.go b/modules/mesh-delivery-view/viewstate/answerkey.go index 7d7d8a09..520708bc 100644 --- a/modules/mesh-delivery-view/viewstate/answerkey.go +++ b/modules/mesh-delivery-view/viewstate/answerkey.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) const viewWord = "view" diff --git a/modules/mesh-delivery-view/viewstate/go.mod b/modules/mesh-delivery-view/viewstate/go.mod index 7c7e3477..23726fec 100644 --- a/modules/mesh-delivery-view/viewstate/go.mod +++ b/modules/mesh-delivery-view/viewstate/go.mod @@ -3,24 +3,24 @@ module git.novox.be/novox/mesh-delivery/modules/mesh-delivery-view/viewstate go 1.26.0 require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) -replace git.novox.be/novox/mesh-delivery/sdk => ../../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../../mesh-delivery-sdk require ( git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-view/viewstate/reach.go b/modules/mesh-delivery-view/viewstate/reach.go index 51574736..746e4281 100644 --- a/modules/mesh-delivery-view/viewstate/reach.go +++ b/modules/mesh-delivery-view/viewstate/reach.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "git.novox.be/novox/mesh-delivery/sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-view/viewstate/viewstate_test.go b/modules/mesh-delivery-view/viewstate/viewstate_test.go index 9863ec8d..91f056a6 100644 --- a/modules/mesh-delivery-view/viewstate/viewstate_test.go +++ b/modules/mesh-delivery-view/viewstate/viewstate_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-assigner/asks" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/consumes.go b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/consumes.go index b3b39e33..912f1fe4 100644 --- a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/consumes.go +++ b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/consumes.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" "git.novox.be/novox/mesh-contracts/go/seats/meshbroker" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" "strings" "sync" diff --git a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/integration_test.go b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/integration_test.go index 15c84ddc..faad1c03 100644 --- a/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/integration_test.go +++ b/modules/mesh-delivery-watchman/cmd/mesh-delivery-watchman/integration_test.go @@ -20,9 +20,9 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/buscompose" "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views/viewstest" diff --git a/modules/mesh-delivery-watchman/go.mod b/modules/mesh-delivery-watchman/go.mod index 39040a2f..8c1e8d5e 100644 --- a/modules/mesh-delivery-watchman/go.mod +++ b/modules/mesh-delivery-watchman/go.mod @@ -11,12 +11,12 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshselfcheck v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-grants/busgrants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 @@ -40,18 +40,18 @@ require ( replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/buildrun => ../mesh-delivery-builder/buildrun -require git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 -replace git.novox.be/novox/mesh-delivery/sdk => ../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../mesh-delivery-sdk require git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-00010101000000-000000000000 require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-delivery-watchman/internal/watch/busstate.go b/modules/mesh-delivery-watchman/internal/watch/busstate.go index 5e07bf53..11d2d770 100644 --- a/modules/mesh-delivery-watchman/internal/watch/busstate.go +++ b/modules/mesh-delivery-watchman/internal/watch/busstate.go @@ -8,7 +8,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // **A refused or overdue creation of bus state is loud** (novox/hq ADR 0595 §4; design 25 § 12.2; DLV-W1). The watchman diff --git a/modules/mesh-delivery-watchman/internal/watch/findings_test.go b/modules/mesh-delivery-watchman/internal/watch/findings_test.go index dcdeb8cb..521f8557 100644 --- a/modules/mesh-delivery-watchman/internal/watch/findings_test.go +++ b/modules/mesh-delivery-watchman/internal/watch/findings_test.go @@ -12,10 +12,10 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" condseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient/heard" diff --git a/modules/mesh-delivery-watchman/internal/watch/mirror.go b/modules/mesh-delivery-watchman/internal/watch/mirror.go index c2206791..e6914293 100644 --- a/modules/mesh-delivery-watchman/internal/watch/mirror.go +++ b/modules/mesh-delivery-watchman/internal/watch/mirror.go @@ -8,11 +8,11 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // A build ask taken by a node is a move (novox/hq ADR 0525 §4, issues 1887 A8b, 1908, 1909; design 47 G §483, §496, §602, diff --git a/modules/mesh-delivery-watchman/internal/watch/pipelines.go b/modules/mesh-delivery-watchman/internal/watch/pipelines.go index ed9e62f2..bdec3fd6 100644 --- a/modules/mesh-delivery-watchman/internal/watch/pipelines.go +++ b/modules/mesh-delivery-watchman/internal/watch/pipelines.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) // What the runner and the gate say of a watched branch's head, heard as events (design 47 G §12, §75, §112): a head the diff --git a/modules/mesh-delivery-watchman/internal/watch/pipelines_test.go b/modules/mesh-delivery-watchman/internal/watch/pipelines_test.go index 4459ee23..aa534388 100644 --- a/modules/mesh-delivery-watchman/internal/watch/pipelines_test.go +++ b/modules/mesh-delivery-watchman/internal/watch/pipelines_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshpipelinerunner" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" ) func moved(branch string, rev int64, group string, at time.Time) []byte { diff --git a/modules/mesh-delivery-watchman/internal/watch/records.go b/modules/mesh-delivery-watchman/internal/watch/records.go index 95e5032b..39b7a48c 100644 --- a/modules/mesh-delivery-watchman/internal/watch/records.go +++ b/modules/mesh-delivery-watchman/internal/watch/records.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) // What the seats say of the delivery's records and stores, heard as the seats' events (design 47 G §148, §181, §218; ADR 0596 diff --git a/modules/mesh-delivery-watchman/internal/watch/verdicts.go b/modules/mesh-delivery-watchman/internal/watch/verdicts.go index 905db480..dcb2618c 100644 --- a/modules/mesh-delivery-watchman/internal/watch/verdicts.go +++ b/modules/mesh-delivery-watchman/internal/watch/verdicts.go @@ -3,7 +3,7 @@ package watch import ( "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" ) // KindManifestRefused is a module whose manifest the indexer's judge refused (novox/hq ADR 0578 §1): every reader holds diff --git a/modules/mesh-delivery-watchman/internal/watch/waits.go b/modules/mesh-delivery-watchman/internal/watch/waits.go index 3315e1a7..9b77f889 100644 --- a/modules/mesh-delivery-watchman/internal/watch/waits.go +++ b/modules/mesh-delivery-watchman/internal/watch/waits.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) // What the holders of an acting part's wait say, heard as the seats' events (design 47 G §266, §269, ADR 0596 §2), never read diff --git a/modules/mesh-delivery-watchman/internal/watch/waits_test.go b/modules/mesh-delivery-watchman/internal/watch/waits_test.go index c9483df0..40bd094f 100644 --- a/modules/mesh-delivery-watchman/internal/watch/waits_test.go +++ b/modules/mesh-delivery-watchman/internal/watch/waits_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" ) func heldWait(module string, since time.Time, from *time.Time) []byte { diff --git a/modules/mesh-delivery-watchman/internal/watch/watch_test.go b/modules/mesh-delivery-watchman/internal/watch/watch_test.go index 20473e2e..3862f84b 100644 --- a/modules/mesh-delivery-watchman/internal/watch/watch_test.go +++ b/modules/mesh-delivery-watchman/internal/watch/watch_test.go @@ -11,8 +11,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" ) type fakeOut struct { diff --git a/modules/mesh-grants/cmd/mesh-grants/integration_test.go b/modules/mesh-grants/cmd/mesh-grants/integration_test.go index 44716ce7..2d4e9f82 100644 --- a/modules/mesh-grants/cmd/mesh-grants/integration_test.go +++ b/modules/mesh-grants/cmd/mesh-grants/integration_test.go @@ -25,8 +25,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/membership" diff --git a/modules/mesh-grants/cmd/mesh-grants/main.go b/modules/mesh-grants/cmd/mesh-grants/main.go index 7d261607..a98c8d64 100644 --- a/modules/mesh-grants/cmd/mesh-grants/main.go +++ b/modules/mesh-grants/cmd/mesh-grants/main.go @@ -37,8 +37,8 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" mcseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/announce" "git.novox.be/novox/mesh-sdk/go/membership" diff --git a/modules/mesh-grants/go.mod b/modules/mesh-grants/go.mod index da5b09e7..828b990b 100644 --- a/modules/mesh-grants/go.mod +++ b/modules/mesh-grants/go.mod @@ -18,13 +18,13 @@ require ( git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-grants/busgrants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats-server/v2 v2.11.17 @@ -47,9 +47,9 @@ require ( require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshselfcheck v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-networking/modules/mesh-connectivity-contracts/go/seats/theprivatenetwork v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-grants/grants_test.go b/modules/mesh-grants/grants_test.go index 6b8dad52..8f722f46 100644 --- a/modules/mesh-grants/grants_test.go +++ b/modules/mesh-grants/grants_test.go @@ -33,9 +33,9 @@ import ( "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault" occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-grants/grantsstate/go.mod b/modules/mesh-grants/grantsstate/go.mod index e44450bc..d6a2f9fd 100644 --- a/modules/mesh-grants/grantsstate/go.mod +++ b/modules/mesh-grants/grantsstate/go.mod @@ -4,20 +4,20 @@ go 1.26.0 require ( git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 ) replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds => ../../mesh-delivery-builder/builds -replace git.novox.be/novox/mesh-delivery/sdk => ../../../sdk +replace git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk => ../../mesh-delivery-sdk require ( - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect github.com/klauspost/compress v1.20.1 // indirect github.com/nats-io/nats.go v1.54.0 // indirect github.com/nats-io/nkeys v0.4.16 // indirect diff --git a/modules/mesh-grants/grantsstate/grants.go b/modules/mesh-grants/grantsstate/grants.go index 4fff716e..417943fe 100644 --- a/modules/mesh-grants/grantsstate/grants.go +++ b/modules/mesh-grants/grantsstate/grants.go @@ -10,7 +10,7 @@ import ( "strings" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-grants/grantsstate/userlist.go b/modules/mesh-grants/grantsstate/userlist.go index e968c7a2..8ad1645b 100644 --- a/modules/mesh-grants/grantsstate/userlist.go +++ b/modules/mesh-grants/grantsstate/userlist.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/sdk/kept" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/kept" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/seal" ) diff --git a/modules/mesh-grants/internal/buscompose/buildbacklog.go b/modules/mesh-grants/internal/buscompose/buildbacklog.go index 80e971e9..ea2b4131 100644 --- a/modules/mesh-grants/internal/buscompose/buildbacklog.go +++ b/modules/mesh-grants/internal/buscompose/buildbacklog.go @@ -1,6 +1,6 @@ package buscompose -import "git.novox.be/novox/mesh-delivery/sdk/buildstep" +import "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" // The view alone reads the build seats' queues (novox/hq ADR 0525 §2, issue 1887 A8a): the shared workers' counts and the // oldest waiting ask, to show the backlog. It may not publish an ask: only the builder and the checker ask, by their seat use. diff --git a/modules/mesh-grants/internal/buscompose/buscompose_test.go b/modules/mesh-grants/internal/buscompose/buscompose_test.go index 880985ac..9a623ad2 100644 --- a/modules/mesh-grants/internal/buscompose/buscompose_test.go +++ b/modules/mesh-grants/internal/buscompose/buscompose_test.go @@ -18,7 +18,7 @@ import ( "git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient" "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/announce" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/seatdef" diff --git a/modules/mesh-grants/internal/grants/catalog.go b/modules/mesh-grants/internal/grants/catalog.go index 0ea3ca40..2852fb10 100644 --- a/modules/mesh-grants/internal/grants/catalog.go +++ b/modules/mesh-grants/internal/grants/catalog.go @@ -7,9 +7,9 @@ import ( "slices" "sync" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-grants/internal/grants/firstviews.go b/modules/mesh-grants/internal/grants/firstviews.go index 16fcb958..8ed61c88 100644 --- a/modules/mesh-grants/internal/grants/firstviews.go +++ b/modules/mesh-grants/internal/grants/firstviews.go @@ -14,8 +14,8 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-grants/internal/grants/grants.go b/modules/mesh-grants/internal/grants/grants.go index 3ec1411e..964e095f 100644 --- a/modules/mesh-grants/internal/grants/grants.go +++ b/modules/mesh-grants/internal/grants/grants.go @@ -9,7 +9,7 @@ import ( occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-grants/internal/grants/inputs.go b/modules/mesh-grants/internal/grants/inputs.go index 23d09e56..251515b1 100644 --- a/modules/mesh-grants/internal/grants/inputs.go +++ b/modules/mesh-grants/internal/grants/inputs.go @@ -27,9 +27,9 @@ import ( "git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient" "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshnodeenroller" "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshwantsclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-grants/internal/grants/rootfree.go b/modules/mesh-grants/internal/grants/rootfree.go index 819c0763..fe38321d 100644 --- a/modules/mesh-grants/internal/grants/rootfree.go +++ b/modules/mesh-grants/internal/grants/rootfree.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "git.novox.be/novox/mesh-contracts/go/seats/meshbroker" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" "slices" "sort" "strings" diff --git a/modules/mesh-grants/internal/grants/tools.go b/modules/mesh-grants/internal/grants/tools.go index a1589f9f..1942cb64 100644 --- a/modules/mesh-grants/internal/grants/tools.go +++ b/modules/mesh-grants/internal/grants/tools.go @@ -8,7 +8,7 @@ import ( "strings" "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-delivery/modules/mesh-grants/grantsstate" "git.novox.be/novox/mesh-sdk/go/membership" "mesh-grants/internal/buscompose" diff --git a/modules/mesh-grants/internal/grants/wantedkeep_test.go b/modules/mesh-grants/internal/grants/wantedkeep_test.go index e8356bbe..d105e08a 100644 --- a/modules/mesh-grants/internal/grants/wantedkeep_test.go +++ b/modules/mesh-grants/internal/grants/wantedkeep_test.go @@ -11,7 +11,7 @@ import ( // Design 47 G A-114 (§693, A-61): the seat mesh-wants' `wanted` stream keeps the last message of each subject with no age // limit, so each want's last word is read whole at a start. func TestWantedKeepsEachWantsLastWordWithNoAgeLimit(t *testing.T) { - raw, err := os.ReadFile(filepath.Join("..", "..", "..", "..", "contracts", "seats", "mesh-wants", "seat.json")) + raw, err := os.ReadFile(filepath.Join("..", "..", "..", "mesh-delivery-contracts", "seats", "mesh-wants", "seat.json")) if err != nil { t.Fatal(err) }