chore: remove cenkalti/backoff dependency

paralin · paralin · commit 45a9bf2b1e2f · 2024-12-23T01:22:47.000-08:00
Signed-off-by: Christian Stewart &lt;christian@aperture.us&gt;
diff --git a/controller/loader/dir-exec-controller.go b/controller/loader/dir-exec-controller.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/cenkalti/backoff/v4"
+	"github.com/aperturerobotics/util/backoff/cbackoff"
 )
 
 // execController implements the ExecController directive.
diff --git a/controller/loader/directive.go b/controller/loader/directive.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/cenkalti/backoff/v4"
+	"github.com/aperturerobotics/util/backoff/cbackoff"
 )
 
 // ExecController is a directive indicating a controller instance should be
diff --git a/controller/loader/loader-resolve.go b/controller/loader/loader-resolve.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/cenkalti/backoff/v4"
+	"github.com/aperturerobotics/util/backoff/cbackoff"
 	"github.com/pkg/errors"
 )
 
diff --git a/controller/resolver/dir-load-controller.go b/controller/resolver/dir-load-controller.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	loader "github.com/aperturerobotics/controllerbus/controller/loader"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/cenkalti/backoff/v4"
+	"github.com/aperturerobotics/util/backoff/cbackoff"
 )
 
 // LoadControllerWithConfig is a directive indicating a controller should be
