Migrate tfgrid-sdk-go/rmb-sdk-go -> zos_sdk_go/rmb-sdk-go@v0.18.0

ashraffouda · claude · ashraffouda · commit f48234aefa54 · 2026-07-13T17:04:14.000+02:00
Repoint the rmb-sdk-go dependency to the renamed module path (imports gofmt'd,
go.mod/go.sum). go build ./... passes. Removes the last redirect dependency in
zos_base and clears the transitive tfgrid-sdk-go leftover for downstream consumers.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/client/node.go b/client/node.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"net"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
 	"github.com/threefoldtech/zos_base/pkg"
 	"github.com/threefoldtech/zos_base/pkg/capacity/dmi"
 	"github.com/threefoldtech/zos_base/pkg/diagnostics"
 	"github.com/threefoldtech/zos_base/pkg/gridtypes"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go"
 )
 
 // NodeClient struct
diff --git a/client/node_test.go b/client/node_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go"
 )
 
 func ExampleClient() {
diff --git a/go.mod b/go.mod
@@ -31,7 +31,6 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gtank/merlin v0.1.1
-	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
 	github.com/hasura/go-graphql-client v0.10.0
 	github.com/jbenet/go-base58 v0.0.0-20150317085156-6237cf65f3a6
 	github.com/joncrlsn/dque v0.0.0-20200702023911-3e80e3146ce5
@@ -47,8 +46,8 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56
 	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00
-	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6
 	github.com/threefoldtech/zbus v1.0.1
+	github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0
 	github.com/tyler-smith/go-bip39 v1.1.0
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
@@ -79,6 +78,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/sys/signal v0.7.0 // indirect
 	github.com/moby/sys/user v0.3.0 // indirect
diff --git a/go.sum b/go.sum
@@ -499,10 +499,10 @@ github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56 h1:uWd8JfE8N3
 github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56/go.mod h1:lZjR32SiNo3dP70inVFxaLMyZjmKX1ucS+5O31dbPNM=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6 h1:ymL6+ML2IIeMe+D6FVJkflRu7GFcDjWDE0tAIpjnSwA=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6/go.mod h1:LcdG5CnhtSHy1zuk3IeG8Fym78H55ZSngs8jxLmYPAU=
 github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk=
 github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
+github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0 h1:CD8/yd0pAZINF93PHDODn2e+M6d5f6x6ECfpQac4kgw=
+github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0/go.mod h1:OI3omGvjs88MXvOKSfYULhxweQWSz6jvQuUHDTI98gw=
 github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
diff --git a/pkg/zos_api/deployment.go b/pkg/zos_api/deployment.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zos_base/pkg/gridtypes"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) deploymentDeployHandler(ctx context.Context, payload []byte) (interface{}, error) {
diff --git a/pkg/zos_api/middlewares.go b/pkg/zos_api/middlewares.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/rs/zerolog/log"
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 
 	"github.com/threefoldtech/zos_base/pkg/environment"
 )
diff --git a/pkg/zos_api/network.go b/pkg/zos_api/network.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zos_base/pkg/gridtypes"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) networkListWGPortsHandler(ctx context.Context, payload []byte) (interface{}, error) {
diff --git a/pkg/zos_api/routes.go b/pkg/zos_api/routes.go
@@ -1,7 +1,7 @@
 package zosapi
 
 import (
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) SetupRoutes(router *peer.Router) {
diff --git a/pkg/zos_api_light/deployment.go b/pkg/zos_api_light/deployment.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) deploymentDeployHandler(ctx context.Context, payload []byte) (interface{}, error) {
diff --git a/pkg/zos_api_light/middlewares.go b/pkg/zos_api_light/middlewares.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/rs/zerolog/log"
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) authorized(ctx context.Context, _ []byte) (context.Context, error) {
diff --git a/pkg/zos_api_light/network.go b/pkg/zos_api_light/network.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) networkInterfacesHandler(ctx context.Context, payload []byte) (interface{}, error) {
diff --git a/pkg/zos_api_light/routes.go b/pkg/zos_api_light/routes.go
@@ -1,7 +1,7 @@
 package zosapi
 
 import (
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 func (g *ZosAPI) SetupRoutes(router *peer.Router) {
diff --git a/scripts/qsfs/main.go b/scripts/qsfs/main.go
@@ -13,10 +13,10 @@ import (
 	"time"
 
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zos_base/client"
 	"github.com/threefoldtech/zos_base/pkg/gridtypes"
 	"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"`
	`7`	`+ "github.com/threefoldtech/zos_sdk_go/rmb-sdk-go"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func ExampleClient() {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`	`7`
`8`		`- "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"`
`9`	`8`	`"github.com/threefoldtech/zos_base/pkg/gridtypes"`
	`9`	`+ "github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func (g *ZosAPI) deploymentDeployHandler(ctx context.Context, payload []byte) (interface{}, error) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`
`7`	`7`	`"github.com/rs/zerolog/log"`
`8`		`- "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"`
	`8`	`+ "github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"`
`9`	`9`
`10`	`10`	`"github.com/threefoldtech/zos_base/pkg/environment"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"net"`
`8`	`8`
`9`		`- "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"`
`10`	`9`	`"github.com/threefoldtech/zos_base/pkg/gridtypes"`
	`10`	`+ "github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func (g *ZosAPI) networkListWGPortsHandler(ctx context.Context, payload []byte) (interface{}, error) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package zosapi`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"`
	`4`	`+ "github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func (g ZosAPI) SetupRoutes(router peer.Router) {`