diff --git a/admin/cmd/main.go b/admin/cmd/main.go index 0c64aa6..02a2cc0 100644 --- a/admin/cmd/main.go +++ b/admin/cmd/main.go @@ -22,7 +22,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/paddle" - sharedmail "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + sharedmail "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" "github.com/joho/godotenv" ) diff --git a/admin/go.mod b/admin/go.mod index eba9c7f..f4f6e65 100644 --- a/admin/go.mod +++ b/admin/go.mod @@ -6,7 +6,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 github.com/joho/godotenv v1.5.1 - gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0-00010101000000-000000000000 + gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0-00010101000000-000000000000 github.com/redis/go-redis/v9 v9.20.1 go.mongodb.org/mongo-driver/v2 v2.8.0 golang.org/x/crypto v0.54.0 @@ -52,4 +52,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared diff --git a/admin/internal/api/checkout.go b/admin/internal/api/checkout.go index cb5c9ed..dfa976d 100644 --- a/admin/internal/api/checkout.go +++ b/admin/internal/api/checkout.go @@ -14,7 +14,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/licensing" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/paddle" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" diff --git a/admin/internal/api/customer.go b/admin/internal/api/customer.go index 8e82912..09f3c39 100644 --- a/admin/internal/api/customer.go +++ b/admin/internal/api/customer.go @@ -18,9 +18,9 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/licensing" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" diff --git a/admin/internal/api/members.go b/admin/internal/api/members.go index d27c7b9..f9c66a5 100644 --- a/admin/internal/api/members.go +++ b/admin/internal/api/members.go @@ -11,9 +11,9 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/cloudprov" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" diff --git a/admin/internal/api/people.go b/admin/internal/api/people.go index 66ff7ba..c3e2072 100644 --- a/admin/internal/api/people.go +++ b/admin/internal/api/people.go @@ -12,7 +12,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/cloudprov" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "github.com/gin-gonic/gin" "go.mongodb.org/mongo-driver/v2/bson" "golang.org/x/crypto/bcrypt" diff --git a/admin/internal/api/staff.go b/admin/internal/api/staff.go index 68c37e4..e8c66b1 100644 --- a/admin/internal/api/staff.go +++ b/admin/internal/api/staff.go @@ -15,9 +15,9 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/licensing" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" diff --git a/admin/internal/auth/customer.go b/admin/internal/auth/customer.go index d8e783b..fc70e54 100644 --- a/admin/internal/auth/customer.go +++ b/admin/internal/auth/customer.go @@ -14,7 +14,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - sharedmail "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + sharedmail "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" diff --git a/admin/internal/billing/cloudprovision.go b/admin/internal/billing/cloudprovision.go index f72729f..609a11e 100644 --- a/admin/internal/billing/cloudprovision.go +++ b/admin/internal/billing/cloudprovision.go @@ -11,8 +11,8 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/paddle" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/admin/internal/billing/deliver.go b/admin/internal/billing/deliver.go index 82b3d24..e6601d4 100644 --- a/admin/internal/billing/deliver.go +++ b/admin/internal/billing/deliver.go @@ -6,7 +6,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/inject" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" ) // deliver sends a freshly issued licence where it belongs. Cloud is injected; diff --git a/admin/internal/billing/subscription.go b/admin/internal/billing/subscription.go index 8d35654..29f1f06 100644 --- a/admin/internal/billing/subscription.go +++ b/admin/internal/billing/subscription.go @@ -12,7 +12,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/paddle" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/admin/internal/catalogue/catalogue.go b/admin/internal/catalogue/catalogue.go index f3f20d4..c6a7daf 100644 --- a/admin/internal/catalogue/catalogue.go +++ b/admin/internal/catalogue/catalogue.go @@ -14,7 +14,7 @@ import ( "fmt" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" ) var ( diff --git a/admin/internal/catalogue/items.go b/admin/internal/catalogue/items.go index c5af645..2bb1d52 100644 --- a/admin/internal/catalogue/items.go +++ b/admin/internal/catalogue/items.go @@ -5,7 +5,7 @@ import ( "fmt" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" ) // Item is one Paddle line item: a price and how many of it. diff --git a/admin/internal/cloudprov/cloudprov.go b/admin/internal/cloudprov/cloudprov.go index ed7c4a3..e9a2c39 100644 --- a/admin/internal/cloudprov/cloudprov.go +++ b/admin/internal/cloudprov/cloudprov.go @@ -16,8 +16,8 @@ import ( "fmt" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/admin/internal/inject/inject.go b/admin/internal/inject/inject.go index e9281ad..b951352 100644 --- a/admin/internal/inject/inject.go +++ b/admin/internal/inject/inject.go @@ -14,8 +14,8 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/admin/internal/licensing/issue.go b/admin/internal/licensing/issue.go index f040240..6e8c1f7 100644 --- a/admin/internal/licensing/issue.go +++ b/admin/internal/licensing/issue.go @@ -12,7 +12,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/catalogue" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/admin/internal/licensing/link.go b/admin/internal/licensing/link.go index 9d2c659..1cbd122 100644 --- a/admin/internal/licensing/link.go +++ b/admin/internal/licensing/link.go @@ -11,7 +11,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/paddle" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/admin/internal/lifecycle/lifecycle.go b/admin/internal/lifecycle/lifecycle.go index b628383..426d062 100644 --- a/admin/internal/lifecycle/lifecycle.go +++ b/admin/internal/lifecycle/lifecycle.go @@ -14,7 +14,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/admin/internal/mail/mail.go b/admin/internal/mail/mail.go index ca8af54..04c9358 100644 --- a/admin/internal/mail/mail.go +++ b/admin/internal/mail/mail.go @@ -7,7 +7,7 @@ // api, auth, billing and lifecycle. package mail -import "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" +import "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" // Default is admin's sender. Set once by main; read everywhere else. var Default mail.Sender diff --git a/admin/internal/models/backfill.go b/admin/internal/models/backfill.go index b6e9018..01ce4e1 100644 --- a/admin/internal/models/backfill.go +++ b/admin/internal/models/backfill.go @@ -8,8 +8,8 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" - sharedmodels "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" + sharedmodels "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/admin/internal/models/catalogue.go b/admin/internal/models/catalogue.go index 20c3b01..a9a8ee0 100644 --- a/admin/internal/models/catalogue.go +++ b/admin/internal/models/catalogue.go @@ -6,7 +6,7 @@ import ( "log" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo/options" ) diff --git a/admin/internal/models/entitlements.go b/admin/internal/models/entitlements.go index a0a798e..b6f3d74 100644 --- a/admin/internal/models/entitlements.go +++ b/admin/internal/models/entitlements.go @@ -6,7 +6,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" diff --git a/admin/internal/models/models.go b/admin/internal/models/models.go index 32aea0c..e270b80 100644 --- a/admin/internal/models/models.go +++ b/admin/internal/models/models.go @@ -9,7 +9,7 @@ import ( "encoding/json" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/admin/internal/models/plans.go b/admin/internal/models/plans.go index 3a2e5ce..790c981 100644 --- a/admin/internal/models/plans.go +++ b/admin/internal/models/plans.go @@ -5,7 +5,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/admin/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo/options" ) diff --git a/agent/go.mod b/agent/go.mod index 574dff1..161550b 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -9,11 +9,11 @@ require ( ) require ( - gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0 + gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0 golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.40.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/protobuf v1.34.1 // indirect ) -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared diff --git a/agent/internal/exec/exec.go b/agent/internal/exec/exec.go index 57dbe89..10221b3 100644 --- a/agent/internal/exec/exec.go +++ b/agent/internal/exec/exec.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) type streamWriter struct { diff --git a/agent/internal/grpc/client.go b/agent/internal/grpc/client.go index 9dacc85..1e68984 100644 --- a/agent/internal/grpc/client.go +++ b/agent/internal/grpc/client.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/codec" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/codec" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/agent/internal/inventory/collect_linux.go b/agent/internal/inventory/collect_linux.go index 3347544..d2bbeb0 100644 --- a/agent/internal/inventory/collect_linux.go +++ b/agent/internal/inventory/collect_linux.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) func collect(r *pb.InventoryReport, includeStatic bool) { diff --git a/agent/internal/inventory/collect_other.go b/agent/internal/inventory/collect_other.go index 4740b51..d66cc9a 100644 --- a/agent/internal/inventory/collect_other.go +++ b/agent/internal/inventory/collect_other.go @@ -7,6 +7,6 @@ // without it this file compiles on Linux too and collides with collect_linux.go. package inventory -import "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" +import "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" func collect(r *pb.InventoryReport, includeStatic bool) {} diff --git a/agent/internal/inventory/collect_windows.go b/agent/internal/inventory/collect_windows.go index a6583c0..5226592 100644 --- a/agent/internal/inventory/collect_windows.go +++ b/agent/internal/inventory/collect_windows.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) var ( diff --git a/agent/internal/inventory/inventory.go b/agent/internal/inventory/inventory.go index a1d5214..de5270b 100644 --- a/agent/internal/inventory/inventory.go +++ b/agent/internal/inventory/inventory.go @@ -1,6 +1,6 @@ package inventory -import "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" +import "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" func Collect(includeStatic bool) *pb.InventoryReport { r := &pb.InventoryReport{IncludeStatic: includeStatic, CPU: &pb.CPUReport{}, Memory: &pb.MemReport{}} diff --git a/agent/internal/monitors/monitors.go b/agent/internal/monitors/monitors.go index 62d6c63..5501e1d 100644 --- a/agent/internal/monitors/monitors.go +++ b/agent/internal/monitors/monitors.go @@ -9,7 +9,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/checker" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) const syncInterval = 30 * time.Second diff --git a/agent/internal/proxy/proxy.go b/agent/internal/proxy/proxy.go index 0d0cbc4..2d25cd0 100644 --- a/agent/internal/proxy/proxy.go +++ b/agent/internal/proxy/proxy.go @@ -14,7 +14,7 @@ import ( "strconv" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) const ( diff --git a/agent/internal/sync/packages.go b/agent/internal/sync/packages.go index c35bc55..4d3af8c 100644 --- a/agent/internal/sync/packages.go +++ b/agent/internal/sync/packages.go @@ -11,7 +11,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/packages" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // collectPackagesFlag is written by the 30s key poll and read by the hourly diff --git a/agent/internal/sync/sync.go b/agent/internal/sync/sync.go index 4f6d06d..cac3c9f 100644 --- a/agent/internal/sync/sync.go +++ b/agent/internal/sync/sync.go @@ -25,7 +25,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/monitors" agentproxy "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/proxy" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/updates" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) func Run(ctx context.Context, cfg *config.Config, version string) error { diff --git a/agent/internal/sync/workloads.go b/agent/internal/sync/workloads.go index e7b363a..5479a6d 100644 --- a/agent/internal/sync/workloads.go +++ b/agent/internal/sync/workloads.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/workloads" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // workloadInterval is the report cadence. Sixty seconds is affordable because diff --git a/docs/superpowers/plans/2026-08-24-status-pages.md b/docs/superpowers/plans/2026-08-24-status-pages.md index b009640..f4447ce 100644 --- a/docs/superpowers/plans/2026-08-24-status-pages.md +++ b/docs/superpowers/plans/2026-08-24-status-pages.md @@ -1600,7 +1600,7 @@ func PublicStatusSnapshot(instanceID, pageID string) (*StatusSnapshot, error) { } ``` -`Active()` and `Feature()` are methods on `services.LicenseState` (`server/internal/services/licence.go:31,34`), not fields. Import `"gitea.hostxtra.co.uk/mrhid6/vantage/shared/license"` for the feature constant. +`Active()` and `Feature()` are methods on `services.LicenseState` (`server/internal/services/licence.go:31,34`), not fields. Import `"gitea.hostxtra.co.uk/vantage/vantage-shared/license"` for the feature constant. - [ ] **Step 2: Implement the loader** @@ -2002,7 +2002,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/auth" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/gin-gonic/gin" ) diff --git a/docs/superpowers/plans/2026-09-07-control-plane-backup-restore.md b/docs/superpowers/plans/2026-09-07-control-plane-backup-restore.md index cbdfe49..08c06c0 100644 --- a/docs/superpowers/plans/2026-09-07-control-plane-backup-restore.md +++ b/docs/superpowers/plans/2026-09-07-control-plane-backup-restore.md @@ -19,7 +19,7 @@ - Archive `format_version` is `1`. - Restore batch size is 1000 documents, `ordered=false`. - Ciphertext-bearing collections, used verbatim in restore warnings: `keys`, `secrets`, `auth_providers`, `console_sessions`, `settings`. -- Every new Go module gets `replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared`, matching `server/go.mod:81`. +- Every new Go module gets `replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared`, matching `server/go.mod:81`. - Dockerfiles live at `/Dockerfile` and build from the repository root. - Tests that need MongoDB read `MONGO_TEST_URI` and call `t.Skip` when it is unset. Do not add testcontainers. - Commit after every task. Conventional commit prefixes (`feat:`, `test:`, `docs:`, `chore:`), no attribution lines. @@ -243,7 +243,7 @@ import ( "fmt" "os" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" ) // encryptionKey reads KEY_ENCRYPTION_KEY. The cipher itself lives in @@ -403,7 +403,7 @@ import ( "errors" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" ) // ErrNoKey is returned when no key was supplied at all. It is distinct from @@ -2448,7 +2448,7 @@ import ( "context" "testing" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" "go.mongodb.org/mongo-driver/v2/bson" ) @@ -2616,7 +2616,7 @@ import ( "context" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) @@ -2855,7 +2855,7 @@ module gitea.hostxtra.co.uk/mrhid6/vantage/vantagectl go 1.26 -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared MOD cd .. ``` @@ -3247,7 +3247,7 @@ import ( "testing" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" ) func TestArchiveNameIsSortableAndNamesTheDatabase(t *testing.T) { @@ -3329,7 +3329,7 @@ import ( "strings" "text/tabwriter" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" ) @@ -3416,7 +3416,7 @@ import ( "path/filepath" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" ) @@ -3661,7 +3661,7 @@ import ( "strings" "text/tabwriter" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" "golang.org/x/term" ) @@ -3796,7 +3796,7 @@ import ( "context" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/server/go.mod b/server/go.mod index 634aed2..986fc24 100644 --- a/server/go.mod +++ b/server/go.mod @@ -37,7 +37,7 @@ require ( ) require ( - gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0 + gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0 github.com/bytedance/sonic v1.11.6 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -78,4 +78,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared diff --git a/server/internal/api/licence.go b/server/internal/api/licence.go index 1f79474..c1a36c1 100644 --- a/server/internal/api/licence.go +++ b/server/internal/api/licence.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/auth" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/gin-gonic/gin" ) diff --git a/server/internal/api/publicstatus.go b/server/internal/api/publicstatus.go index f366805..1cd2c53 100644 --- a/server/internal/api/publicstatus.go +++ b/server/internal/api/publicstatus.go @@ -10,7 +10,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/auth" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/gin-gonic/gin" ) diff --git a/server/internal/api/statuspages.go b/server/internal/api/statuspages.go index d1b8fd1..1a80df4 100644 --- a/server/internal/api/statuspages.go +++ b/server/internal/api/statuspages.go @@ -7,7 +7,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/auth" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/gin-gonic/gin" ) diff --git a/server/internal/api/types.go b/server/internal/api/types.go index e94770f..1864282 100644 --- a/server/internal/api/types.go +++ b/server/internal/api/types.go @@ -4,7 +4,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" ) // ErrorResponse is the shape every failing endpoint answers with. Some also diff --git a/server/internal/grpc/proxystream.go b/server/internal/grpc/proxystream.go index 9c494ec..88b251f 100644 --- a/server/internal/grpc/proxystream.go +++ b/server/internal/grpc/proxystream.go @@ -5,7 +5,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/proxy" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/server/internal/grpc/server.go b/server/internal/grpc/server.go index ac9809f..a5792d3 100644 --- a/server/internal/grpc/server.go +++ b/server/internal/grpc/server.go @@ -10,8 +10,8 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/checker" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/services" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/codec" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/codec" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" diff --git a/server/internal/models/instance.go b/server/internal/models/instance.go index 2d5cc18..0d0ea0b 100644 --- a/server/internal/models/instance.go +++ b/server/internal/models/instance.go @@ -1,6 +1,6 @@ package models -import shared "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" +import shared "gitea.hostxtra.co.uk/vantage/vantage-shared/models" // Instance is defined in the shared module because sitesvc and the admin // control plane write the same documents. diff --git a/server/internal/models/settings.go b/server/internal/models/settings.go index 56621d0..a19aede 100644 --- a/server/internal/models/settings.go +++ b/server/internal/models/settings.go @@ -1,6 +1,6 @@ package models -import shared "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" +import shared "gitea.hostxtra.co.uk/vantage/vantage-shared/models" type ( Settings = shared.Settings diff --git a/server/internal/models/user.go b/server/internal/models/user.go index 5e005d2..997a1c4 100644 --- a/server/internal/models/user.go +++ b/server/internal/models/user.go @@ -1,6 +1,6 @@ package models -import shared "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" +import shared "gitea.hostxtra.co.uk/vantage/vantage-shared/models" type User = shared.User diff --git a/server/internal/notify/smtp.go b/server/internal/notify/smtp.go index ac80ab9..f04ce50 100644 --- a/server/internal/notify/smtp.go +++ b/server/internal/notify/smtp.go @@ -4,7 +4,7 @@ import ( "fmt" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" ) // dispatchSMTP delivers a state change over one channel's own SMTP settings. diff --git a/server/internal/notify/vuln.go b/server/internal/notify/vuln.go index 5e5b953..8cbbbff 100644 --- a/server/internal/notify/vuln.go +++ b/server/internal/notify/vuln.go @@ -4,7 +4,7 @@ import ( "fmt" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" ) // TypeVuln marks an event whose subject is a batch of new vulnerability diff --git a/server/internal/proxy/session.go b/server/internal/proxy/session.go index 373ff54..09d9a40 100644 --- a/server/internal/proxy/session.go +++ b/server/internal/proxy/session.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) const ( diff --git a/server/internal/services/audit_retention.go b/server/internal/services/audit_retention.go index a57ed6e..aa458fe 100644 --- a/server/internal/services/audit_retention.go +++ b/server/internal/services/audit_retention.go @@ -6,7 +6,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/auth_provider.go b/server/internal/services/auth_provider.go index 2387a07..720dc06 100644 --- a/server/internal/services/auth_provider.go +++ b/server/internal/services/auth_provider.go @@ -11,7 +11,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - shared "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + shared "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" diff --git a/server/internal/services/consoleproxy.go b/server/internal/services/consoleproxy.go index fb481df..84adab1 100644 --- a/server/internal/services/consoleproxy.go +++ b/server/internal/services/consoleproxy.go @@ -13,7 +13,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/bus" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/proxy" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // ErrAgentOffline means the console cannot be opened because the target's agent diff --git a/server/internal/services/coreindexes.go b/server/internal/services/coreindexes.go index 8a51797..bcdab9d 100644 --- a/server/internal/services/coreindexes.go +++ b/server/internal/services/coreindexes.go @@ -5,7 +5,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/indexes" + "gitea.hostxtra.co.uk/vantage/vantage-shared/indexes" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" diff --git a/server/internal/services/crypto.go b/server/internal/services/crypto.go index dff6e7d..d7433fa 100644 --- a/server/internal/services/crypto.go +++ b/server/internal/services/crypto.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" ) // encryptionKey reads KEY_ENCRYPTION_KEY. The cipher itself lives in diff --git a/server/internal/services/defaults.go b/server/internal/services/defaults.go index 0bbd908..fe28e04 100644 --- a/server/internal/services/defaults.go +++ b/server/internal/services/defaults.go @@ -7,7 +7,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo/options" diff --git a/server/internal/services/dispatch.go b/server/internal/services/dispatch.go index 43cb0b4..9773942 100644 --- a/server/internal/services/dispatch.go +++ b/server/internal/services/dispatch.go @@ -11,7 +11,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/bus" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "github.com/google/uuid" ) diff --git a/server/internal/services/instances.go b/server/internal/services/instances.go index e4eb13c..c07a8dc 100644 --- a/server/internal/services/instances.go +++ b/server/internal/services/instances.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/server/internal/services/inventory.go b/server/internal/services/inventory.go index dd9bb96..68411e4 100644 --- a/server/internal/services/inventory.go +++ b/server/internal/services/inventory.go @@ -5,7 +5,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/licence.go b/server/internal/services/licence.go index 2e4a9d5..78306c8 100644 --- a/server/internal/services/licence.go +++ b/server/internal/services/licence.go @@ -9,7 +9,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/licence_limits.go b/server/internal/services/licence_limits.go index 101f84d..39f7597 100644 --- a/server/internal/services/licence_limits.go +++ b/server/internal/services/licence_limits.go @@ -6,7 +6,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/packages.go b/server/internal/services/packages.go index ff099f6..c70e88c 100644 --- a/server/internal/services/packages.go +++ b/server/internal/services/packages.go @@ -6,7 +6,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" diff --git a/server/internal/services/reap.go b/server/internal/services/reap.go index 8a2851c..0c14523 100644 --- a/server/internal/services/reap.go +++ b/server/internal/services/reap.go @@ -8,7 +8,7 @@ import ( "time" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/statussnapshot.go b/server/internal/services/statussnapshot.go index 608cdae..ab22ce1 100644 --- a/server/internal/services/statussnapshot.go +++ b/server/internal/services/statussnapshot.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/server/internal/services/stepresults.go b/server/internal/services/stepresults.go index 567a9ef..4b4bba6 100644 --- a/server/internal/services/stepresults.go +++ b/server/internal/services/stepresults.go @@ -6,7 +6,7 @@ import ( "log" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/bus" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // Step results travel back over the bus for the same reason commands travel out diff --git a/server/internal/services/users.go b/server/internal/services/users.go index 4adf494..4b307f0 100644 --- a/server/internal/services/users.go +++ b/server/internal/services/users.go @@ -10,7 +10,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/provision" + "gitea.hostxtra.co.uk/vantage/vantage-shared/provision" "go.mongodb.org/mongo-driver/v2/bson" "golang.org/x/crypto/bcrypt" ) diff --git a/server/internal/services/vulnrules.go b/server/internal/services/vulnrules.go index f6f0e7a..6fe5edf 100644 --- a/server/internal/services/vulnrules.go +++ b/server/internal/services/vulnrules.go @@ -10,7 +10,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/notify" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/server/internal/services/workflow_runner.go b/server/internal/services/workflow_runner.go index 46c4bcf..ba3a16d 100644 --- a/server/internal/services/workflow_runner.go +++ b/server/internal/services/workflow_runner.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/server/internal/services/workloadresults.go b/server/internal/services/workloadresults.go index f0814ba..778c198 100644 --- a/server/internal/services/workloadresults.go +++ b/server/internal/services/workloadresults.go @@ -6,7 +6,7 @@ import ( "log" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/bus" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // Workload results travel back over the bus for the same reason commands travel diff --git a/server/internal/services/workloads.go b/server/internal/services/workloads.go index 71ecef5..f99dbf4 100644 --- a/server/internal/services/workloads.go +++ b/server/internal/services/workloads.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/db" "gitea.hostxtra.co.uk/mrhid6/vantage/server/internal/models" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/shared/backup/fingerprint.go b/shared/backup/fingerprint.go index 5437653..2d65d94 100644 --- a/shared/backup/fingerprint.go +++ b/shared/backup/fingerprint.go @@ -11,7 +11,7 @@ import ( "errors" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" ) // ErrNoKey is returned when no key was supplied at all. It is distinct from diff --git a/shared/backup/verify.go b/shared/backup/verify.go index e32bf92..043f603 100644 --- a/shared/backup/verify.go +++ b/shared/backup/verify.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/shared/backup/verify_test.go b/shared/backup/verify_test.go index a0a63c8..b5c68eb 100644 --- a/shared/backup/verify_test.go +++ b/shared/backup/verify_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/cryptobox" + "gitea.hostxtra.co.uk/vantage/vantage-shared/cryptobox" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/shared/cmd/lkctl/main.go b/shared/cmd/lkctl/main.go index 1c8b419..c83d67e 100644 --- a/shared/cmd/lkctl/main.go +++ b/shared/cmd/lkctl/main.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/license" + "gitea.hostxtra.co.uk/vantage/vantage-shared/license" "github.com/google/uuid" "github.com/hyperboloide/lk" ) diff --git a/shared/go.mod b/shared/go.mod index 9a96cc9..d4b6409 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -1,4 +1,4 @@ -module gitea.hostxtra.co.uk/mrhid6/vantage/shared +module gitea.hostxtra.co.uk/vantage/vantage-shared go 1.26 diff --git a/shared/provision/instance.go b/shared/provision/instance.go index d4c6d8f..96be785 100644 --- a/shared/provision/instance.go +++ b/shared/provision/instance.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" diff --git a/shared/provision/user.go b/shared/provision/user.go index d634688..c0da2e7 100644 --- a/shared/provision/user.go +++ b/shared/provision/user.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/models" + "gitea.hostxtra.co.uk/vantage/vantage-shared/models" "github.com/google/uuid" "go.mongodb.org/mongo-driver/v2/mongo" "golang.org/x/crypto/bcrypt" diff --git a/sitesvc/cmd/main.go b/sitesvc/cmd/main.go index 13923ae..d597ed9 100644 --- a/sitesvc/cmd/main.go +++ b/sitesvc/cmd/main.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" "gitea.hostxtra.co.uk/mrhid6/vantage/sitesvc/internal/api" + "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" "github.com/joho/godotenv" ) diff --git a/sitesvc/go.mod b/sitesvc/go.mod index 4b36c21..6e8fb77 100644 --- a/sitesvc/go.mod +++ b/sitesvc/go.mod @@ -4,6 +4,6 @@ go 1.26 require github.com/joho/godotenv v1.5.1 -require gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0 +require gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0 -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared diff --git a/sitesvc/internal/api/api.go b/sitesvc/internal/api/api.go index e2fc0a7..7db0cc0 100644 --- a/sitesvc/internal/api/api.go +++ b/sitesvc/internal/api/api.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/mail" + "gitea.hostxtra.co.uk/vantage/vantage-shared/mail" ) const ( diff --git a/vantagectl/go.mod b/vantagectl/go.mod index 761d620..3269aa8 100644 --- a/vantagectl/go.mod +++ b/vantagectl/go.mod @@ -2,10 +2,10 @@ module gitea.hostxtra.co.uk/mrhid6/vantage/vantagectl go 1.26 -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared require ( - gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0-00010101000000-000000000000 + gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0-00010101000000-000000000000 github.com/spf13/cobra v1.10.2 go.mongodb.org/mongo-driver/v2 v2.8.0 golang.org/x/term v0.45.0 diff --git a/vantagectl/internal/cmd/backup.go b/vantagectl/internal/cmd/backup.go index c70ffdc..a4ecd5c 100644 --- a/vantagectl/internal/cmd/backup.go +++ b/vantagectl/internal/cmd/backup.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" ) diff --git a/vantagectl/internal/cmd/inspect.go b/vantagectl/internal/cmd/inspect.go index 5f6580b..29f2284 100644 --- a/vantagectl/internal/cmd/inspect.go +++ b/vantagectl/internal/cmd/inspect.go @@ -6,7 +6,7 @@ import ( "strings" "text/tabwriter" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" ) diff --git a/vantagectl/internal/cmd/inspect_test.go b/vantagectl/internal/cmd/inspect_test.go index a6bed5a..0b1d837 100644 --- a/vantagectl/internal/cmd/inspect_test.go +++ b/vantagectl/internal/cmd/inspect_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" ) func TestArchiveNameIsSortableAndNamesTheDatabase(t *testing.T) { diff --git a/vantagectl/internal/cmd/restore.go b/vantagectl/internal/cmd/restore.go index a74d452..b42a718 100644 --- a/vantagectl/internal/cmd/restore.go +++ b/vantagectl/internal/cmd/restore.go @@ -10,7 +10,7 @@ import ( "strings" "text/tabwriter" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/vantagectl/internal/cmd/verify.go b/vantagectl/internal/cmd/verify.go index d1a55c8..ac2017e 100644 --- a/vantagectl/internal/cmd/verify.go +++ b/vantagectl/internal/cmd/verify.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" "github.com/spf13/cobra" "go.mongodb.org/mongo-driver/v2/mongo" ) diff --git a/vantagectl/internal/cmd/verify_test.go b/vantagectl/internal/cmd/verify_test.go index 72e66e3..c0d5180 100644 --- a/vantagectl/internal/cmd/verify_test.go +++ b/vantagectl/internal/cmd/verify_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/backup" + "gitea.hostxtra.co.uk/vantage/vantage-shared/backup" ) const testKeyHex = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"