diff --git a/modules/route-proxy/cmd/route-provider/main.go b/modules/route-proxy/cmd/route-provider/main.go index abdf46e..0c9ec88 100644 --- a/modules/route-proxy/cmd/route-provider/main.go +++ b/modules/route-proxy/cmd/route-provider/main.go @@ -11,8 +11,8 @@ import ( "os" "time" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient/provider" stdio "git.novox.be/novox/mesh-sdk/go" - "git.novox.be/novox/mesh-sdk/go/provider" "route-proxy/contract" ) diff --git a/modules/route-proxy/cmd/route-provider/provider.go b/modules/route-proxy/cmd/route-provider/provider.go index 4c2b6ae..06953dd 100644 --- a/modules/route-proxy/cmd/route-provider/provider.go +++ b/modules/route-proxy/cmd/route-provider/provider.go @@ -11,7 +11,7 @@ package main // source of routes (issue 774, research 072 row 34). import ( - "git.novox.be/novox/mesh-sdk/go/provider" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient/provider" "route-proxy/contract" ) diff --git a/modules/route-proxy/cmd/route-provider/provider_test.go b/modules/route-proxy/cmd/route-provider/provider_test.go index 34b143b..812bdd1 100644 --- a/modules/route-proxy/cmd/route-provider/provider_test.go +++ b/modules/route-proxy/cmd/route-provider/provider_test.go @@ -9,9 +9,9 @@ import ( "sync" "testing" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient/provider" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/provider" - "git.novox.be/novox/mesh-sdk/go/provisions" ) // bucketBus is the helper's bus over in-memory buckets. @@ -56,23 +56,23 @@ func TestAConsumerOfARouteIsToldItsNamesFromItsPlanEntry(t *testing.T) { "gitea": {"name": "git.example.org", "internal-name": "git.novox.internal", "name-web": "git.example.org"}, "grafana": {"name": "grafana.example.org"}, } { - plan, err := provisions.EncodePlan(provisions.Plan{Node: "g14", Module: module, Plan: catalogue.Plan{ + plan, err := meshprovisionerclient.EncodePlan(meshprovisionerclient.Plan{Node: "g14", Module: module, Plan: catalogue.Plan{ Provisions: []catalogue.PlanProvision{{Provision: ProvisionName, Provider: "novox", ProviderModule: ModuleName, At: "10.7.0.1", From: "novox", As: "mesh_g14_" + module, Names: names}}}}) if err != nil { t.Fatal(err) } key := "g14." + module - if err := bus.Put(context.Background(), provisions.PlansBucket, key, plan); err != nil { + if err := bus.Put(context.Background(), meshprovisionerclient.PlansBucket, key, plan); err != nil { t.Fatal(err) } - asked, err := json.Marshal(provisions.Provision{V: provisions.Version, Provision: ProvisionName, - Consumer: provisions.End{Node: "g14", Module: module}, Provider: provisions.End{Node: "novox", Module: ModuleName}, - State: provisions.Asked}) + asked, err := json.Marshal(meshprovisionerclient.Provision{V: meshprovisionerclient.Version, Provision: ProvisionName, + Consumer: meshprovisionerclient.End{Node: "g14", Module: module}, Provider: meshprovisionerclient.End{Node: "novox", Module: ModuleName}, + State: meshprovisionerclient.Asked}) if err != nil { t.Fatal(err) } - if err := bus.Put(context.Background(), provisions.ProvisionsBucket, key+"."+ProvisionName, asked); err != nil { + if err := bus.Put(context.Background(), meshprovisionerclient.ProvisionsBucket, key+"."+ProvisionName, asked); err != nil { t.Fatal(err) } } @@ -97,7 +97,7 @@ func TestAConsumerOfARouteIsToldItsNamesFromItsPlanEntry(t *testing.T) { t.Errorf("%s says %s %v, want %s", key, k, e.Values[k], v) } } - if e.State != provisions.Provided || e.VaultName != "" || e.User != "" || e.Refused != "" { + if e.State != meshprovisionerclient.Provided || e.VaultName != "" || e.User != "" || e.Refused != "" { t.Errorf("the entry %s is %+v", key, e) } } diff --git a/modules/route-proxy/cmd/route-proxy/bus.go b/modules/route-proxy/cmd/route-proxy/bus.go index 2bd3160..b81e00d 100644 --- a/modules/route-proxy/cmd/route-proxy/bus.go +++ b/modules/route-proxy/cmd/route-proxy/bus.go @@ -10,12 +10,12 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/announce" "git.novox.be/novox/mesh-sdk/go/delivery" "git.novox.be/novox/mesh-sdk/go/membership" "git.novox.be/novox/mesh-sdk/go/process" - "git.novox.be/novox/mesh-sdk/go/provisions" "route-proxy/contract" ) @@ -78,7 +78,7 @@ func followOnce(path string, held *table) error { if err := followInside(conn.Read(delivery.PlacementRead), held); err != nil { log.Printf("cannot follow %s, so an internal name is served to this machine alone: %v", delivery.PlacementRead, err) } - if err := followPlans(conn.Read(provisions.PlansRead), newPlanned(account.Node, say), held, say); err != nil { + if err := followPlans(conn.Read(meshprovisionerclient.PlansRead), newPlanned(account.Node, say), held, say); err != nil { conn.Close() return err } @@ -105,7 +105,7 @@ func followPlans(plans planWatch, given *planned, held *table, say func(string, return nil }) if err != nil { - return fmt.Errorf("watching %s: %w", provisions.PlansRead, err) + return fmt.Errorf("watching %s: %w", meshprovisionerclient.PlansRead, err) } read.Store(true) serve(given, held, say) diff --git a/modules/route-proxy/cmd/route-proxy/plans.go b/modules/route-proxy/cmd/route-proxy/plans.go index b2e91fa..e648440 100644 --- a/modules/route-proxy/cmd/route-proxy/plans.go +++ b/modules/route-proxy/cmd/route-proxy/plans.go @@ -17,8 +17,8 @@ import ( "sort" "sync" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/provisions" "route-proxy/contract" ) @@ -90,7 +90,7 @@ func (p *planned) contributions() []contribution { // what the plan names and the proxy does not serve, each with why: an entry carrying nothing to serve, a payload or a // route the contract does not read, or a consumer elsewhere with no address on the private network. func routesOfPlan(node, key string, value []byte) ([]contribution, []contract.Event, error) { - plan, err := provisions.DecodePlan(value) + plan, err := meshprovisionerclient.DecodePlan(value) if err != nil { return nil, nil, err } diff --git a/modules/route-proxy/cmd/route-proxy/routes_test.go b/modules/route-proxy/cmd/route-proxy/routes_test.go index c92b9fc..d5554a5 100644 --- a/modules/route-proxy/cmd/route-proxy/routes_test.go +++ b/modules/route-proxy/cmd/route-proxy/routes_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/provisions" "route-proxy/contract" ) @@ -178,7 +178,7 @@ func TestAPlanEntryIsDialledAtTheMachinePortItCarries(t *testing.T) { if err != nil { t.Fatalf("%s: %v", c.name, err) } - value, err := provisions.EncodePlan(provisions.Plan{Node: c.node, Module: c.module, Plan: catalogue.Plan{ + value, err := meshprovisionerclient.EncodePlan(meshprovisionerclient.Plan{Node: c.node, Module: c.module, Plan: catalogue.Plan{ Provisions: []catalogue.PlanProvision{{Provision: contract.Provision, Provider: "anchor", ProviderModule: contract.Module, Contributed: contributed}}}}) if err != nil { diff --git a/modules/route-proxy/go.mod b/modules/route-proxy/go.mod index c385c6e..d44eae4 100644 --- a/modules/route-proxy/go.mod +++ b/modules/route-proxy/go.mod @@ -3,6 +3,8 @@ module route-proxy go 1.26.0 require ( + git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-20261105000000-000000000000 + git.novox.be/novox/mesh-contracts/provisioning/go/seats/meshprovisioner v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261104174359-05b3e2e1b94f github.com/nats-io/nats.go v1.54.0 golang.org/x/crypto v0.57.0