refactor: use blang/semver v4

Signed-off-by: Christian Stewart <[email protected]>
aperturerobotics · Aug 2, 2024 · 7299509 · 7299509
1 parent 3807bd3
commit 7299509
Show file tree

Hide file tree

Showing 54 changed files with 121 additions and 139 deletions.
diff --git a/daemon/api/controller/controller.go b/daemon/api/controller/controller.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/daemon/api/controller/factory.go b/daemon/api/controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the API controller.

diff --git a/entitygraph/controller.go b/entitygraph/controller.go
@@ -3,7 +3,7 @@ package bifrost_entitygraph
 import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/entitygraph/reporter"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Version is the version of the controller implementation.

diff --git a/entitygraph/factory.go b/entitygraph/factory.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
 	rctr "github.com/aperturerobotics/entitygraph/reporter/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a EntityGraph reporter controller.

diff --git a/examples/nats-host/main.go b/examples/nats-host/main.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 

diff --git a/examples/nats-host/nats-single/main.go b/examples/nats-host/nats-single/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 

diff --git a/go.mod b/go.mod
@@ -4,11 +4,11 @@ go 1.22
 
 require (
 	github.com/aperturerobotics/common v0.18.3 // latest
-	github.com/aperturerobotics/controllerbus v0.47.2 // latest
-	github.com/aperturerobotics/entitygraph v0.9.1 // latest
+	github.com/aperturerobotics/controllerbus v0.47.3 // latest
+	github.com/aperturerobotics/entitygraph v0.10.0 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.6.5 // latest
 	github.com/aperturerobotics/starpc v0.33.6 // latest
-	github.com/aperturerobotics/util v1.25.7-0.20240802075949-372f05d3a13f // latest
+	github.com/aperturerobotics/util v1.25.7 // latest
 )
 
 // aperture: use compatibility forks
