From 7620baa2cd4f852cfc11db831df9670bb01d55c7 Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Thu, 9 Jul 2026 16:22:22 +0200 Subject: [PATCH] Migrate zosbase -> zos_base module (v1.1.0) The zosbase module was renamed to github.com/threefoldtech/zos_base. Update the go.mod require (v1.0.10 -> zos_base v1.1.0), go.sum, and 31 import statements so we no longer depend on GitHub's rename redirect for the Go module path. Co-Authored-By: Claude Opus 4.8 (1M context) --- cmds/identityd/main.go | 16 +++++++-------- cmds/identityd/monitor.go | 2 +- cmds/identityd/ssh.go | 6 +++--- cmds/internet/main.go | 22 ++++++++++----------- cmds/modules/api_gateway/main.go | 10 +++++----- cmds/modules/contd/main.go | 4 ++-- cmds/modules/flistd/main.go | 6 +++--- cmds/modules/gateway/main.go | 4 ++-- cmds/modules/networkd/main.go | 26 ++++++++++++------------- cmds/modules/noded/main.go | 28 +++++++++++++-------------- cmds/modules/noded/public.go | 6 +++--- cmds/modules/powerd/main.go | 10 +++++----- cmds/modules/provisiond/cap.go | 6 +++--- cmds/modules/provisiond/events.go | 8 ++++---- cmds/modules/provisiond/main.go | 26 ++++++++++++------------- cmds/modules/provisiond/migration.go | 8 ++++---- cmds/modules/provisiond/reporter.go | 8 ++++---- cmds/modules/qsfsd/main.go | 4 ++-- cmds/modules/storaged/main.go | 4 ++-- cmds/modules/vmd/main.go | 6 +++--- cmds/modules/zlf/main.go | 2 +- cmds/modules/zui/disk.go | 2 +- cmds/modules/zui/header.go | 8 ++++---- cmds/modules/zui/main.go | 2 +- cmds/modules/zui/mem.go | 2 +- cmds/modules/zui/net.go | 6 +++--- cmds/modules/zui/prov.go | 4 ++-- cmds/modules/zui/service.go | 2 +- cmds/zos/main.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ tools/zos-update-worker/cmd/worker.go | 2 +- tools/zos-update-worker/main.go | 2 +- 33 files changed, 126 insertions(+), 124 deletions(-) diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go index c322ed31d..554634ff5 100644 --- a/cmds/identityd/main.go +++ b/cmds/identityd/main.go @@ -8,19 +8,19 @@ import ( "time" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/upgrade" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/upgrade" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/identity" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/identity" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/utils" - "github.com/threefoldtech/zosbase/pkg/version" + "github.com/threefoldtech/zos_base/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/version" ) const ( diff --git a/cmds/identityd/monitor.go b/cmds/identityd/monitor.go index 24785185c..0f62e7a40 100644 --- a/cmds/identityd/monitor.go +++ b/cmds/identityd/monitor.go @@ -5,7 +5,7 @@ import ( "time" "github.com/blang/semver" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) type monitorStream struct { diff --git a/cmds/identityd/ssh.go b/cmds/identityd/ssh.go index f14df1fbd..b1cf5335a 100644 --- a/cmds/identityd/ssh.go +++ b/cmds/identityd/ssh.go @@ -12,9 +12,9 @@ import ( "github.com/cenkalti/backoff" "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/kernel" ) var ( diff --git a/cmds/internet/main.go b/cmds/internet/main.go index 2a7cec7b6..7983dca18 100644 --- a/cmds/internet/main.go +++ b/cmds/internet/main.go @@ -11,17 +11,17 @@ import ( "github.com/rs/zerolog/log" "github.com/vishvananda/netlink" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/network/bootstrap" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/dhcp" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/options" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/zinit" - - "github.com/threefoldtech/zosbase/pkg/version" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/network/bootstrap" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/dhcp" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/zinit" + + "github.com/threefoldtech/zos_base/pkg/version" ) func main() { diff --git a/cmds/modules/api_gateway/main.go b/cmds/modules/api_gateway/main.go index 61df35e90..180f87e6e 100644 --- a/cmds/modules/api_gateway/main.go +++ b/cmds/modules/api_gateway/main.go @@ -13,11 +13,11 @@ import ( substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/stubs" - substrategw "github.com/threefoldtech/zosbase/pkg/substrate_gateway" - "github.com/threefoldtech/zosbase/pkg/utils" - zosapi "github.com/threefoldtech/zosbase/pkg/zos_api" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/stubs" + substrategw "github.com/threefoldtech/zos_base/pkg/substrate_gateway" + "github.com/threefoldtech/zos_base/pkg/utils" + zosapi "github.com/threefoldtech/zos_base/pkg/zos_api" "github.com/urfave/cli/v2" ) diff --git a/cmds/modules/contd/main.go b/cmds/modules/contd/main.go index 354851bdd..39fdc2f61 100644 --- a/cmds/modules/contd/main.go +++ b/cmds/modules/contd/main.go @@ -12,8 +12,8 @@ import ( "github.com/urfave/cli/v2" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/container" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/container" + "github.com/threefoldtech/zos_base/pkg/utils" ) const module = "container" diff --git a/cmds/modules/flistd/main.go b/cmds/modules/flistd/main.go index 637fa492d..2c348b366 100644 --- a/cmds/modules/flistd/main.go +++ b/cmds/modules/flistd/main.go @@ -5,14 +5,14 @@ import ( "time" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/urfave/cli/v2" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/flist" + "github.com/threefoldtech/zos_base/pkg/flist" ) const ( diff --git a/cmds/modules/gateway/main.go b/cmds/modules/gateway/main.go index 6d1665177..8ec49e0ff 100644 --- a/cmds/modules/gateway/main.go +++ b/cmds/modules/gateway/main.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gateway" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/gateway" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/urfave/cli/v2" "github.com/rs/zerolog/log" diff --git a/cmds/modules/networkd/main.go b/cmds/modules/networkd/main.go index ae2def014..381fcf467 100644 --- a/cmds/modules/networkd/main.go +++ b/cmds/modules/networkd/main.go @@ -8,24 +8,24 @@ import ( "time" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/network/dhcp" - "github.com/threefoldtech/zosbase/pkg/network/mycelium" - "github.com/threefoldtech/zosbase/pkg/network/public" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/network/dhcp" + "github.com/threefoldtech/zos_base/pkg/network/mycelium" + "github.com/threefoldtech/zos_base/pkg/network/public" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/urfave/cli/v2" "github.com/cenkalti/backoff/v3" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/network" - "github.com/threefoldtech/zosbase/pkg/network/bootstrap" - "github.com/threefoldtech/zosbase/pkg/network/ndmz" - "github.com/threefoldtech/zosbase/pkg/network/yggdrasil" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/network" + "github.com/threefoldtech/zos_base/pkg/network/bootstrap" + "github.com/threefoldtech/zos_base/pkg/network/ndmz" + "github.com/threefoldtech/zos_base/pkg/network/yggdrasil" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/cmds/modules/noded/main.go b/cmds/modules/noded/main.go index 96fbc34e5..91f325282 100644 --- a/cmds/modules/noded/main.go +++ b/cmds/modules/noded/main.go @@ -12,20 +12,20 @@ import ( "github.com/urfave/cli/v2" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/capacity" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/monitord" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/perf/cpubench" - "github.com/threefoldtech/zosbase/pkg/perf/healthcheck" - "github.com/threefoldtech/zosbase/pkg/perf/iperf" - "github.com/threefoldtech/zosbase/pkg/perf/provisiontest" - "github.com/threefoldtech/zosbase/pkg/perf/publicip" - "github.com/threefoldtech/zosbase/pkg/registrar" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/monitord" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/perf/cpubench" + "github.com/threefoldtech/zos_base/pkg/perf/healthcheck" + "github.com/threefoldtech/zos_base/pkg/perf/iperf" + "github.com/threefoldtech/zos_base/pkg/perf/provisiontest" + "github.com/threefoldtech/zos_base/pkg/perf/publicip" + "github.com/threefoldtech/zos_base/pkg/registrar" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/rs/zerolog/log" diff --git a/cmds/modules/noded/public.go b/cmds/modules/noded/public.go index e741bbfda..2992088d7 100644 --- a/cmds/modules/noded/public.go +++ b/cmds/modules/noded/public.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func setPublicConfig(ctx context.Context, cl zbus.Client, cfg *substrate.PublicConfig) error { diff --git a/cmds/modules/powerd/main.go b/cmds/modules/powerd/main.go index be7e104ae..670e77482 100644 --- a/cmds/modules/powerd/main.go +++ b/cmds/modules/powerd/main.go @@ -8,11 +8,11 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/power" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/power" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/urfave/cli/v2" ) diff --git a/cmds/modules/provisiond/cap.go b/cmds/modules/provisiond/cap.go index 7e818d288..5cb4c5340 100644 --- a/cmds/modules/provisiond/cap.go +++ b/cmds/modules/provisiond/cap.go @@ -8,9 +8,9 @@ import ( "github.com/centrifuge/go-substrate-rpc-client/v4/types" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) type DeploymentID struct { diff --git a/cmds/modules/provisiond/events.go b/cmds/modules/provisiond/events.go index f476adc70..2256e6aae 100644 --- a/cmds/modules/provisiond/events.go +++ b/cmds/modules/provisiond/events.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) type ContractEventHandler struct { diff --git a/cmds/modules/provisiond/main.go b/cmds/modules/provisiond/main.go index f9b4617c5..4f3d0b0d2 100644 --- a/cmds/modules/provisiond/main.go +++ b/cmds/modules/provisiond/main.go @@ -13,25 +13,25 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/pkg/errors" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/capacity" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/primitives" - "github.com/threefoldtech/zosbase/pkg/provision/storage" - fsStorage "github.com/threefoldtech/zosbase/pkg/provision/storage.fs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/primitives" + "github.com/threefoldtech/zos_base/pkg/provision/storage" + fsStorage "github.com/threefoldtech/zos_base/pkg/provision/storage.fs" "github.com/urfave/cli/v2" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/provision" ) const ( diff --git a/cmds/modules/provisiond/migration.go b/cmds/modules/provisiond/migration.go index 278d7299e..0267e7147 100644 --- a/cmds/modules/provisiond/migration.go +++ b/cmds/modules/provisiond/migration.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision/storage" - fsStorage "github.com/threefoldtech/zosbase/pkg/provision/storage.fs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision/storage" + fsStorage "github.com/threefoldtech/zos_base/pkg/provision/storage.fs" ) func storageMigration(db *storage.BoltStorage, fs *fsStorage.Fs) error { diff --git a/cmds/modules/provisiond/reporter.go b/cmds/modules/provisiond/reporter.go index 874321715..f4545f67f 100644 --- a/cmds/modules/provisiond/reporter.go +++ b/cmds/modules/provisiond/reporter.go @@ -13,10 +13,10 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/rrd" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/rrd" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/cmds/modules/qsfsd/main.go b/cmds/modules/qsfsd/main.go index 333729032..b04f9094c 100644 --- a/cmds/modules/qsfsd/main.go +++ b/cmds/modules/qsfsd/main.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/qsfsd" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/qsfsd" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/urfave/cli/v2" "github.com/rs/zerolog/log" diff --git a/cmds/modules/storaged/main.go b/cmds/modules/storaged/main.go index 4b85d7b33..50e9a7bb1 100644 --- a/cmds/modules/storaged/main.go +++ b/cmds/modules/storaged/main.go @@ -8,8 +8,8 @@ import ( "github.com/urfave/cli/v2" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/storage" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/storage" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/cmds/modules/vmd/main.go b/cmds/modules/vmd/main.go index 9db0104aa..e5419bad6 100644 --- a/cmds/modules/vmd/main.go +++ b/cmds/modules/vmd/main.go @@ -8,9 +8,9 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/utils" - "github.com/threefoldtech/zosbase/pkg/vm" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/vm" "github.com/urfave/cli/v2" "github.com/rs/zerolog/log" diff --git a/cmds/modules/zlf/main.go b/cmds/modules/zlf/main.go index 65b57763c..990d74713 100644 --- a/cmds/modules/zlf/main.go +++ b/cmds/modules/zlf/main.go @@ -9,7 +9,7 @@ import ( "github.com/go-redis/redis" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/app" + "github.com/threefoldtech/zos_base/pkg/app" ) func reader(c io.Reader, r *redis.Client, channel string) { diff --git a/cmds/modules/zui/disk.go b/cmds/modules/zui/disk.go index 4ac5f4355..902d65096 100644 --- a/cmds/modules/zui/disk.go +++ b/cmds/modules/zui/disk.go @@ -9,7 +9,7 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func diskRender(client zbus.Client, grid *ui.Grid, render *signalFlag) error { diff --git a/cmds/modules/zui/header.go b/cmds/modules/zui/header.go index 1185d142f..153e77454 100644 --- a/cmds/modules/zui/header.go +++ b/cmds/modules/zui/header.go @@ -12,10 +12,10 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/registrar" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/registrar" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func green(s string) string { diff --git a/cmds/modules/zui/main.go b/cmds/modules/zui/main.go index b1ff2d72e..020d28a7b 100644 --- a/cmds/modules/zui/main.go +++ b/cmds/modules/zui/main.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/zui" + "github.com/threefoldtech/zos_base/pkg/zui" "github.com/urfave/cli/v2" ) diff --git a/cmds/modules/zui/mem.go b/cmds/modules/zui/mem.go index aefab61ee..533de61ba 100644 --- a/cmds/modules/zui/mem.go +++ b/cmds/modules/zui/mem.go @@ -8,7 +8,7 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func memRender(client zbus.Client, grid *ui.Grid, render *signalFlag) error { diff --git a/cmds/modules/zui/net.go b/cmds/modules/zui/net.go index 02db0387b..bdc23462f 100644 --- a/cmds/modules/zui/net.go +++ b/cmds/modules/zui/net.go @@ -10,9 +10,9 @@ import ( "github.com/gizak/termui/v3/widgets" _ "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func addressRender(ctx context.Context, table *widgets.Table, client zbus.Client, render *signalFlag) error { diff --git a/cmds/modules/zui/prov.go b/cmds/modules/zui/prov.go index 541bbdd83..fddfaa3a3 100644 --- a/cmds/modules/zui/prov.go +++ b/cmds/modules/zui/prov.go @@ -8,8 +8,8 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/cmds/modules/zui/service.go b/cmds/modules/zui/service.go index 96c8a5713..978c99573 100644 --- a/cmds/modules/zui/service.go +++ b/cmds/modules/zui/service.go @@ -7,7 +7,7 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/cmds/zos/main.go b/cmds/zos/main.go index 744c20d01..9c683530d 100644 --- a/cmds/zos/main.go +++ b/cmds/zos/main.go @@ -20,8 +20,8 @@ import ( "github.com/threefoldtech/zos/cmds/modules/vmd" "github.com/threefoldtech/zos/cmds/modules/zbusdebug" "github.com/threefoldtech/zos/cmds/modules/zui" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/version" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/version" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 9e8dcc121..1f717698c 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( 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/zosbase v1.0.10 + github.com/threefoldtech/zos_base v1.1.0 github.com/urfave/cli/v2 v2.27.5 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index e20d9b903..4db0f5b39 100644 --- a/go.sum +++ b/go.sum @@ -820,3 +820,5 @@ nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= zombiezen.com/go/capnproto2 v2.18.0+incompatible h1:mwfXZniffG5mXokQGHUJWGnqIBggoPfT/CEwon9Yess= zombiezen.com/go/capnproto2 v2.18.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ= +github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM= +github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI= diff --git a/tools/zos-update-worker/cmd/worker.go b/tools/zos-update-worker/cmd/worker.go index b8f7e8edb..12b453341 100644 --- a/tools/zos-update-worker/cmd/worker.go +++ b/tools/zos-update-worker/cmd/worker.go @@ -24,7 +24,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/threefoldtech/zosbase/tools/zos-update-version/internal" + "github.com/threefoldtech/zos_base/tools/zos-update-version/internal" ) var rootCmd = &cobra.Command{ diff --git a/tools/zos-update-worker/main.go b/tools/zos-update-worker/main.go index 4d5f1f9ef..4a020901f 100644 --- a/tools/zos-update-worker/main.go +++ b/tools/zos-update-worker/main.go @@ -16,7 +16,7 @@ limitations under the License. package main import ( - "github.com/threefoldtech/zosbase/tools/zos-update-version/cmd" + "github.com/threefoldtech/zos_base/tools/zos-update-version/cmd" ) func main() {