From e4ef67adcdcad6c2bfe11f1b1323209ca5b92a9e 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 --- .../cmd/artifact-store-tools/gone.go | 2 +- .../cmd/artifact-store-tools/holder.go | 8 +++--- .../cmd/artifact-store-tools/holder_test.go | 12 ++++---- .../cmd/artifact-store-tools/listed.go | 4 +-- .../cmd/artifact-store-tools/seat.go | 2 +- .../cmd/artifact-store-tools/store_test.go | 4 +-- .../cmd/artifact-store-tools/sweepseats.go | 6 ++-- modules/artifact-store-tools/go.mod | 16 +++++------ .../cmd/claude-code/catalogfeed.go | 2 +- .../cmd/claude-code/catalogfeed_test.go | 6 ++-- .../cmd/claude-code/insteadof_test.go | 2 +- modules/claude-code/cmd/claude-code/main.go | 2 +- modules/claude-code/go.mod | 6 ++-- .../cmd/distribution-tools/contract.go | 2 +- .../cmd/distribution-tools/contract_test.go | 2 +- .../cmd/distribution-tools/main.go | 4 +-- modules/distribution/go.mod | 14 +++++----- .../internal/holder/holder_test.go | 2 +- modules/distribution/internal/holder/list.go | 2 +- .../distribution/internal/holder/list_test.go | 2 +- .../distribution/internal/holder/reserved.go | 2 +- .../distribution/internal/holder/transfer.go | 2 +- modules/distribution/internal/holder/verbs.go | 2 +- .../distribution/internal/holder/window.go | 2 +- .../gitea/cmd/package-registry/incoming.go | 2 +- modules/gitea/cmd/package-registry/seats.go | 6 ++-- modules/gitea/go.mod | 18 ++++++------ modules/gitea/internal/packageseats/holder.go | 2 +- .../internal/packageseats/holder_test.go | 2 +- .../gitea/internal/packageseats/reserved.go | 2 +- modules/mesh-build-go/buildstep/askrun.go | 4 +-- .../mesh-build-go/buildstep/askrun_test.go | 6 ++-- modules/mesh-build-go/buildstep/capacity.go | 2 +- .../mesh-build-go/buildstep/capacity_cpu.go | 2 +- .../buildstep/conformance/conformance.go | 2 +- .../buildstep/conformance/conformance_test.go | 4 +-- .../buildstep/conformance/leftrunning.go | 4 +-- .../buildstep/digestshape_test.go | 2 +- modules/mesh-build-go/buildstep/fetch.go | 4 +-- modules/mesh-build-go/buildstep/fetch_test.go | 2 +- .../mesh-build-go/buildstep/generated_test.go | 2 +- modules/mesh-build-go/buildstep/go.mod | 26 ++++++++--------- modules/mesh-build-go/buildstep/gotest.go | 2 +- modules/mesh-build-go/buildstep/guard.go | 2 +- modules/mesh-build-go/buildstep/guard_test.go | 2 +- modules/mesh-build-go/buildstep/merge.go | 2 +- .../mesh-build-go/buildstep/narrate_test.go | 4 +-- modules/mesh-build-go/buildstep/narrow.go | 2 +- .../mesh-build-go/buildstep/narrow_test.go | 2 +- modules/mesh-build-go/buildstep/phase.go | 2 +- modules/mesh-build-go/buildstep/publish.go | 20 ++++++------- modules/mesh-build-go/buildstep/pull.go | 4 +-- modules/mesh-build-go/buildstep/pull_bus.go | 2 +- modules/mesh-build-go/buildstep/pull_drop.go | 6 ++-- modules/mesh-build-go/buildstep/pull_fake.go | 2 +- .../buildstep/pull_integration_test.go | 2 +- modules/mesh-build-go/buildstep/pull_seat.go | 2 +- .../mesh-build-go/buildstep/pull_seat_test.go | 4 +-- modules/mesh-build-go/buildstep/pull_test.go | 4 +-- .../buildstep/seat_tools_test.go | 2 +- modules/mesh-build-go/buildstep/step.go | 4 +-- modules/mesh-build-go/buildstep/step_test.go | 4 +-- modules/mesh-build-go/buildstep/steprun.go | 2 +- modules/mesh-build-go/buildstep/steptool.go | 2 +- modules/mesh-build-go/buildstep/tap.go | 2 +- modules/mesh-build-go/buildstep/transport.go | 2 +- modules/mesh-build-go/buildstep/trees.go | 4 +-- .../buildstep/trees_integration_test.go | 2 +- modules/mesh-build-go/buildstep/trees_test.go | 2 +- .../cmd/mesh-build-go/archive.go | 2 +- .../cmd/mesh-build-go/archive_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/asks.go | 6 ++-- .../mesh-build-go/asks_integration_test.go | 2 +- .../cmd/mesh-build-go/asks_test.go | 2 +- .../cmd/mesh-build-go/beside_digest_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/build.go | 4 +-- .../cmd/mesh-build-go/build_test.go | 2 +- .../cmd/mesh-build-go/candidate.go | 2 +- .../cmd/mesh-build-go/candidate_test.go | 2 +- .../cmd/mesh-build-go/compose.go | 6 ++-- .../mesh-build-go/compose_integration_test.go | 6 ++-- .../cmd/mesh-build-go/compose_test.go | 8 +++--- .../mesh-build-go/cmd/mesh-build-go/digest.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/fetch.go | 4 +-- .../cmd/mesh-build-go/fetch_test.go | 4 +-- .../cmd/mesh-build-go/imports.go | 2 +- .../mesh-build-go/installed_toolchain_test.go | 2 +- .../cmd/mesh-build-go/integration.go | 2 +- .../mesh-build-go/integration_level_test.go | 2 +- .../cmd/mesh-build-go/isolate.go | 2 +- .../cmd/mesh-build-go/isolate_test.go | 2 +- .../cmd/mesh-build-go/keptbuilds.go | 6 ++-- .../cmd/mesh-build-go/keptbuilds_test.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/keys.go | 2 +- .../cmd/mesh-build-go/kit_test.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/level.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/levels.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/lint.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/main.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/mirror.go | 2 +- .../cmd/mesh-build-go/mirror_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/module.go | 4 +-- .../cmd/mesh-build-go/module_test.go | 2 +- .../mesh-build-go/narrow_integration_test.go | 2 +- .../cmd/mesh-build-go/needtools_test.go | 2 +- .../cmd/mesh-build-go/node_toolchains_test.go | 2 +- .../cmd/mesh-build-go/packages_shape_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/pins.go | 4 +-- .../mesh-build-go/pins_integration_test.go | 2 +- .../cmd/mesh-build-go/pins_test.go | 2 +- .../mesh-build-go/preview_integration_test.go | 2 +- .../cmd/mesh-build-go/preview_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/probe.go | 2 +- .../cmd/mesh-build-go/publish_test.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/read.go | 2 +- .../cmd/mesh-build-go/read_test.go | 2 +- .../cmd/mesh-build-go/room_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/run.go | 4 +-- .../cmd/mesh-build-go/run_integration_test.go | 6 ++-- .../cmd/mesh-build-go/run_test.go | 8 +++--- .../mesh-build-go/cmd/mesh-build-go/runner.go | 2 +- .../cmd/mesh-build-go/selected_dirs_test.go | 2 +- .../mesh-build-go/cmd/mesh-build-go/steps.go | 4 +-- .../mesh-build-go/store_integration_test.go | 4 +-- .../mesh-build-go/cmd/mesh-build-go/test.go | 2 +- .../cmd/mesh-build-go/test_test.go | 2 +- .../cmd/mesh-build-go/versions.go | 2 +- .../cmd/mesh-build-go/versions_test.go | 2 +- .../cmd/mesh-build-go/xz_test.go | 2 +- modules/mesh-build-go/go.mod | 28 +++++++++---------- .../cmd/mesh-build-image/asks.go | 6 ++-- .../cmd/mesh-build-image/asks_test.go | 2 +- .../cmd/mesh-build-image/build_test.go | 2 +- .../mesh-build-image/bus_integration_test.go | 2 +- .../cmd/mesh-build-image/capture_test.go | 2 +- .../cmd/mesh-build-image/copy.go | 4 +-- .../cmd/mesh-build-image/copy_test.go | 4 +-- .../cmd/mesh-build-image/fetch.go | 2 +- .../cmd/mesh-build-image/fetch_test.go | 2 +- .../cmd/mesh-build-image/helpers_test.go | 4 +-- .../cmd/mesh-build-image/integration_test.go | 2 +- .../cmd/mesh-build-image/keptartifact.go | 4 +-- .../cmd/mesh-build-image/keys.go | 2 +- .../cmd/mesh-build-image/kit_test.go | 4 +-- .../cmd/mesh-build-image/main.go | 6 ++-- .../cmd/mesh-build-image/module.go | 4 +-- .../cmd/mesh-build-image/module_test.go | 2 +- .../cmd/mesh-build-image/publish.go | 4 +-- .../cmd/mesh-build-image/publish_test.go | 4 +-- .../cmd/mesh-build-image/read.go | 2 +- .../cmd/mesh-build-image/read_test.go | 2 +- .../cmd/mesh-build-image/room_test.go | 2 +- .../cmd/mesh-build-image/runner.go | 2 +- .../cmd/mesh-build-image/steps.go | 2 +- modules/mesh-build-image/go.mod | 26 ++++++++--------- .../cmd/mesh-build-node/asks.go | 6 ++-- .../cmd/mesh-build-node/asks_test.go | 2 +- .../cmd/mesh-build-node/build.go | 4 +-- .../cmd/mesh-build-node/build_test.go | 2 +- .../cmd/mesh-build-node/check.go | 2 +- .../cmd/mesh-build-node/fetch.go | 4 +-- .../cmd/mesh-build-node/fetch_test.go | 2 +- .../cmd/mesh-build-node/isolate.go | 2 +- .../cmd/mesh-build-node/keptartifact.go | 4 +-- .../cmd/mesh-build-node/keys.go | 2 +- .../cmd/mesh-build-node/kit_test.go | 4 +-- .../cmd/mesh-build-node/main.go | 6 ++-- .../cmd/mesh-build-node/module.go | 4 +-- .../cmd/mesh-build-node/module_test.go | 2 +- .../cmd/mesh-build-node/push_test.go | 4 +-- .../cmd/mesh-build-node/read.go | 2 +- .../cmd/mesh-build-node/read_test.go | 2 +- .../cmd/mesh-build-node/room_test.go | 2 +- .../cmd/mesh-build-node/steps.go | 4 +-- .../mesh-build-node/store_integration_test.go | 4 +-- .../cmd/mesh-build-node/toolchain_test.go | 2 +- modules/mesh-build-node/go.mod | 26 ++++++++--------- .../cmd/mesh-conditions/branches.go | 4 +-- .../cmd/mesh-conditions/branches_test.go | 2 +- .../cmd/mesh-conditions/catalog.go | 4 +-- .../cmd/mesh-conditions/hold.go | 2 +- .../cmd/mesh-conditions/hold_test.go | 2 +- .../cmd/mesh-conditions/keeper.go | 2 +- .../cmd/mesh-conditions/keeper_test.go | 4 +-- .../cmd/mesh-conditions/main.go | 8 +++--- modules/mesh-conditions/go.mod | 8 +++--- .../cmd/mesh-config/catalogfeed.go | 4 +-- .../cmd/mesh-config/catalogfeed_test.go | 6 ++-- .../cmd/mesh-config/config_test.go | 4 +-- modules/mesh-config/cmd/mesh-config/main.go | 2 +- .../cmd/mesh-config/manifest_test.go | 2 +- .../mesh-config/cmd/mesh-config/ownerviews.go | 2 +- .../mesh-config/cmd/mesh-config/readers.go | 2 +- .../mesh-config/cmd/mesh-config/sources.go | 4 +-- .../mesh-config/cmd/mesh-config/takeover.go | 2 +- .../cmd/mesh-config/takeover_test.go | 2 +- .../cmd/mesh-config/whole_integration_test.go | 6 ++-- modules/mesh-config/go.mod | 16 +++++------ .../cmd/mesh-delivery-gate/catalogue_test.go | 2 +- .../cmd/mesh-delivery-gate/findings.go | 2 +- .../cmd/mesh-delivery-gate/findings_test.go | 2 +- .../cmd/mesh-delivery-gate/merges.go | 4 +-- .../cmd/mesh-delivery-gate/owed.go | 4 +-- .../cmd/mesh-delivery-gate/owedacts.go | 2 +- .../cmd/mesh-delivery-gate/owedacts_test.go | 2 +- .../cmd/mesh-delivery-gate/owedended.go | 2 +- .../cmd/mesh-delivery-gate/record.go | 2 +- .../cmd/mesh-delivery-gate/record_test.go | 2 +- .../cmd/mesh-delivery-gate/recordevents.go | 2 +- .../cmd/mesh-delivery-gate/recordfill.go | 2 +- .../cmd/mesh-delivery-gate/recovery.go | 2 +- .../cmd/mesh-delivery-gate/switch.go | 4 +-- .../cmd/mesh-delivery-gate/takenin.go | 6 ++-- .../mesh-delivery-gate/takenin_bus_test.go | 2 +- .../cmd/mesh-delivery-gate/values.go | 4 +-- .../cmd/mesh-delivery-gate/values_test.go | 2 +- .../cmd/mesh-delivery-gate/verbs.go | 2 +- modules/mesh-delivery-gate/go.mod | 22 +++++++-------- .../cmd/mesh-provisioner/catalogfake_test.go | 4 +-- .../cmd/mesh-provisioner/catalogfeed.go | 4 +-- .../cmd/mesh-provisioner/catalogfeed_test.go | 6 ++-- .../cmd/mesh-provisioner/composed_test.go | 2 +- .../cmd/mesh-provisioner/holder.go | 4 +-- .../cmd/mesh-provisioner/main.go | 2 +- .../cmd/mesh-provisioner/provisioner_test.go | 2 +- .../cmd/mesh-provisioner/readers.go | 2 +- modules/mesh-provisioner/go.mod | 16 +++++------ .../mesh-recovery/cmd/mesh-recovery/seats.go | 2 +- modules/mesh-recovery/go.mod | 2 +- .../cmd/mesh-self-check/catalogfeed.go | 4 +-- .../cmd/mesh-self-check/catalogfeed_test.go | 6 ++-- .../cmd/mesh-self-check/main.go | 2 +- .../cmd/mesh-self-check/probes_test.go | 2 +- .../cmd/mesh-self-check/selfcheck_test.go | 2 +- modules/mesh-self-check/go.mod | 6 ++-- modules/mesh-vault/go.mod | 12 ++++---- modules/nats/cmd/nats-tools/catalogview.go | 2 +- .../nats/cmd/nats-tools/catalogview_test.go | 2 +- modules/nats/cmd/nats-tools/keep.go | 2 +- modules/nats/go.mod | 2 +- modules/ssh-client/go.mod | 2 +- modules/ssh-client/sshkeys/go.mod | 2 +- modules/ssh-client/sshkeys/keeper.go | 2 +- 243 files changed, 470 insertions(+), 470 deletions(-) diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/gone.go b/modules/artifact-store-tools/cmd/artifact-store-tools/gone.go index cca4a96df..36cd52286 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/gone.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/gone.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - 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" ) // The holders whose states this module reads, one constant each (a reader names its holder once; ADR 0634 §4). diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/holder.go b/modules/artifact-store-tools/cmd/artifact-store-tools/holder.go index 309d4248a..3490e8f4f 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/holder.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/holder.go @@ -20,10 +20,10 @@ import ( "fmt" engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + catalogclient "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" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "sort" "strings" "sync" @@ -31,7 +31,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" meshconditions "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/holder_test.go b/modules/artifact-store-tools/cmd/artifact-store-tools/holder_test.go index 0c1a05d98..72374209f 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/holder_test.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/holder_test.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + catalogclient "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" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "slices" "sort" "strings" @@ -22,9 +22,9 @@ import ( stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + ociseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" ) // memBus is the holder's bus in memory: states by name, each key's history, and what was published. diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/listed.go b/modules/artifact-store-tools/cmd/artifact-store-tools/listed.go index 062427320..e83e881ea 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/listed.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/listed.go @@ -11,9 +11,9 @@ import ( "fmt" "sort" - ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + ociseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // Repo is one repository as the seats' list answers it. diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/seat.go b/modules/artifact-store-tools/cmd/artifact-store-tools/seat.go index 67d33e2c2..53b89085d 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/seat.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/seat.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - 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" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/store_test.go b/modules/artifact-store-tools/cmd/artifact-store-tools/store_test.go index e7e183262..3af7f16e7 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/store_test.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/store_test.go @@ -1,8 +1,8 @@ package main import ( - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - sweep "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/seatlist/seatlisttest" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/artifact-store-tools/cmd/artifact-store-tools/sweepseats.go b/modules/artifact-store-tools/cmd/artifact-store-tools/sweepseats.go index b106f1cf7..538783e31 100644 --- a/modules/artifact-store-tools/cmd/artifact-store-tools/sweepseats.go +++ b/modules/artifact-store-tools/cmd/artifact-store-tools/sweepseats.go @@ -16,12 +16,12 @@ import ( "strings" meshconditions "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + ociseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/ociartifactregistry" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // SweepRefused is the sweep's finding: a seat refused a hold or a remove the sweep asked. diff --git a/modules/artifact-store-tools/go.mod b/modules/artifact-store-tools/go.mod index 8b71604f0..055e1fbc4 100644 --- a/modules/artifact-store-tools/go.mod +++ b/modules/artifact-store-tools/go.mod @@ -8,13 +8,13 @@ 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-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient 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/seats/containerimageregistry v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/seats/meshartifactsweep 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/meshwants 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/containerimageregistryclient 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/seats/containerimageregistry v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep 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/meshwants 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-sdk/go v0.0.0-00010101000000-000000000000 github.com/nats-io/nats.go v1.54.0 @@ -34,4 +34,4 @@ require ( golang.org/x/time v0.16.0 // indirect ) -require git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 // indirect +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 // indirect diff --git a/modules/claude-code/cmd/claude-code/catalogfeed.go b/modules/claude-code/cmd/claude-code/catalogfeed.go index cd4114c5f..9bc070e5c 100644 --- a/modules/claude-code/cmd/claude-code/catalogfeed.go +++ b/modules/claude-code/cmd/claude-code/catalogfeed.go @@ -6,7 +6,7 @@ package main // `manifests`. import ( - 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" ) // CatalogHalf is what this module reads of the catalog half. diff --git a/modules/claude-code/cmd/claude-code/catalogfeed_test.go b/modules/claude-code/cmd/claude-code/catalogfeed_test.go index 6597f6693..6c1edee7e 100644 --- a/modules/claude-code/cmd/claude-code/catalogfeed_test.go +++ b/modules/claude-code/cmd/claude-code/catalogfeed_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/claude-code/cmd/claude-code/insteadof_test.go b/modules/claude-code/cmd/claude-code/insteadof_test.go index eeec9e608..a403dddf0 100644 --- a/modules/claude-code/cmd/claude-code/insteadof_test.go +++ b/modules/claude-code/cmd/claude-code/insteadof_test.go @@ -13,7 +13,7 @@ import ( assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" mesh "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - 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" "git.novox.be/novox/mesh-sdk/go/seatdef" "git.novox.be/novox/mesh-sdk/go/seatlist" diff --git a/modules/claude-code/cmd/claude-code/main.go b/modules/claude-code/cmd/claude-code/main.go index 6243323be..407b94b61 100644 --- a/modules/claude-code/cmd/claude-code/main.go +++ b/modules/claude-code/cmd/claude-code/main.go @@ -26,7 +26,7 @@ import ( condseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" 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" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/seatlist" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/claude-code/go.mod b/modules/claude-code/go.mod index 0995e6e52..b8a6dad8c 100644 --- a/modules/claude-code/go.mod +++ b/modules/claude-code/go.mod @@ -10,8 +10,8 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient 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/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/seats/meshcatalog v0.0.0-00010101000000-000000000000 gopkg.in/yaml.v3 v3.0.1 ) @@ -29,4 +29,4 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhandacts v0.0.0-00010101000000-000000000000 // indirect ) -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 diff --git a/modules/distribution/cmd/distribution-tools/contract.go b/modules/distribution/cmd/distribution-tools/contract.go index c16ada558..4fe26822a 100644 --- a/modules/distribution/cmd/distribution-tools/contract.go +++ b/modules/distribution/cmd/distribution-tools/contract.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" "distribution/internal/holder" ) diff --git a/modules/distribution/cmd/distribution-tools/contract_test.go b/modules/distribution/cmd/distribution-tools/contract_test.go index 7bd5c1e22..f6c1f3df1 100644 --- a/modules/distribution/cmd/distribution-tools/contract_test.go +++ b/modules/distribution/cmd/distribution-tools/contract_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" "distribution/internal/holder" ) diff --git a/modules/distribution/cmd/distribution-tools/main.go b/modules/distribution/cmd/distribution-tools/main.go index 352dea76f..57d02f016 100644 --- a/modules/distribution/cmd/distribution-tools/main.go +++ b/modules/distribution/cmd/distribution-tools/main.go @@ -20,8 +20,8 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" meshconditions "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/distribution/go.mod b/modules/distribution/go.mod index d5b6b1f8d..54e2485b1 100644 --- a/modules/distribution/go.mod +++ b/modules/distribution/go.mod @@ -5,10 +5,10 @@ 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-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 - 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/meshbuilds 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/meshbuilds 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 ) @@ -29,7 +29,7 @@ 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-delivery/contracts/go/clients/meshcatalogclient 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/meshcatalogclient 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 ) diff --git a/modules/distribution/internal/holder/holder_test.go b/modules/distribution/internal/holder/holder_test.go index 615fc0ff4..5acaef85a 100644 --- a/modules/distribution/internal/holder/holder_test.go +++ b/modules/distribution/internal/holder/holder_test.go @@ -17,7 +17,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" ) type memObjects map[string][]byte diff --git a/modules/distribution/internal/holder/list.go b/modules/distribution/internal/holder/list.go index 9361c35df..7e1780cc1 100644 --- a/modules/distribution/internal/holder/list.go +++ b/modules/distribution/internal/holder/list.go @@ -13,7 +13,7 @@ import ( "fmt" "sort" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // VerbList is the seats' verb list. diff --git a/modules/distribution/internal/holder/list_test.go b/modules/distribution/internal/holder/list_test.go index a29eaf391..cb5239a6c 100644 --- a/modules/distribution/internal/holder/list_test.go +++ b/modules/distribution/internal/holder/list_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // dg is a digest made from a short name, so a test reads as names. diff --git a/modules/distribution/internal/holder/reserved.go b/modules/distribution/internal/holder/reserved.go index 89ebd9ae2..b649431d5 100644 --- a/modules/distribution/internal/holder/reserved.go +++ b/modules/distribution/internal/holder/reserved.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // Reserved is the holder's check of a publish against the builder's reservation (novox/hq design 47 §381, §478, §504): it asks the diff --git a/modules/distribution/internal/holder/transfer.go b/modules/distribution/internal/holder/transfer.go index e07812af9..960890786 100644 --- a/modules/distribution/internal/holder/transfer.go +++ b/modules/distribution/internal/holder/transfer.go @@ -10,7 +10,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/sdk/parts" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The bounds of incoming (design 51 *Publishing*, ADR 0611): a part is at most 1 MiB, a transfer with no part for 24 diff --git a/modules/distribution/internal/holder/verbs.go b/modules/distribution/internal/holder/verbs.go index bf4b5f0b6..bf27e37d5 100644 --- a/modules/distribution/internal/holder/verbs.go +++ b/modules/distribution/internal/holder/verbs.go @@ -10,7 +10,7 @@ import ( "strings" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // Catalog is what the store answers of what it holds. diff --git a/modules/distribution/internal/holder/window.go b/modules/distribution/internal/holder/window.go index 4ba0971e8..785b29646 100644 --- a/modules/distribution/internal/holder/window.go +++ b/modules/distribution/internal/holder/window.go @@ -3,7 +3,7 @@ package holder import ( "fmt" - "git.novox.be/novox/mesh-delivery/sdk/window" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/window" "slices" "sort" "time" diff --git a/modules/gitea/cmd/package-registry/incoming.go b/modules/gitea/cmd/package-registry/incoming.go index fb0984bde..ce8add7b7 100644 --- a/modules/gitea/cmd/package-registry/incoming.go +++ b/modules/gitea/cmd/package-registry/incoming.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "git.novox.be/novox/mesh-delivery/sdk/parts" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" stdio "git.novox.be/novox/mesh-sdk/go" "gitea/internal/packageseats" diff --git a/modules/gitea/cmd/package-registry/seats.go b/modules/gitea/cmd/package-registry/seats.go index 336e473c7..246da7580 100644 --- a/modules/gitea/cmd/package-registry/seats.go +++ b/modules/gitea/cmd/package-registry/seats.go @@ -26,9 +26,9 @@ import ( "strings" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - goreg "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - npmreg "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - "git.novox.be/novox/mesh-delivery/sdk/parts" + goreg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + npmreg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" stdio "git.novox.be/novox/mesh-sdk/go" "gitea/internal/packageseats" diff --git a/modules/gitea/go.mod b/modules/gitea/go.mod index 11e94c655..c1b3a1ce4 100644 --- a/modules/gitea/go.mod +++ b/modules/gitea/go.mod @@ -6,10 +6,10 @@ 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-contracts/provisioning/go/clients/meshprovisionerclient 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/meshbuilds 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/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-contracts/go/seats/meshbuilds 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 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 @@ -30,9 +30,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-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 ) diff --git a/modules/gitea/internal/packageseats/holder.go b/modules/gitea/internal/packageseats/holder.go index 10f05af16..f16b8a8f3 100644 --- a/modules/gitea/internal/packageseats/holder.go +++ b/modules/gitea/internal/packageseats/holder.go @@ -13,7 +13,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/sdk/parts" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) // The seats the forge module holds. diff --git a/modules/gitea/internal/packageseats/holder_test.go b/modules/gitea/internal/packageseats/holder_test.go index 029810f47..9fd27c9b2 100644 --- a/modules/gitea/internal/packageseats/holder_test.go +++ b/modules/gitea/internal/packageseats/holder_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/sdk/parts" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/parts" ) type memObjects map[string][]byte diff --git a/modules/gitea/internal/packageseats/reserved.go b/modules/gitea/internal/packageseats/reserved.go index ef5228a84..15da4fad9 100644 --- a/modules/gitea/internal/packageseats/reserved.go +++ b/modules/gitea/internal/packageseats/reserved.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshbuilds" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds" ) // Reserved is the holder's check of a publish against the builder's reservation (novox/hq design 47 §381, §478, §504): it asks the diff --git a/modules/mesh-build-go/buildstep/askrun.go b/modules/mesh-build-go/buildstep/askrun.go index 49859b27a..4bcb19ae7 100644 --- a/modules/mesh-build-go/buildstep/askrun.go +++ b/modules/mesh-build-go/buildstep/askrun.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + trunk "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // **One ask, one whole job** (novox/hq ADR 0525 §3). A build module runs a pulled ask with its own step tools' bodies, diff --git a/modules/mesh-build-go/buildstep/askrun_test.go b/modules/mesh-build-go/buildstep/askrun_test.go index 173813ff0..a8fbed2b2 100644 --- a/modules/mesh-build-go/buildstep/askrun_test.go +++ b/modules/mesh-build-go/buildstep/askrun_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - nodebuildnode "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + nodebuildnode "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) const runCommit = "0123456789abcdef0123456789abcdef01234567" diff --git a/modules/mesh-build-go/buildstep/capacity.go b/modules/mesh-build-go/buildstep/capacity.go index 14fa874d0..0552bdbd2 100644 --- a/modules/mesh-build-go/buildstep/capacity.go +++ b/modules/mesh-build-go/buildstep/capacity.go @@ -1,7 +1,7 @@ package buildstep import ( - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "encoding/json" "fmt" diff --git a/modules/mesh-build-go/buildstep/capacity_cpu.go b/modules/mesh-build-go/buildstep/capacity_cpu.go index ff9e3c829..61f2c1356 100644 --- a/modules/mesh-build-go/buildstep/capacity_cpu.go +++ b/modules/mesh-build-go/buildstep/capacity_cpu.go @@ -10,7 +10,7 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/buildcpu" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **A build seat's capacity follows the CPU its node gives builds** (issue 1806's follow-up; issue 1890, 2026-10-26 diff --git a/modules/mesh-build-go/buildstep/conformance/conformance.go b/modules/mesh-build-go/buildstep/conformance/conformance.go index 2a5225416..f04eadbbe 100644 --- a/modules/mesh-build-go/buildstep/conformance/conformance.go +++ b/modules/mesh-build-go/buildstep/conformance/conformance.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "git.novox.be/novox/mesh-delivery/sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The runners the kit holds output of. diff --git a/modules/mesh-build-go/buildstep/conformance/conformance_test.go b/modules/mesh-build-go/buildstep/conformance/conformance_test.go index 06ab998b6..f9acdf774 100644 --- a/modules/mesh-build-go/buildstep/conformance/conformance_test.go +++ b/modules/mesh-build-go/buildstep/conformance/conformance_test.go @@ -9,8 +9,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The failure contract (issue 1901): the SDK's own parsers keep it on every captured case of the kit (1901/AC6); the diff --git a/modules/mesh-build-go/buildstep/conformance/leftrunning.go b/modules/mesh-build-go/buildstep/conformance/leftrunning.go index 5e5bfa303..50c58f90b 100644 --- a/modules/mesh-build-go/buildstep/conformance/leftrunning.go +++ b/modules/mesh-build-go/buildstep/conformance/leftrunning.go @@ -10,8 +10,8 @@ import ( "testing" "time" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/digestshape_test.go b/modules/mesh-build-go/buildstep/digestshape_test.go index af9511d0d..55807bbf0 100644 --- a/modules/mesh-build-go/buildstep/digestshape_test.go +++ b/modules/mesh-build-go/buildstep/digestshape_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // credentialField is the node runtime's rule for a state value (mesh-tools node-tools/internal/bus/state.go, novox/hq diff --git a/modules/mesh-build-go/buildstep/fetch.go b/modules/mesh-build-go/buildstep/fetch.go index fb8d53a6f..4c74474cb 100644 --- a/modules/mesh-build-go/buildstep/fetch.go +++ b/modules/mesh-build-go/buildstep/fetch.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/buildstep/fetch_test.go b/modules/mesh-build-go/buildstep/fetch_test.go index eb2b916c1..3b00f19de 100644 --- a/modules/mesh-build-go/buildstep/fetch_test.go +++ b/modules/mesh-build-go/buildstep/fetch_test.go @@ -2,7 +2,7 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "strings" "testing" diff --git a/modules/mesh-build-go/buildstep/generated_test.go b/modules/mesh-build-go/buildstep/generated_test.go index a1eb3efcf..e77906136 100644 --- a/modules/mesh-build-go/buildstep/generated_test.go +++ b/modules/mesh-build-go/buildstep/generated_test.go @@ -11,7 +11,7 @@ import ( "testing" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/seatgen" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // contracts writes a contracts module of one seat, its generated files as the generator writes them, and answers its diff --git a/modules/mesh-build-go/buildstep/go.mod b/modules/mesh-build-go/buildstep/go.mod index 77b28476c..6739d8699 100644 --- a/modules/mesh-build-go/buildstep/go.mod +++ b/modules/mesh-build-go/buildstep/go.mod @@ -4,18 +4,18 @@ go 1.26.0 require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/ociartifactregistryclient 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/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/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/containerimageregistryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000 + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient 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/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/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/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 github.com/nats-io/nats.go v1.54.0 ) @@ -35,6 +35,6 @@ require ( ) require ( - 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/meshcatalog 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/meshcatalog v0.0.0-00010101000000-000000000000 // indirect ) diff --git a/modules/mesh-build-go/buildstep/gotest.go b/modules/mesh-build-go/buildstep/gotest.go index 9c15d72c2..a75f59b35 100644 --- a/modules/mesh-build-go/buildstep/gotest.go +++ b/modules/mesh-build-go/buildstep/gotest.go @@ -8,7 +8,7 @@ import ( "bufio" "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "regexp" "slices" "strings" diff --git a/modules/mesh-build-go/buildstep/guard.go b/modules/mesh-build-go/buildstep/guard.go index 59f844c9b..84bd05f5d 100644 --- a/modules/mesh-build-go/buildstep/guard.go +++ b/modules/mesh-build-go/buildstep/guard.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Guard is a build module's check that the toolchain installed on its node is the one its recipe builds with diff --git a/modules/mesh-build-go/buildstep/guard_test.go b/modules/mesh-build-go/buildstep/guard_test.go index fe8bad19e..e39e7149c 100644 --- a/modules/mesh-build-go/buildstep/guard_test.go +++ b/modules/mesh-build-go/buildstep/guard_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) type toolchainKeys map[string]sdkstep.Toolchain diff --git a/modules/mesh-build-go/buildstep/merge.go b/modules/mesh-build-go/buildstep/merge.go index 93fb6b6f9..35819aaed 100644 --- a/modules/mesh-build-go/buildstep/merge.go +++ b/modules/mesh-build-go/buildstep/merge.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/buildstep/narrate_test.go b/modules/mesh-build-go/buildstep/narrate_test.go index 5b27e9b60..e15a6fbdb 100644 --- a/modules/mesh-build-go/buildstep/narrate_test.go +++ b/modules/mesh-build-go/buildstep/narrate_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // CAT-NR1: a build's publish on a seat says asked, waiting on the seat (on every tick of NarrateEvery while the holder diff --git a/modules/mesh-build-go/buildstep/narrow.go b/modules/mesh-build-go/buildstep/narrow.go index 02066491f..80e5d6426 100644 --- a/modules/mesh-build-go/buildstep/narrow.go +++ b/modules/mesh-build-go/buildstep/narrow.go @@ -2,7 +2,7 @@ package buildstep import ( "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "os" "path" "path/filepath" diff --git a/modules/mesh-build-go/buildstep/narrow_test.go b/modules/mesh-build-go/buildstep/narrow_test.go index 621debfbc..001163e43 100644 --- a/modules/mesh-build-go/buildstep/narrow_test.go +++ b/modules/mesh-build-go/buildstep/narrow_test.go @@ -1,7 +1,7 @@ package buildstep import ( - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "os" "path/filepath" "sort" diff --git a/modules/mesh-build-go/buildstep/phase.go b/modules/mesh-build-go/buildstep/phase.go index ffb0168fc..89b8a6bd1 100644 --- a/modules/mesh-build-go/buildstep/phase.go +++ b/modules/mesh-build-go/buildstep/phase.go @@ -6,7 +6,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **A running ask says its phases** (issue 1890, 2026-10-26 19:09: a mesh-catalog try's step on the workstation ran 30 minutes diff --git a/modules/mesh-build-go/buildstep/publish.go b/modules/mesh-build-go/buildstep/publish.go index a83de94df..9ce5d8334 100644 --- a/modules/mesh-build-go/buildstep/publish.go +++ b/modules/mesh-build-go/buildstep/publish.go @@ -16,16 +16,16 @@ import ( "strings" assigner "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - imageclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient" - goclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient" - npmclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient" - ociclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/ociartifactregistryclient" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - goseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry" - npmseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry" - ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/parts" + imageclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient" + goclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/gopackageregistryclient" + npmclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/npmpackageregistryclient" + ociclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/ociartifactregistryclient" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + goseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/gopackageregistry" + npmseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry" + ociseat "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-delivery/modules/mesh-delivery-sdk/parts" ) // The registry seats a build module publishes on. diff --git a/modules/mesh-build-go/buildstep/pull.go b/modules/mesh-build-go/buildstep/pull.go index d9bec6b3e..35447e9af 100644 --- a/modules/mesh-build-go/buildstep/pull.go +++ b/modules/mesh-build-go/buildstep/pull.go @@ -10,8 +10,8 @@ import ( "sync" "time" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_bus.go b/modules/mesh-build-go/buildstep/pull_bus.go index 20c0528be..7a35ed627 100644 --- a/modules/mesh-build-go/buildstep/pull_bus.go +++ b/modules/mesh-build-go/buildstep/pull_bus.go @@ -6,7 +6,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "github.com/nats-io/nats.go/jetstream" ) diff --git a/modules/mesh-build-go/buildstep/pull_drop.go b/modules/mesh-build-go/buildstep/pull_drop.go index 6ec70787d..654d1c561 100644 --- a/modules/mesh-build-go/buildstep/pull_drop.go +++ b/modules/mesh-build-go/buildstep/pull_drop.go @@ -8,9 +8,9 @@ import ( "strings" "time" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + nodebuildgo "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_fake.go b/modules/mesh-build-go/buildstep/pull_fake.go index 84ed06d18..55ef7c524 100644 --- a/modules/mesh-build-go/buildstep/pull_fake.go +++ b/modules/mesh-build-go/buildstep/pull_fake.go @@ -5,7 +5,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // FakeAsks is a test double of a seat's workers for the build modules' unit tests: Publish puts an ask on a kind's diff --git a/modules/mesh-build-go/buildstep/pull_integration_test.go b/modules/mesh-build-go/buildstep/pull_integration_test.go index d6f043a6f..a05430df2 100644 --- a/modules/mesh-build-go/buildstep/pull_integration_test.go +++ b/modules/mesh-build-go/buildstep/pull_integration_test.go @@ -13,7 +13,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" - 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/testbus" ) diff --git a/modules/mesh-build-go/buildstep/pull_seat.go b/modules/mesh-build-go/buildstep/pull_seat.go index 105f410c3..7b7bb088b 100644 --- a/modules/mesh-build-go/buildstep/pull_seat.go +++ b/modules/mesh-build-go/buildstep/pull_seat.go @@ -4,7 +4,7 @@ import ( "context" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_seat_test.go b/modules/mesh-build-go/buildstep/pull_seat_test.go index 01ab907a5..61ef55a45 100644 --- a/modules/mesh-build-go/buildstep/pull_seat_test.go +++ b/modules/mesh-build-go/buildstep/pull_seat_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - nodebuildgo "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + nodebuildgo "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" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_test.go b/modules/mesh-build-go/buildstep/pull_test.go index d30cd77c4..ede29462f 100644 --- a/modules/mesh-build-go/buildstep/pull_test.go +++ b/modules/mesh-build-go/buildstep/pull_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/seat_tools_test.go b/modules/mesh-build-go/buildstep/seat_tools_test.go index 5d04a5862..662d309e7 100644 --- a/modules/mesh-build-go/buildstep/seat_tools_test.go +++ b/modules/mesh-build-go/buildstep/seat_tools_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1887/A9a, ADR 0525 §10: a build seat's verbs are .current, .pause and .resume; current names the ask running, diff --git a/modules/mesh-build-go/buildstep/step.go b/modules/mesh-build-go/buildstep/step.go index 47403fdfb..3722473ff 100644 --- a/modules/mesh-build-go/buildstep/step.go +++ b/modules/mesh-build-go/buildstep/step.go @@ -12,8 +12,8 @@ import ( "log" "time" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Put writes one key of a state: the steps state.Put's shape (go/state.go). diff --git a/modules/mesh-build-go/buildstep/step_test.go b/modules/mesh-build-go/buildstep/step_test.go index a2a19cd2c..066f80780 100644 --- a/modules/mesh-build-go/buildstep/step_test.go +++ b/modules/mesh-build-go/buildstep/step_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "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/modules/mesh-build-go/buildstep/steprun.go b/modules/mesh-build-go/buildstep/steprun.go index 3549c170b..1b5473c7d 100644 --- a/modules/mesh-build-go/buildstep/steprun.go +++ b/modules/mesh-build-go/buildstep/steprun.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // **A pipeline step, run and said** (novox/hq ADR 0666 §7, §8, §17, §21; design 47 *Pipeline steps and the policy*, diff --git a/modules/mesh-build-go/buildstep/steptool.go b/modules/mesh-build-go/buildstep/steptool.go index 92e8eef02..a1978624e 100644 --- a/modules/mesh-build-go/buildstep/steptool.go +++ b/modules/mesh-build-go/buildstep/steptool.go @@ -1,7 +1,7 @@ package buildstep import ( - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/tap.go b/modules/mesh-build-go/buildstep/tap.go index 2c3d5e488..d684e1a37 100644 --- a/modules/mesh-build-go/buildstep/tap.go +++ b/modules/mesh-build-go/buildstep/tap.go @@ -5,7 +5,7 @@ package buildstep // earlier file, which is what node's default reporter left the first fifteen lines of. import ( - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "regexp" "strings" ) diff --git a/modules/mesh-build-go/buildstep/transport.go b/modules/mesh-build-go/buildstep/transport.go index c5610fa5f..785e81362 100644 --- a/modules/mesh-build-go/buildstep/transport.go +++ b/modules/mesh-build-go/buildstep/transport.go @@ -1,6 +1,6 @@ package buildstep -import sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" +import sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" // Transport is err as a sdkstep.Passing when its words are those of a network that did not answer (a lookup, a timeout, a // reset connection; sdkstep.PassingCause), so the build module's ask is given again after a delay instead of failing diff --git a/modules/mesh-build-go/buildstep/trees.go b/modules/mesh-build-go/buildstep/trees.go index 1b9b0b910..141ea7998 100644 --- a/modules/mesh-build-go/buildstep/trees.go +++ b/modules/mesh-build-go/buildstep/trees.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/buildstep/trees_integration_test.go b/modules/mesh-build-go/buildstep/trees_integration_test.go index 0cbc52f6b..10b68a77b 100644 --- a/modules/mesh-build-go/buildstep/trees_integration_test.go +++ b/modules/mesh-build-go/buildstep/trees_integration_test.go @@ -4,7 +4,7 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "reflect" "strings" "testing" diff --git a/modules/mesh-build-go/buildstep/trees_test.go b/modules/mesh-build-go/buildstep/trees_test.go index 6b83536cf..6fe002eb2 100644 --- a/modules/mesh-build-go/buildstep/trees_test.go +++ b/modules/mesh-build-go/buildstep/trees_test.go @@ -4,7 +4,7 @@ import ( "context" "crypto/sha256" "encoding/hex" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "os" "path/filepath" "reflect" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/archive.go b/modules/mesh-build-go/cmd/mesh-build-go/archive.go index 819b6b839..0fc973868 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/archive.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/archive.go @@ -24,7 +24,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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" "github.com/therootcompany/xz" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go b/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go index e4752429c..e7506cba0 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Issue 1589: the build step packs an archive artifact (novox/hq ADR 0478 §1), as the build agent packs it diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks.go b/modules/mesh-build-go/cmd/mesh-build-go/asks.go index b49bd7d1b..6f57b0ee4 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks.go @@ -6,9 +6,9 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go index 6272dbfb8..402177bf1 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go @@ -12,7 +12,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/testbus" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go b/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go index d72afeaab..aefd332d7 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go @@ -12,7 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) const askCommit = "0123456789abcdef0123456789abcdef01234567" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go b/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go index 0bd255931..026a8f414 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // writeSiblings records the siblings the fetch placed, as the fetch does. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/build.go b/modules/mesh-build-go/cmd/mesh-build-go/build.go index d42fd7dbf..351f62321 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/build.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/build.go @@ -14,9 +14,9 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/build_test.go b/modules/mesh-build-go/cmd/mesh-build-go/build_test.go index 29dda3fbc..6989b19b2 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/build_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/build_test.go @@ -14,7 +14,7 @@ import ( "strings" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/candidate.go b/modules/mesh-build-go/cmd/mesh-build-go/candidate.go index 71a6f287a..ff20d0dad 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/candidate.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/candidate.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" ) // The runners of a digest or test step: this installed program, or the candidate's compiled from the workspace. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go b/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go index c18ea5452..b2b0c44dd 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose.go b/modules/mesh-build-go/cmd/mesh-build-go/compose.go index 35afca719..c27ce81fc 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose.go @@ -26,9 +26,9 @@ import ( "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" seat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/composer" 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-build-go/cmd/mesh-build-go/compose_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go index 3310fdea5..9493e4ac1 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go @@ -17,9 +17,9 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - "git.novox.be/novox/mesh-delivery/sdk/composer" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + sdkstep "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/forgekey" "git.novox.be/novox/mesh-sdk/go/testbus" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go index 332f60d72..95ba6a006 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go @@ -12,10 +12,10 @@ import ( "time" seat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - meshcat "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/composer" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + meshcat "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/composer" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/digest.go b/modules/mesh-build-go/cmd/mesh-build-go/digest.go index 6a85a7ae6..8447d636d 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/digest.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/digest.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + trunk "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk" ) // DigestVersion is the form of the digest's text: changed whenever what the digest hashes changes in kind. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/fetch.go b/modules/mesh-build-go/cmd/mesh-build-go/fetch.go index 8e76eb0f6..f39c6d008 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/fetch.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/fetch.go @@ -20,8 +20,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" ) var commitOK = regexp.MustCompile(`^[0-9a-f]{40}$`) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go b/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go index 73bde7449..f98cdfee6 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go @@ -11,7 +11,7 @@ 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-sdk/go/forgekey" ) @@ -212,7 +212,7 @@ func TestNoCommandOfTheStepSeesAPasswordOrAToken(t *testing.T) { // 1485/AC3: go mod verify failing ends the step failed naming the directory and the first line of its output. func TestAVerifyThatFailsEndsTheStepNamingTheDirectoryAndTheLine(t *testing.T) { - const seatPkg = "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + const seatPkg = "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" for _, c := range []struct { name, ran, out string fatal bool diff --git a/modules/mesh-build-go/cmd/mesh-build-go/imports.go b/modules/mesh-build-go/cmd/mesh-build-go/imports.go index e9ea32a9a..f7d7aa10b 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/imports.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/imports.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" + 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go b/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go index 218e34a4d..7be02f884 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go @@ -12,7 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/buildcpu" - 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/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/integration.go b/modules/mesh-build-go/cmd/mesh-build-go/integration.go index f71b6a562..fb406f660 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/integration.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/integration.go @@ -14,7 +14,7 @@ import ( "strings" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The integration level's bounds (ADR 0445 §3). diff --git a/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go b/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go index e2cf5bad1..49889ee94 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go @@ -11,7 +11,7 @@ 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-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/isolate.go b/modules/mesh-build-go/cmd/mesh-build-go/isolate.go index 946fab4eb..e54d8224f 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/isolate.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/isolate.go @@ -16,7 +16,7 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go b/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go index 190224d77..0127c9e55 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go @@ -11,7 +11,7 @@ import ( "testing" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds.go b/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds.go index bdb9800d9..2dcee97e8 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds.go @@ -16,9 +16,9 @@ import ( "slices" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildgo" + ociseat "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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/catalogue" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds_test.go b/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds_test.go index aff556c19..22d926e3c 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/keptbuilds_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "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" "git.novox.be/novox/mesh-sdk/go/buscalls" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/keys.go b/modules/mesh-build-go/cmd/mesh-build-go/keys.go index ba3baff9a..802b45ae4 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/keys.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/keys.go @@ -14,7 +14,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go index 8e942ca0b..c5dacdb23 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go @@ -10,8 +10,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1901/AC7: the module's own parse path (readGoTest, then the level's judging) keeps the failure contract on every captured diff --git a/modules/mesh-build-go/cmd/mesh-build-go/level.go b/modules/mesh-build-go/cmd/mesh-build-go/level.go index d61907753..7b5805169 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/level.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/level.go @@ -17,7 +17,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // levelArg is the first argument that makes this binary a step's shut-off process: the integration level's, and, when diff --git a/modules/mesh-build-go/cmd/mesh-build-go/levels.go b/modules/mesh-build-go/cmd/mesh-build-go/levels.go index 903636356..6476ac7ba 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/levels.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/levels.go @@ -12,7 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The two levels (ADR 0445 §2). diff --git a/modules/mesh-build-go/cmd/mesh-build-go/lint.go b/modules/mesh-build-go/cmd/mesh-build-go/lint.go index 90138afad..c388bbaa3 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/lint.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/lint.go @@ -15,7 +15,7 @@ import ( "sync" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/main.go b/modules/mesh-build-go/cmd/mesh-build-go/main.go index 8817fc799..9cf9701ce 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/main.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/main.go @@ -13,8 +13,8 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/busstate" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/mirror.go b/modules/mesh-build-go/cmd/mesh-build-go/mirror.go index 7c3ab5633..b7145f4ec 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/mirror.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/mirror.go @@ -9,7 +9,7 @@ import ( "syscall" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" ) // mirrorLocks hold one mutex per mirror of this process; the lock file beside the mirror holds off another process. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go b/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go index 6b5c39202..53c5466e9 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go @@ -12,7 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func fetchOnce(t *testing.T, m *Module, states *keptStates, args map[string]any) FetchResult { diff --git a/modules/mesh-build-go/cmd/mesh-build-go/module.go b/modules/mesh-build-go/cmd/mesh-build-go/module.go index 26632aed3..f36894ff4 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/module.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/module.go @@ -10,8 +10,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/module_test.go b/modules/mesh-build-go/cmd/mesh-build-go/module_test.go index 7ff90d395..79cf2d756 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/module_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/module_test.go @@ -10,7 +10,7 @@ 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-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go index d7e684fed..2ce32371e 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // ADR 0499 §4 (issue 1758): a fetch asked with the module's directory and its named paths leaves the workspace holding diff --git a/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go b/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go index e39595e3c..b25ff05e6 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Issue 1309: a test that runs a step in bubblewrap is proof only where it runs. Where a build module judges (it hands diff --git a/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go b/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go index a1f37d054..be305844d 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go b/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go index 0490b6568..a6ec8b7f6 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go @@ -8,7 +8,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1925/AC1: packagesArg takes the list as the bus's JSON shape ([]any) and as the typed list an ask hands in process diff --git a/modules/mesh-build-go/cmd/mesh-build-go/pins.go b/modules/mesh-build-go/cmd/mesh-build-go/pins.go index 19c1ec08a..bcff198c2 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/pins.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/pins.go @@ -21,8 +21,8 @@ import ( "strings" "sync" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" ) const forgePrefix = "git.novox.be/novox/" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go index d19157869..6337ed1f8 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1148/AC2 as issue 1585 S15 has it (novox/hq ADR 0573 §4): given a forge with a mesh-sdk-like pull request whose branch diff --git a/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go b/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go index 9ce00ffea..17b5f20e8 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go index 95cccd6c7..cbefd58aa 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go @@ -15,7 +15,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func git(t *testing.T, dir string, args ...string) string { diff --git a/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go b/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go index 87ff97f0c..dca5fddba 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/probe.go b/modules/mesh-build-go/cmd/mesh-build-go/probe.go index 13be6f6bd..b5b313827 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/probe.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/probe.go @@ -7,7 +7,7 @@ import ( "strings" "time" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go b/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go index 0892e16b2..ed850e63f 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go @@ -15,9 +15,9 @@ import ( "testing" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + registry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // pushed are the blobs the fake artifact store took, by digest, for the tests that read an archive back. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/read.go b/modules/mesh-build-go/cmd/mesh-build-go/read.go index 1938479bb..fc53441a6 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/read.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/read.go @@ -14,7 +14,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/read_test.go b/modules/mesh-build-go/cmd/mesh-build-go/read_test.go index 0ff1eba1f..880fa8962 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/read_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/read_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // fakeState is a state as stored: key to raw value. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/room_test.go b/modules/mesh-build-go/cmd/mesh-build-go/room_test.go index 3e65c8686..e7aff218c 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/room_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/room_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/run.go b/modules/mesh-build-go/cmd/mesh-build-go/run.go index 06aa9979c..3a17e3485 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/run.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/run.go @@ -19,8 +19,8 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - checkerclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + checkerclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // run runs a run ask: the program of its commit, built once, over its heads and its input. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/run_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/run_integration_test.go index 946928f02..83830ef48 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/run_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/run_integration_test.go @@ -17,9 +17,9 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - checkerclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - checker "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + checkerclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + checker "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-sdk/go/testbus" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/run_test.go b/modules/mesh-build-go/cmd/mesh-build-go/run_test.go index 09c98d6b7..a1a2dec24 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/run_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/run_test.go @@ -16,10 +16,10 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - checkerclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliverycheckerclient" - checker "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/composer" + checkerclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliverycheckerclient" + checker "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/composer" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/runner.go b/modules/mesh-build-go/cmd/mesh-build-go/runner.go index 215204e9a..b8e7d1f43 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/runner.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/runner.go @@ -4,7 +4,7 @@ import ( "context" "os" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go b/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go index 77e8915e9..e636ae445 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // threeModules gives the workspace three go.mod directories, a, b and c, whose modules are fixture/a, fixture/b and diff --git a/modules/mesh-build-go/cmd/mesh-build-go/steps.go b/modules/mesh-build-go/cmd/mesh-build-go/steps.go index 7745cc695..63ef1d396 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/steps.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/steps.go @@ -17,8 +17,8 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "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" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go index f7434ad9a..951166035 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go @@ -24,9 +24,9 @@ import ( _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + registry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // realStore starts the artifact store's own program (the distribution registry, modules/distribution) inside this diff --git a/modules/mesh-build-go/cmd/mesh-build-go/test.go b/modules/mesh-build-go/cmd/mesh-build-go/test.go index 3ca5d79be..f106a55e7 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/test.go @@ -16,7 +16,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/test_test.go b/modules/mesh-build-go/cmd/mesh-build-go/test_test.go index bd241bb20..0931f3dcd 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/test_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/test_test.go @@ -9,7 +9,7 @@ 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-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/versions.go b/modules/mesh-build-go/cmd/mesh-build-go/versions.go index 8dbd79c6d..aa51c4f82 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/versions.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/versions.go @@ -31,7 +31,7 @@ import ( "strings" "sync" - 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/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go b/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go index f2e54402b..40f799197 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go @@ -9,7 +9,7 @@ import ( "testing" builds "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" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go b/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go index 35ca8107b..431b77430 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // releaseXzSHA256 is the sha256 of testdata/upstream-release.tar.xz: the tar stream of upstream-release.tar.gz, diff --git a/modules/mesh-build-go/go.mod b/modules/mesh-build-go/go.mod index a3591514d..c3dc4189d 100644 --- a/modules/mesh-build-go/go.mod +++ b/modules/mesh-build-go/go.mod @@ -5,15 +5,15 @@ go 1.26.0 require ( git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient 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/seats/containerimageregistry 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/meshdeliverychecker 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/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient 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/seats/containerimageregistry 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/meshdeliverychecker 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-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 github.com/distribution/distribution/v3 v3.1.2 github.com/nats-io/nats-server/v2 v2.11.17 @@ -103,10 +103,10 @@ replace git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys => ../ssh-cli require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner 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/gopackageregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry 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/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/gopackageregistry v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry 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-build-image/cmd/mesh-build-image/asks.go b/modules/mesh-build-image/cmd/mesh-build-image/asks.go index 38a1bda81..d5214dbe3 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/asks.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/asks.go @@ -5,9 +5,9 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go b/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go index ebdece6a1..f4119a9a7 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go @@ -8,7 +8,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/build_test.go b/modules/mesh-build-image/cmd/mesh-build-image/build_test.go index 7bbb850c4..682a81417 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/build_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/build_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/bus_integration_test.go b/modules/mesh-build-image/cmd/mesh-build-image/bus_integration_test.go index f5167f7c3..3be020be5 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/bus_integration_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/bus_integration_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + 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" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-build-image/cmd/mesh-build-image/capture_test.go b/modules/mesh-build-image/cmd/mesh-build-image/capture_test.go index ddbc1389f..5bb14a04c 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/capture_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/capture_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) const capturedDir = "testdata/captured" diff --git a/modules/mesh-build-image/cmd/mesh-build-image/copy.go b/modules/mesh-build-image/cmd/mesh-build-image/copy.go index f9e8038de..02f329476 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/copy.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/copy.go @@ -21,12 +21,12 @@ import ( "sync" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" builds "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" ) // CopyTool is the copy step's tool. diff --git a/modules/mesh-build-image/cmd/mesh-build-image/copy_test.go b/modules/mesh-build-image/cmd/mesh-build-image/copy_test.go index bd5624766..b7134ef90 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/copy_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/copy_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func runCopy(t *testing.T, m *Module, states *keptStates, args map[string]any) (CopyResult, sdkstep.Step) { diff --git a/modules/mesh-build-image/cmd/mesh-build-image/fetch.go b/modules/mesh-build-image/cmd/mesh-build-image/fetch.go index 92ecb60c5..4f15a5ff3 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/fetch.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/fetch.go @@ -14,7 +14,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) var ( diff --git a/modules/mesh-build-image/cmd/mesh-build-image/fetch_test.go b/modules/mesh-build-image/cmd/mesh-build-image/fetch_test.go index 8625c88fa..4cf6011dd 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/fetch_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/fetch_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1703b: the fetch step asks git, through the SDK's FetchCommit, for the ssh remote of the forge as the account, makes diff --git a/modules/mesh-build-image/cmd/mesh-build-image/helpers_test.go b/modules/mesh-build-image/cmd/mesh-build-image/helpers_test.go index 4e01d5282..f450400fd 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/helpers_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/helpers_test.go @@ -15,8 +15,8 @@ import ( stdio "git.novox.be/novox/mesh-sdk/go" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go b/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go index 7bc292767..f9c964280 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/integration_test.go @@ -19,7 +19,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) func needTools(t *testing.T, what string, tools ...string) { diff --git a/modules/mesh-build-image/cmd/mesh-build-image/keptartifact.go b/modules/mesh-build-image/cmd/mesh-build-image/keptartifact.go index 27dd10a30..76b73217f 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/keptartifact.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/keptartifact.go @@ -8,8 +8,8 @@ package main // seat definition's (the node-engines alone), granted by the grants part (ADR 0666 §20): this module checks no caller. import ( - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/keys.go b/modules/mesh-build-image/cmd/mesh-build-image/keys.go index 5793fab67..dd4363db5 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/keys.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/keys.go @@ -14,7 +14,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go b/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go index ec46c4f62..5e8b454ee 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go @@ -4,14 +4,14 @@ import ( "context" "errors" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" "strings" "testing" "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" ) // 1890/AC7: the module's own start sweep (endLeftRunning, as main runs it) keeps the conformance kit's left-running diff --git a/modules/mesh-build-image/cmd/mesh-build-image/main.go b/modules/mesh-build-image/cmd/mesh-build-image/main.go index 13224f1b2..0ea243aff 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/main.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/main.go @@ -14,9 +14,9 @@ import ( "strings" "time" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/module.go b/modules/mesh-build-image/cmd/mesh-build-image/module.go index 73558e4e1..809885958 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/module.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/module.go @@ -9,8 +9,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/module_test.go b/modules/mesh-build-image/cmd/mesh-build-image/module_test.go index 5ac356a5c..ed022b0d9 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/module_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/module_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - 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/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/publish.go b/modules/mesh-build-image/cmd/mesh-build-image/publish.go index 7295fc11f..c06a99f2b 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/publish.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/publish.go @@ -16,8 +16,8 @@ import ( "path/filepath" "strings" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" diff --git a/modules/mesh-build-image/cmd/mesh-build-image/publish_test.go b/modules/mesh-build-image/cmd/mesh-build-image/publish_test.go index 554635c50..316493437 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/publish_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/publish_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + reg "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // 1703d/AC (ADR 0487 §5): a candidate's build leaves the image seat unchanged: nothing is written, nothing is asked. diff --git a/modules/mesh-build-image/cmd/mesh-build-image/read.go b/modules/mesh-build-image/cmd/mesh-build-image/read.go index bea8a7ac5..d37522613 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/read.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/read.go @@ -14,7 +14,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/read_test.go b/modules/mesh-build-image/cmd/mesh-build-image/read_test.go index 773e9b9b1..9776771ce 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/read_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/read_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // The read tools answer what the steps state holds: a finished build's result is there, read by the step's id. diff --git a/modules/mesh-build-image/cmd/mesh-build-image/room_test.go b/modules/mesh-build-image/cmd/mesh-build-image/room_test.go index 216f0636f..6b85f41a9 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/room_test.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/room_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/runner.go b/modules/mesh-build-image/cmd/mesh-build-image/runner.go index d11857687..9aee3b3b5 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/runner.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/runner.go @@ -4,7 +4,7 @@ import ( "context" "os" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-image/cmd/mesh-build-image/steps.go b/modules/mesh-build-image/cmd/mesh-build-image/steps.go index e62ff9364..decde3219 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/steps.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/steps.go @@ -7,7 +7,7 @@ package main import ( "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildimage" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildimage" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-image/go.mod b/modules/mesh-build-image/go.mod index bdd7b9dea..8b67098cf 100644 --- a/modules/mesh-build-image/go.mod +++ b/modules/mesh-build-image/go.mod @@ -4,11 +4,11 @@ go 1.26.0 require ( git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0-00010101000000-000000000000 - 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/nodebuildimage 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/nodebuildimage 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 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 @@ -35,13 +35,13 @@ replace git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys => ../ssh-cli require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner 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/meshcatalogclient 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/gopackageregistry 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/nodebuildgo v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry 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/gopackageregistryclient 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/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/gopackageregistry 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/nodebuildgo v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry 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-build-node/cmd/mesh-build-node/asks.go b/modules/mesh-build-node/cmd/mesh-build-node/asks.go index da739e18a..9e71ae80e 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/asks.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/asks.go @@ -6,9 +6,9 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go b/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go index 56546c5be..c6f2e26e8 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go @@ -11,7 +11,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/build.go b/modules/mesh-build-node/cmd/mesh-build-node/build.go index 4147c76c5..ec3f18cac 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/build.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/build.go @@ -19,9 +19,9 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // Out is where a bundle's compiled files go in the module's directory (builder toolchain.go:118). diff --git a/modules/mesh-build-node/cmd/mesh-build-node/build_test.go b/modules/mesh-build-node/cmd/mesh-build-node/build_test.go index 469482168..4bcb8388f 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/build_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/build_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - 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/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/check.go b/modules/mesh-build-node/cmd/mesh-build-node/check.go index 9d068230e..c1a6b4ed4 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/check.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/check.go @@ -22,7 +22,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/fetch.go b/modules/mesh-build-node/cmd/mesh-build-node/fetch.go index 962076296..ba5a85ca4 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/fetch.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/fetch.go @@ -26,8 +26,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/fetch_test.go b/modules/mesh-build-node/cmd/mesh-build-node/fetch_test.go index 572ba47e9..fc8251c1e 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/fetch_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/fetch_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/isolate.go b/modules/mesh-build-node/cmd/mesh-build-node/isolate.go index 86d012bff..308d634ad 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/isolate.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/isolate.go @@ -18,7 +18,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/keptartifact.go b/modules/mesh-build-node/cmd/mesh-build-node/keptartifact.go index 30dd76998..15b13fdc7 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/keptartifact.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/keptartifact.go @@ -8,8 +8,8 @@ package main // seat definition's (the node-engines alone), granted by the grants part (ADR 0666 §20): this module checks no caller. import ( - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/keys.go b/modules/mesh-build-node/cmd/mesh-build-node/keys.go index fa4aaa1a1..b7f4c7205 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/keys.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/keys.go @@ -14,7 +14,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go b/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go index fa8c34508..d44fe9aaf 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go @@ -8,8 +8,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/main.go b/modules/mesh-build-node/cmd/mesh-build-node/main.go index ad83cc12f..b1a3696b2 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/main.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/main.go @@ -15,9 +15,9 @@ import ( "strings" "time" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - dforgekey "git.novox.be/novox/mesh-delivery/sdk/forgekey" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" + dforgekey "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/module.go b/modules/mesh-build-node/cmd/mesh-build-node/module.go index f87c17b98..6277ba0e5 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/module.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/module.go @@ -11,8 +11,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/module_test.go b/modules/mesh-build-node/cmd/mesh-build-node/module_test.go index c4c0e93f0..c733a82ec 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/module_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/module_test.go @@ -11,7 +11,7 @@ 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-sdk/go/health" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/push_test.go b/modules/mesh-build-node/cmd/mesh-build-node/push_test.go index 4e526e139..72bd9b6eb 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/push_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/push_test.go @@ -13,11 +13,11 @@ import ( "sync" "testing" - registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + registry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" builds "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" ) // pushed are the blobs the fake holder took, by digest, for the tests that read an archive back. diff --git a/modules/mesh-build-node/cmd/mesh-build-node/read.go b/modules/mesh-build-node/cmd/mesh-build-node/read.go index 102b28082..ec7b2d2a8 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/read.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/read.go @@ -14,7 +14,7 @@ import ( "sync" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/read_test.go b/modules/mesh-build-node/cmd/mesh-build-node/read_test.go index 194d94d5e..70be8af51 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/read_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/read_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" ) // fakeState is a state as stored: key to raw value. diff --git a/modules/mesh-build-node/cmd/mesh-build-node/room_test.go b/modules/mesh-build-node/cmd/mesh-build-node/room_test.go index ae0266872..02d131c63 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/room_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/room_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - 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/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/steps.go b/modules/mesh-build-node/cmd/mesh-build-node/steps.go index 0f109953f..b0c805bed 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/steps.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/steps.go @@ -16,8 +16,8 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildnode" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + seat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/nodebuildnode" + sdkstep "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/forgekey" ) diff --git a/modules/mesh-build-node/cmd/mesh-build-node/store_integration_test.go b/modules/mesh-build-node/cmd/mesh-build-node/store_integration_test.go index 7776637c6..4cd5b9628 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/store_integration_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/store_integration_test.go @@ -21,9 +21,9 @@ import ( _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - artifactref "git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient/reference" - registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + artifactref "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/containerimageregistryclient/reference" + registry "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/containerimageregistry" ) // realStore starts the artifact store's own program (the distribution registry, modules/distribution) inside this diff --git a/modules/mesh-build-node/cmd/mesh-build-node/toolchain_test.go b/modules/mesh-build-node/cmd/mesh-build-node/toolchain_test.go index 0c1a02038..a412e52e0 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/toolchain_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/toolchain_test.go @@ -3,7 +3,7 @@ package main import ( "context" "errors" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/buildstep" "os" "path/filepath" "strings" diff --git a/modules/mesh-build-node/go.mod b/modules/mesh-build-node/go.mod index af385b3dd..446ece46e 100644 --- a/modules/mesh-build-node/go.mod +++ b/modules/mesh-build-node/go.mod @@ -4,11 +4,11 @@ go 1.26.0 require ( git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0-00010101000000-000000000000 - 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/nodebuildnode 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/nodebuildnode 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 github.com/distribution/distribution/v3 v3.1.2 github.com/nats-io/nats.go v1.54.0 @@ -95,13 +95,13 @@ replace git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys => ../ssh-cli require ( git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner 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/meshcatalogclient 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/gopackageregistry 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/nodebuildgo v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry 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/gopackageregistryclient 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/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/gopackageregistry 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/nodebuildgo v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/npmpackageregistry 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-conditions/cmd/mesh-conditions/branches.go b/modules/mesh-conditions/cmd/mesh-conditions/branches.go index f65d63ec8..efeb307d5 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/branches.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/branches.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + catseat "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-conditions/cmd/mesh-conditions/branches_test.go b/modules/mesh-conditions/cmd/mesh-conditions/branches_test.go index f7bbd1d8f..6a568e018 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/branches_test.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/branches_test.go @@ -4,7 +4,7 @@ import ( "slices" "testing" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // Design 47 G §532: the keeper adopts a branch a registration adds while it runs, and drops one no registration names. diff --git a/modules/mesh-conditions/cmd/mesh-conditions/catalog.go b/modules/mesh-conditions/cmd/mesh-conditions/catalog.go index e8b6b2fcd..b88981380 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/catalog.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/catalog.go @@ -15,8 +15,8 @@ import ( "time" seat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - wants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + catseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + wants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" stdio "git.novox.be/novox/mesh-sdk/go" engine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" diff --git a/modules/mesh-conditions/cmd/mesh-conditions/hold.go b/modules/mesh-conditions/cmd/mesh-conditions/hold.go index 22b026b8b..cbf90c8e5 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/hold.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/hold.go @@ -18,7 +18,7 @@ import ( "strings" "time" - 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" "git.novox.be/novox/mesh-sdk/go/motion" diff --git a/modules/mesh-conditions/cmd/mesh-conditions/hold_test.go b/modules/mesh-conditions/cmd/mesh-conditions/hold_test.go index b9e7a82c4..6850411c6 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/hold_test.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/hold_test.go @@ -13,7 +13,7 @@ import ( mesh "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" cc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - 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" "git.novox.be/novox/mesh-sdk/go/motion" ) diff --git a/modules/mesh-conditions/cmd/mesh-conditions/keeper.go b/modules/mesh-conditions/cmd/mesh-conditions/keeper.go index 179e30b70..a5f80a719 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/keeper.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/keeper.go @@ -26,7 +26,7 @@ import ( cc "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" seat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" meshhealers "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshhealers" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" ) // The modules whose states the keeper reads by name: the holders of the health seats (their seats' names are the diff --git a/modules/mesh-conditions/cmd/mesh-conditions/keeper_test.go b/modules/mesh-conditions/cmd/mesh-conditions/keeper_test.go index 2c69ba789..cc872b464 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/keeper_test.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/keeper_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - meshwants "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants" + catseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "slices" "sort" "strings" diff --git a/modules/mesh-conditions/cmd/mesh-conditions/main.go b/modules/mesh-conditions/cmd/mesh-conditions/main.go index 859732bdc..d18b8535f 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/main.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/main.go @@ -19,10 +19,10 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" seat "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" - catseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - meshwants "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/clients/meshwantsclient" + catseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + meshwants "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshwants" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-conditions/go.mod b/modules/mesh-conditions/go.mod index 2fc0911c5..717e56e1e 100644 --- a/modules/mesh-conditions/go.mod +++ b/modules/mesh-conditions/go.mod @@ -13,10 +13,10 @@ 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/meshhealers 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/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/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/meshwants 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-config/cmd/mesh-config/catalogfeed.go b/modules/mesh-config/cmd/mesh-config/catalogfeed.go index 86b2619ce..f544c247d 100644 --- a/modules/mesh-config/cmd/mesh-config/catalogfeed.go +++ b/modules/mesh-config/cmd/mesh-config/catalogfeed.go @@ -8,8 +8,8 @@ package main import ( "context" - "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" ) // CatalogHalf is what the holder reads of the catalog half. diff --git a/modules/mesh-config/cmd/mesh-config/catalogfeed_test.go b/modules/mesh-config/cmd/mesh-config/catalogfeed_test.go index 6597f6693..6c1edee7e 100644 --- a/modules/mesh-config/cmd/mesh-config/catalogfeed_test.go +++ b/modules/mesh-config/cmd/mesh-config/catalogfeed_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-config/cmd/mesh-config/config_test.go b/modules/mesh-config/cmd/mesh-config/config_test.go index cc28d31ed..ad29c9d56 100644 --- a/modules/mesh-config/cmd/mesh-config/config_test.go +++ b/modules/mesh-config/cmd/mesh-config/config_test.go @@ -13,8 +13,8 @@ import ( assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalogclient "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" ) // memStore is the bus as mesh-config reaches it, in memory: its states and the mirrors it reads, its history log, diff --git a/modules/mesh-config/cmd/mesh-config/main.go b/modules/mesh-config/cmd/mesh-config/main.go index b3848f0ca..9d7e424bc 100644 --- a/modules/mesh-config/cmd/mesh-config/main.go +++ b/modules/mesh-config/cmd/mesh-config/main.go @@ -21,7 +21,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" meshconditions "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-config/cmd/mesh-config/manifest_test.go b/modules/mesh-config/cmd/mesh-config/manifest_test.go index 0780921c0..e561cba26 100644 --- a/modules/mesh-config/cmd/mesh-config/manifest_test.go +++ b/modules/mesh-config/cmd/mesh-config/manifest_test.go @@ -2,7 +2,7 @@ package main import ( "encoding/json" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "os" "path/filepath" "slices" diff --git a/modules/mesh-config/cmd/mesh-config/ownerviews.go b/modules/mesh-config/cmd/mesh-config/ownerviews.go index 8c201b241..a677a0e8c 100644 --- a/modules/mesh-config/cmd/mesh-config/ownerviews.go +++ b/modules/mesh-config/cmd/mesh-config/ownerviews.go @@ -19,7 +19,7 @@ import ( "sort" "strings" - 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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" diff --git a/modules/mesh-config/cmd/mesh-config/readers.go b/modules/mesh-config/cmd/mesh-config/readers.go index e5510a65f..b344de43b 100644 --- a/modules/mesh-config/cmd/mesh-config/readers.go +++ b/modules/mesh-config/cmd/mesh-config/readers.go @@ -3,7 +3,7 @@ package main import ( "fmt" - 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" ) // The holders whose states this module reads, one constant each (a reader names its holder once; ADR 0634 §4). diff --git a/modules/mesh-config/cmd/mesh-config/sources.go b/modules/mesh-config/cmd/mesh-config/sources.go index 32769638e..6a05643c7 100644 --- a/modules/mesh-config/cmd/mesh-config/sources.go +++ b/modules/mesh-config/cmd/mesh-config/sources.go @@ -9,8 +9,8 @@ import ( "strings" assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalogclient "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" ) // Reading the sources, writing the resolved values, and publishing the list of predefined keys. diff --git a/modules/mesh-config/cmd/mesh-config/takeover.go b/modules/mesh-config/cmd/mesh-config/takeover.go index 0c30f80fe..cc22ce6d4 100644 --- a/modules/mesh-config/cmd/mesh-config/takeover.go +++ b/modules/mesh-config/cmd/mesh-config/takeover.go @@ -15,7 +15,7 @@ import ( "fmt" "time" - 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 states and reads. diff --git a/modules/mesh-config/cmd/mesh-config/takeover_test.go b/modules/mesh-config/cmd/mesh-config/takeover_test.go index 5b934337b..4f5d6bd62 100644 --- a/modules/mesh-config/cmd/mesh-config/takeover_test.go +++ b/modules/mesh-config/cmd/mesh-config/takeover_test.go @@ -5,7 +5,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 trunk's manifests aMesh declares. diff --git a/modules/mesh-config/cmd/mesh-config/whole_integration_test.go b/modules/mesh-config/cmd/mesh-config/whole_integration_test.go index a40159190..9cc30a578 100644 --- a/modules/mesh-config/cmd/mesh-config/whole_integration_test.go +++ b/modules/mesh-config/cmd/mesh-config/whole_integration_test.go @@ -33,9 +33,9 @@ import ( engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + catalogclient "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" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/modules/mesh-config/go.mod b/modules/mesh-config/go.mod index 88d76d8eb..7c48b3524 100644 --- a/modules/mesh-config/go.mod +++ b/modules/mesh-config/go.mod @@ -13,9 +13,9 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions 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/seats/meshcatalog 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/seats/meshcatalog 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.go v1.54.0 ) @@ -36,10 +36,10 @@ 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-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/sdk 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-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 // indirect ) -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 diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/catalogue_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/catalogue_test.go index 917e77ac8..d3e93cdf5 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/catalogue_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/catalogue_test.go @@ -8,7 +8,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 gate is the only claimant of the seat `mesh-delivery` in the catalogue** (novox/hq ADR 0437 §1, ADR 0449 §4, ADR 0454, diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings.go index da2826bbc..a38acdc97 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings.go @@ -7,7 +7,7 @@ import ( "strconv" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - 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" 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-gate/cmd/mesh-delivery-gate/findings_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings_test.go index 959b0f9b0..20a6418a0 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/findings_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/merges.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/merges.go index cf42260d3..dd42ac7e2 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/merges.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/merges.go @@ -6,8 +6,8 @@ import ( "fmt" "sort" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + mdc "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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owed.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owed.go index 0cb858385..938dd0466 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owed.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owed.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + mdc "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-sdk/go/keys" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts.go index ed86d74b1..e27918d7d 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts.go @@ -7,7 +7,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" ) // What the gate owes the forge for a change of a delivery record (design 47 G A-39, A-35, §158, §161 to §167): every change of diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts_test.go index a4699ff1f..7e8a04cb5 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedacts_test.go @@ -5,7 +5,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" ) type sayerFake struct{ said []seat.Owed } diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedended.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedended.go index 38c934f6b..009902462 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedended.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/owedended.go @@ -4,7 +4,7 @@ import ( "fmt" "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" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record.go index 41347b64b..c68d2b82c 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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-sdk/go/buscalls" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record_test.go index ad3d32934..283f035ca 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/record_test.go @@ -13,7 +13,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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-sdk/go/buscalls" "git.novox.be/novox/mesh-sdk/go/catalogue" diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordevents.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordevents.go index 0551093e7..58488069a 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordevents.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordevents.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) // The halves of the revision view a record pins (design 47 *Two graphs, one source of truth*). diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordfill.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordfill.go index 204f35740..00a9bd0b1 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordfill.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recordfill.go @@ -14,7 +14,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" "git.novox.be/novox/mesh-sdk/go/buscalls" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recovery.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recovery.go index 2c7764c25..3cc8944a5 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recovery.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/recovery.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" ) // Recovery names a merge a recovery (design 47 G §81, A-23): the delivery record that holds the commit is marked through its diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/switch.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/switch.go index ad1fc0a42..a152ccedf 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/switch.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/switch.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + mdc "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-sdk/go/keys" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin.go index e72e45a44..0a15263af 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin.go @@ -6,9 +6,9 @@ import ( "sort" "strconv" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - meshcatalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" + meshcatalog "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/meshdelivery" "git.novox.be/novox/mesh-sdk/go/keys" ) diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin_bus_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin_bus_test.go index 528e42ea9..a34bf2ef8 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin_bus_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/takenin_bus_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) // The gate whole, over a real bus (design 47 G A-33, A-34): a take-in.taken the indexer says opens a delivery record in the diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values.go index 7b3b2247d..b3883cfc8 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values.go @@ -4,8 +4,8 @@ import ( "encoding/json" "reflect" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + mdc "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" ) // The holders the gate reads or hears, by the names their modules go by (the gate's own constants, one per reader: the diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values_test.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values_test.go index 3187afaf9..d1b22ce26 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values_test.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/values_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - mdc "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient" + mdc "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshdeliveryclient" ) // What go/delivery wrote into the seat's states, key order and all, must decode as it did and encode to the same diff --git a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/verbs.go b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/verbs.go index a5d6b0051..0878b79ed 100644 --- a/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/verbs.go +++ b/modules/mesh-delivery-gate/cmd/mesh-delivery-gate/verbs.go @@ -6,7 +6,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" ) // The seat's verbs that read (novox/hq ADR 0239; design 47 G §431, §172, A-24): from G's delivery the gate keeps no merge diff --git a/modules/mesh-delivery-gate/go.mod b/modules/mesh-delivery-gate/go.mod index e0e0f73d1..3bf41633a 100644 --- a/modules/mesh-delivery-gate/go.mod +++ b/modules/mesh-delivery-gate/go.mod @@ -7,14 +7,14 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions 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/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/meshdelivery 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/meshdelivery 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/modules/mesh-delivery-view/viewstate 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 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 @@ -39,12 +39,12 @@ require ( 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/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/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/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-delivery/modules/mesh-delivery-assigner/asks 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-provisioner/cmd/mesh-provisioner/catalogfake_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfake_test.go index f4bf1b0ec..2a7148696 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfake_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfake_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "sync" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" + catalogclient "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" ) // fakeCatalog is the catalog half as the tests give it: each module's trunk entry, and the entries a fingerprint names. diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed.go b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed.go index 513ed0be2..b4bc2e8a3 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed.go @@ -8,8 +8,8 @@ package main import ( "context" - "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" ) // CatalogHalf is what the holder reads of the catalog half. diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed_test.go index 6597f6693..6c1edee7e 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/catalogfeed_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go index 2f6179c43..1678b1f2b 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go @@ -21,7 +21,7 @@ import ( assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "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/catalogue" ) diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go b/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go index 1bfd1e3c8..a9f3d1d6f 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go @@ -40,8 +40,8 @@ import ( assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/sdk/catalogkey" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/catalogkey" 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-provisioner/cmd/mesh-provisioner/main.go b/modules/mesh-provisioner/cmd/mesh-provisioner/main.go index 517ce4126..6a53f4d3b 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/main.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/main.go @@ -16,7 +16,7 @@ import ( "sync/atomic" "time" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" seat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go index 71328c5a8..d96b251f6 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go @@ -3,7 +3,7 @@ package main import ( "encoding/json" "fmt" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + catalogclient "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient" "os" "regexp" "slices" diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/readers.go b/modules/mesh-provisioner/cmd/mesh-provisioner/readers.go index 166ef2135..4278e9b00 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/readers.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/readers.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - 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" ) // The holders whose states this module reads, one constant each (a reader names its holder once; ADR 0634 §4). diff --git a/modules/mesh-provisioner/go.mod b/modules/mesh-provisioner/go.mod index 08c2906d9..5b1dfed6a 100644 --- a/modules/mesh-provisioner/go.mod +++ b/modules/mesh-provisioner/go.mod @@ -10,9 +10,9 @@ require ( 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-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/seats/meshcatalog 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/seats/meshcatalog 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.go v1.54.0 ) @@ -35,10 +35,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/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/sdk v0.0.0-00010101000000-000000000000 + 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-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 +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000 diff --git a/modules/mesh-recovery/cmd/mesh-recovery/seats.go b/modules/mesh-recovery/cmd/mesh-recovery/seats.go index 688c596fb..207054251 100644 --- a/modules/mesh-recovery/cmd/mesh-recovery/seats.go +++ b/modules/mesh-recovery/cmd/mesh-recovery/seats.go @@ -14,7 +14,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" - "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/buscompose" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/keys" diff --git a/modules/mesh-recovery/go.mod b/modules/mesh-recovery/go.mod index 87e7e287a..b6223cce6 100644 --- a/modules/mesh-recovery/go.mod +++ b/modules/mesh-recovery/go.mod @@ -8,7 +8,7 @@ require ( 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-contracts/health-and-repair/go/seats/meshconditions 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/meshcatalog 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-self-check/cmd/mesh-self-check/catalogfeed.go b/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed.go index 719845716..fb0afe427 100644 --- a/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed.go +++ b/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed.go @@ -5,8 +5,8 @@ package main // catalog graph entry carries whole (§443), never the indexer's state `modules` or `manifests`. import ( - "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" ) // CatalogHalf is every module's entry in the catalog half, as the self-check holds it. diff --git a/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed_test.go b/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed_test.go index d045883d8..59c9d0f58 100644 --- a/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed_test.go +++ b/modules/mesh-self-check/cmd/mesh-self-check/catalogfeed_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" - delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery" + "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" + delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-self-check/cmd/mesh-self-check/main.go b/modules/mesh-self-check/cmd/mesh-self-check/main.go index fb0ba73f1..a0c8c8d70 100644 --- a/modules/mesh-self-check/cmd/mesh-self-check/main.go +++ b/modules/mesh-self-check/cmd/mesh-self-check/main.go @@ -18,7 +18,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient" meshconditions "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-contracts/go/clients/meshcatalogclient" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-self-check/cmd/mesh-self-check/probes_test.go b/modules/mesh-self-check/cmd/mesh-self-check/probes_test.go index 8fd8d6906..7a369328d 100644 --- a/modules/mesh-self-check/cmd/mesh-self-check/probes_test.go +++ b/modules/mesh-self-check/cmd/mesh-self-check/probes_test.go @@ -15,7 +15,7 @@ import ( nodeseat "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" watchdogsclient "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient" - 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" "git.novox.be/novox/mesh-catalog/modules/disk-load/diskreadings" "git.novox.be/novox/mesh-catalog/modules/restic/backupgood" diff --git a/modules/mesh-self-check/cmd/mesh-self-check/selfcheck_test.go b/modules/mesh-self-check/cmd/mesh-self-check/selfcheck_test.go index 4f53afb12..3bebddc7b 100644 --- a/modules/mesh-self-check/cmd/mesh-self-check/selfcheck_test.go +++ b/modules/mesh-self-check/cmd/mesh-self-check/selfcheck_test.go @@ -13,7 +13,7 @@ import ( "time" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" - 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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) diff --git a/modules/mesh-self-check/go.mod b/modules/mesh-self-check/go.mod index 24d877108..52accdc37 100644 --- a/modules/mesh-self-check/go.mod +++ b/modules/mesh-self-check/go.mod @@ -10,8 +10,8 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient 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/clients/meshwatchdogsclient 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/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/seats/meshcatalog 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 ) @@ -47,4 +47,4 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshwatchdogs v0.0.0-00010101000000-000000000000 // indirect ) -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 diff --git a/modules/mesh-vault/go.mod b/modules/mesh-vault/go.mod index b9bd08189..b51608fd8 100644 --- a/modules/mesh-vault/go.mod +++ b/modules/mesh-vault/go.mod @@ -11,14 +11,14 @@ require ( git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault 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/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 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 // 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 diff --git a/modules/nats/cmd/nats-tools/catalogview.go b/modules/nats/cmd/nats-tools/catalogview.go index ee8fb77fe..fb3947d89 100644 --- a/modules/nats/cmd/nats-tools/catalogview.go +++ b/modules/nats/cmd/nats-tools/catalogview.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - 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" "git.novox.be/novox/mesh-sdk/go/catalogue" "nats-tools/internal/keeper" diff --git a/modules/nats/cmd/nats-tools/catalogview_test.go b/modules/nats/cmd/nats-tools/catalogview_test.go index b49659993..bffa977c4 100644 --- a/modules/nats/cmd/nats-tools/catalogview_test.go +++ b/modules/nats/cmd/nats-tools/catalogview_test.go @@ -3,7 +3,7 @@ package main import ( "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" ) func TestAsksOf(t *testing.T) { diff --git a/modules/nats/cmd/nats-tools/keep.go b/modules/nats/cmd/nats-tools/keep.go index 2547bf5b1..a26447540 100644 --- a/modules/nats/cmd/nats-tools/keep.go +++ b/modules/nats/cmd/nats-tools/keep.go @@ -22,7 +22,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions" 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" - 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" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/process" diff --git a/modules/nats/go.mod b/modules/nats/go.mod index 2bc42e0f8..6ec5811b7 100644 --- a/modules/nats/go.mod +++ b/modules/nats/go.mod @@ -8,7 +8,7 @@ require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions 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/meshcatalog 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-grants/busgrants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 github.com/klauspost/compress v1.20.1 diff --git a/modules/ssh-client/go.mod b/modules/ssh-client/go.mod index 96ec4d953..8c1d11ad4 100644 --- a/modules/ssh-client/go.mod +++ b/modules/ssh-client/go.mod @@ -25,4 +25,4 @@ require git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys v0.0.0-000101 replace git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys => ./sshkeys -require git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 // indirect +require git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk v0.0.0-00010101000000-000000000000 // indirect diff --git a/modules/ssh-client/sshkeys/go.mod b/modules/ssh-client/sshkeys/go.mod index 61d3f0cdd..3fa234579 100644 --- a/modules/ssh-client/sshkeys/go.mod +++ b/modules/ssh-client/sshkeys/go.mod @@ -3,6 +3,6 @@ module git.novox.be/novox/mesh-catalog/modules/ssh-client/sshkeys go 1.26.0 require ( - 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 ) diff --git a/modules/ssh-client/sshkeys/keeper.go b/modules/ssh-client/sshkeys/keeper.go index 21194a78b..f77bcda55 100644 --- a/modules/ssh-client/sshkeys/keeper.go +++ b/modules/ssh-client/sshkeys/keeper.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "git.novox.be/novox/mesh-delivery/sdk/forgekey" + "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/forgekey" sdk "git.novox.be/novox/mesh-sdk/go/forgekey" )