@@ -28,7 +28,6 @@ replace (
 
 require (
 	filippo.io/edwards25519 v1.1.1-0.20231210192602-a7dfd8e4e6b4
-	github.com/blang/semver v3.5.1+incompatible
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/klauspost/compress v1.17.9
 	github.com/libp2p/go-libp2p v0.35.4
@@ -53,6 +52,8 @@ require (
 	nhooyr.io/websocket v1.8.11 // master
 )
 
+require github.com/blang/semver/v4 v4.0.0
+
 require (
 	github.com/aperturerobotics/json-iterator-lite v1.0.0 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect

diff --git a/go.sum b/go.sum
@@ -6,10 +6,10 @@ github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2d
 github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2df0c151f/go.mod h1:kIcZtLpq4UIZzOqduYLm1mYU1nuMBtN6XuDCtQ21QT8=
 github.com/aperturerobotics/common v0.18.3 h1:DicdT7Yi9xlHMgJOiH1ypkRGt/TOctWWgVfdgh4p+H4=
 github.com/aperturerobotics/common v0.18.3/go.mod h1:qLWqm2T9MQmxDtE1ddNdWCHnUj1Z66GzNxllkZ3Fj7Y=
-github.com/aperturerobotics/controllerbus v0.47.2 h1:BKPoRY5FRhS0AWTe0DgpsyvKy+invnFgC8ZHSuz8W9M=
-github.com/aperturerobotics/controllerbus v0.47.2/go.mod h1:bbLYOlppStRVjtRbbXSB72W4aFrPMKx7oUb814A8/dI=
-github.com/aperturerobotics/entitygraph v0.9.1 h1:bCl0Q9N1hkQnOtdCYz7pNSYqH+5CY3EUCuD19dQmJeI=
-github.com/aperturerobotics/entitygraph v0.9.1/go.mod h1:40VoNXSslWQieSS4V3HyzqOOZnRiGxItj/qZYSHg8Rw=
+github.com/aperturerobotics/controllerbus v0.47.3 h1:aAV3V2AtNB9QPZLVt0EXFrDtx7b6wJY1Dn6tvDqTSBQ=
+github.com/aperturerobotics/controllerbus v0.47.3/go.mod h1:xC8DSXk0J5Q/Cc5G4MxAlseJEuJpoeuld6R44lYw074=
+github.com/aperturerobotics/entitygraph v0.10.0 h1:fotjtv+XWqWA6LbIrGsjiP/FLa/QdROfQ1/URAH2zhE=
+github.com/aperturerobotics/entitygraph v0.10.0/go.mod h1:wg3nnABfmWPasK0FZzwU2lSq3CD6bvDHf8eEqHrDuBc=
 github.com/aperturerobotics/go-libp2p v0.33.1-0.20240511223728-e0b67c111765 h1:KTSK6vPrh6gaT6CH0G2yAnmlcdjsc9Bk5JCqSeePrUw=
 github.com/aperturerobotics/go-libp2p v0.33.1-0.20240511223728-e0b67c111765/go.mod h1:/TIElEA8TzmHQTgGJQyzg0zHNZRCMYbdKyOsKwn9i6E=
 github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 h1:S9prTCDvkYfJ9ATV+B1yoNESE5w5dbFM5GmriXRG0Lk=
@@ -28,10 +28,10 @@ github.com/aperturerobotics/quic-go v0.45.1-0.20240802054753-f83427ffc2c6 h1:MZN
 github.com/aperturerobotics/quic-go v0.45.1-0.20240802054753-f83427ffc2c6/go.mod h1:X095EBMI8M7riYQRvUgegHFkEkgM2QKLvyGHyAcOw/Q=
 github.com/aperturerobotics/starpc v0.33.6 h1:noc/MnmIMTek9bdEvd88QiD1p9KzEV8CUOBIoKmGgm0=
 github.com/aperturerobotics/starpc v0.33.6/go.mod h1:4IYcbulEzqhPT5jKaDeL1BJPFd8WVWZ7Ugu0/348/Is=
-github.com/aperturerobotics/util v1.25.7-0.20240802075949-372f05d3a13f h1:YIqFbDLHyly/Nmwo0+EYA/W8YEkopcMHDWhih0BNajw=
-github.com/aperturerobotics/util v1.25.7-0.20240802075949-372f05d3a13f/go.mod h1:DdflF5HvWF01S4MNnSV9O5LR0SGajkx0wDIiXTsNtFc=
-github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/aperturerobotics/util v1.25.7 h1:e9fdF3W/E7IHdl7YAJC0jjuxGph7yzE3a5zZoLFJ3G0=
+github.com/aperturerobotics/util v1.25.7/go.mod h1:G5ybyxaL62Rdv0K5ZGqu+D1NfqlZCLYPQhdfiYhxlAg=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=

diff --git a/http/listener/factory.go b/http/listener/factory.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs the http listener

diff --git a/http/listener/listener.go b/http/listener/listener.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/http/mock-handler_test.go b/http/mock-handler_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/aperturerobotics/bifrost/testbed"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 var mockBody = []byte("hello world")

diff --git a/link/establish/controller.go b/link/establish/controller.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/link/establish/factory.go b/link/establish/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a Link establish controller.

diff --git a/link/hold-open/controller.go b/link/hold-open/controller.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/link/hold-open/factory.go b/link/hold-open/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a Link Hold-Open controller.

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aptre/common": "^0.18.0",
+    "@aptre/common": "^0.18.3",
     "depcheck": "^1.4.6",
     "prettier": "^3.1.1",
     "rimraf": "^6.0.0",

diff --git a/peer/controller/controller.go b/peer/controller/controller.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/bifrost/peer"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/peer/controller/factory.go b/peer/controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a Peer controller.

diff --git a/pubsub/floodsub/controller/controller.go b/pubsub/floodsub/controller/controller.go
@@ -2,7 +2,7 @@ package floodsub_controller
 
 import (
 	pubsub_controller "github.com/aperturerobotics/bifrost/pubsub/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Version is the version of the controller implementation.

diff --git a/pubsub/floodsub/controller/factory.go b/pubsub/floodsub/controller/factory.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/pubsub/nats/controller/controller.go b/pubsub/nats/controller/controller.go
@@ -2,7 +2,7 @@ package nats_controller
 
 import (
 	pubsub_controller "github.com/aperturerobotics/bifrost/pubsub/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Version is the version of the controller implementation.

diff --git a/pubsub/nats/controller/factory.go b/pubsub/nats/controller/factory.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/pubsub/relay/controller.go b/pubsub/relay/controller.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/pubsub/relay/factory.go b/pubsub/relay/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a pubsub relay controller.

diff --git a/rpc/access/access_test.go b/rpc/access/access_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/core"
 	"github.com/aperturerobotics/starpc/echo"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/rpc/rpc-service-controller_test.go b/rpc/rpc-service-controller_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/starpc/echo"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/signaling/echo/echo.go b/signaling/echo/echo.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Version is the version of the controller.

diff --git a/signaling/rpc/client/controller.go b/signaling/rpc/client/controller.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/directive"
 	"github.com/aperturerobotics/util/ccontainer"
 	"github.com/aperturerobotics/util/keyed"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	cbackoff "github.com/cenkalti/backoff"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

diff --git a/signaling/rpc/client/factory.go b/signaling/rpc/client/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a Signaling RPC Client.

diff --git a/signaling/rpc/server/controller.go b/signaling/rpc/server/controller.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/signaling/rpc/server/factory.go b/signaling/rpc/server/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a WebSocket transport.

diff --git a/stream/api/accept/factory.go b/stream/api/accept/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the accept controller.

diff --git a/stream/echo/factory.go b/stream/echo/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the echo controller.

diff --git a/stream/forwarding/factory.go b/stream/forwarding/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the forwarding controller.

diff --git a/stream/listening/factory.go b/stream/listening/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the listening controller.

diff --git a/stream/relay/factory.go b/stream/relay/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the relay controller.

diff --git a/stream/srpc/client/controller/controller.go b/stream/srpc/client/controller/controller.go
@@ -6,7 +6,7 @@ import (
 	stream_srpc_client "github.com/aperturerobotics/bifrost/stream/srpc/client"
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/stream/srpc/client/controller/factory.go b/stream/srpc/client/controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a controller factory.

diff --git a/stream/srpc/srpc_test.go b/stream/srpc/srpc_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/aperturerobotics/bifrost/transport/inproc"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/starpc/echo"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )