From f48234aefa54ff0f089f7c6cd8a6a76e7fd48e13 Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Mon, 13 Jul 2026 17:04:14 +0200 Subject: [PATCH 1/2] Migrate tfgrid-sdk-go/rmb-sdk-go -> zos_sdk_go/rmb-sdk-go@v0.18.0 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) --- client/node.go | 2 +- client/node_test.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- pkg/zos_api/deployment.go | 2 +- pkg/zos_api/middlewares.go | 2 +- pkg/zos_api/network.go | 2 +- pkg/zos_api/routes.go | 2 +- pkg/zos_api_light/deployment.go | 2 +- pkg/zos_api_light/middlewares.go | 2 +- pkg/zos_api_light/network.go | 2 +- pkg/zos_api_light/routes.go | 2 +- scripts/qsfs/main.go | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/node.go b/client/node.go index 55d38080..281a169c 100644 --- 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 index 1fa9f121..845dda5b 100644 --- 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 index 0438b1c4..f673cb92 100644 --- 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 index 752940e4..32a4871f 100644 --- 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 index d6b4f41c..293dafcf 100644 --- 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 index 122856bf..426b7725 100644 --- 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 index b72a2625..c308906e 100644 --- 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 index abd6772d..1460645c 100644 --- 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 index d9f72c93..c600779d 100644 --- 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 index ebf95f6c..e1553961 100644 --- 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 index dbc15504..a60acd3b 100644 --- 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 index ed7824dd..666e8bfd 100644 --- 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 index 5a867b2b..dac2c5ce 100644 --- 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 ( From 353e689cb16cd2294d4eb33b7f786a8131936853 Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Mon, 13 Jul 2026 17:05:04 +0200 Subject: [PATCH 2/2] Also migrate scripts/qsfs helper module rmb-sdk-go -> zos_sdk_go Co-Authored-By: Claude Opus 4.8 (1M context) --- scripts/qsfs/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qsfs/go.mod b/scripts/qsfs/go.mod index 1ee120e8..b2e8be96 100644 --- a/scripts/qsfs/go.mod +++ b/scripts/qsfs/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20250929084418-b950278ead30 - github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.5 + github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0 github.com/threefoldtech/zos_base v0.1.0 )