diff --git a/directive/resolver-retry.go b/directive/resolver-retry.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/cenkalti/backoff/v4"
+	"github.com/aperturerobotics/util/backoff/cbackoff"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/example/plugin-demo/go.mod b/example/plugin-demo/go.mod
@@ -24,7 +24,7 @@ require (
 
 require (
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/aperturerobotics/util/backoff/cbackoff v4.3.0 // indirect
 	github.com/coder/websocket v1.8.13-0.20240912160150-6c8e3ab3985f // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
diff --git a/example/plugin-demo/go.sum b/example/plugin-demo/go.sum
@@ -12,8 +12,8 @@ github.com/aperturerobotics/util v1.27.0 h1:nNFFOQo1NcSfcMPjnzoqxOd7EXdTzLiCNugO
 github.com/aperturerobotics/util v1.27.0/go.mod h1:8u36NK8OBQM2qxoRU7VVCfiiP5EJ+oV3gHsmnhQoPEY=
 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/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/aperturerobotics/util/backoff/cbackoff v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/aperturerobotics/util/backoff/cbackoff v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/coder/websocket v1.8.13-0.20240912160150-6c8e3ab3985f h1:izqVn8o6O+hpoOHPHOtegczwcT4wyHk1gsa6hw3vFow=
 github.com/coder/websocket v1.8.13-0.20240912160150-6c8e3ab3985f/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
diff --git a/go.mod b/go.mod
@@ -10,17 +10,15 @@ replace github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.
 replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
 
 require (
-	github.com/aperturerobotics/common v0.20.2 // latest
+	github.com/aperturerobotics/common v0.20.3 // latest
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.8.0 // latest
-	github.com/aperturerobotics/starpc v0.36.0 // latest
-	github.com/aperturerobotics/util v1.27.0 // latest
+	github.com/aperturerobotics/starpc v0.36.1 // latest
+	github.com/aperturerobotics/util v1.27.1-0.20241223092029-6516a0f31e0f // latest
 )
 
 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/cenkalti/backoff/v4 v4.3.0
-	github.com/cenkalti/backoff/v5 v5.0.0
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/mr-tron/base58 v1.2.0
@@ -42,7 +40,7 @@ require (
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-libp2p v0.37.2 // indirect
+	github.com/libp2p/go-libp2p v0.38.1 // indirect
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240826150533-e92055b23e0e // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -1,20 +1,17 @@
-github.com/aperturerobotics/common v0.20.2 h1:qUdAn4JyCqLnxX/Pqi83L+GJ48JFUC4BcasepciKaQE=
-github.com/aperturerobotics/common v0.20.2/go.mod h1:S2yc+bp5PoLn0PHOAt+XXGsC50sA0MU9GF3q6FyEs9U=
+github.com/aperturerobotics/common v0.20.3 h1:pzcwAbLdyC4sgHOquGTkwK1ww/LlPscxiNpJ3u0Upg8=
+github.com/aperturerobotics/common v0.20.3/go.mod h1:S2yc+bp5PoLn0PHOAt+XXGsC50sA0MU9GF3q6FyEs9U=
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 h1:So9JeziaWKx2Fw8sK4AUN/szqKtJ0jEMhS6bU4sHbxs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008/go.mod h1:snaApCEDtrHHP6UWSLKiYNOZU9A5NyzccKenx9oZEzg=
 github.com/aperturerobotics/protobuf-go-lite v0.8.0 h1:SoiTAVArmOrNTX31e6CC5Bem6HuOElg3YYNhp4AAPQc=
 github.com/aperturerobotics/protobuf-go-lite v0.8.0/go.mod h1:y49wVEezRHg78uQ2OzLLZbtTTWuox+ChmaTuh6FLJW8=
-github.com/aperturerobotics/starpc v0.36.0 h1:HAJe6X6OZ+JPyq9jcSwlVo7utuMbXQD0kxLl2e7xmz4=
-github.com/aperturerobotics/starpc v0.36.0/go.mod h1:2wM79xmfJZrrXMgYxcteg7vLxhqSambS79+o159KGRI=
-github.com/aperturerobotics/util v1.27.0 h1:nNFFOQo1NcSfcMPjnzoqxOd7EXdTzLiCNugOm9aarHc=
-github.com/aperturerobotics/util v1.27.0/go.mod h1:8u36NK8OBQM2qxoRU7VVCfiiP5EJ+oV3gHsmnhQoPEY=
+github.com/aperturerobotics/starpc v0.36.1 h1:10z0U0gPsXbT6eHGExa/oblWwWSC4yO39T6fdDpsKL4=
+github.com/aperturerobotics/starpc v0.36.1/go.mod h1:VOTQt8NRyo+HbcTpf+YAonYU4gofyPZyYsX/B9NUpj8=
+github.com/aperturerobotics/util v1.27.1-0.20241223092029-6516a0f31e0f h1:4HCrLbBq5U0qeyrwZ8E8jBT4aqgcfF4cOW5ZcVNuK1U=
+github.com/aperturerobotics/util v1.27.1-0.20241223092029-6516a0f31e0f/go.mod h1:LBu2EYRAofsaf9qZuVX7+w4n+TbWO4KC7etGnYCrNRA=
 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/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
-github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cenkalti/backoff/v5 v5.0.0/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
 github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/aperturerobotics/controllerbus/config"`
`7`	`7`	`"github.com/aperturerobotics/controllerbus/controller"`
`8`	`8`	`"github.com/aperturerobotics/controllerbus/directive"`
`9`		`- "github.com/cenkalti/backoff/v4"`
	`9`	`+ "github.com/aperturerobotics/util/backoff/cbackoff"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// execController implements the ExecController directive.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/aperturerobotics/controllerbus/config"`
`7`	`7`	`loader "github.com/aperturerobotics/controllerbus/controller/loader"`
`8`	`8`	`"github.com/aperturerobotics/controllerbus/directive"`
`9`		`- "github.com/cenkalti/backoff/v4"`
	`9`	`+ "github.com/aperturerobotics/util/backoff/cbackoff"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// LoadControllerWithConfig is a directive indicating a controller should be`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/cenkalti/backoff/v4"`
	`7`	`+ "github.com/aperturerobotics/util/backoff/cbackoff"`
`8`	`8`	`"github.com/sirupsen/logrus"`
`9`	`9`	`)`
`10`	`10`