From 1114dd7e2ba3fe65999ed91f12ccef0ac1984f2a Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Sun, 12 Jul 2026 14:20:21 +0200 Subject: [PATCH 1/2] 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.3 -> zos_base v1.1.0), go.sum, and the import statements. The nested tools/zos-update-worker module does not use zosbase and is untouched. Co-Authored-By: Claude Opus 4.8 (1M context) --- cmds/identityd/main.go | 8 ++++---- cmds/identityd/monitor.go | 2 +- cmds/identityd/ssh.go | 6 +++--- cmds/internet/main.go | 22 ++++++++++---------- cmds/modules/api_gateway/main.go | 6 +++--- cmds/modules/contd/main.go | 4 ++-- cmds/modules/flistd/main.go | 6 +++--- cmds/modules/gateway/main.go | 4 ++-- cmds/modules/netlightd/main.go | 14 ++++++------- cmds/modules/noded/main.go | 24 +++++++++++----------- cmds/modules/powerd/main.go | 8 ++++---- cmds/modules/provisiond/cap.go | 4 ++-- cmds/modules/provisiond/events.go | 6 +++--- cmds/modules/provisiond/main.go | 24 +++++++++++----------- cmds/modules/provisiond/migration.go | 8 ++++---- cmds/modules/provisiond/reporter.go | 8 ++++---- 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 | 6 +++--- 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 ++ pkg/identity.go | 2 +- pkg/identity/identityd.go | 10 ++++----- pkg/power/power.go | 10 ++++----- pkg/power/uptime.go | 4 ++-- pkg/provision/auth.go | 2 +- pkg/provision/engine.go | 10 ++++----- pkg/provision/engine_test.go | 4 ++-- pkg/provision/provisiner.go | 4 ++-- pkg/provision/provisioner_test.go | 2 +- pkg/registrar_gateway.go | 2 +- pkg/registrar_gateway/registrar_gateway.go | 4 ++-- pkg/registrar_light/register.go | 8 ++++---- pkg/registrar_light/registrar.go | 6 +++--- pkg/stubs/identity_stub.go | 2 +- pkg/stubs/registrar-gateway.go | 2 +- pkg/upgrade/upgrade.go | 12 +++++------ pkg/upgrade/upgrade_test.go | 2 +- 46 files changed, 143 insertions(+), 141 deletions(-) diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go index 8337362b..ef673b2f 100644 --- a/cmds/identityd/main.go +++ b/cmds/identityd/main.go @@ -12,16 +12,16 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zos4/pkg/stubs" "github.com/threefoldtech/zos4/pkg/upgrade" - "github.com/threefoldtech/zosbase/pkg/app" + "github.com/threefoldtech/zos_base/pkg/app" "github.com/threefoldtech/zos4/pkg" "github.com/threefoldtech/zos4/pkg/identity" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" "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 24785185..0f62e7a4 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 90b83336..4452570e 100644 --- a/cmds/identityd/ssh.go +++ b/cmds/identityd/ssh.go @@ -11,9 +11,9 @@ import ( "github.com/cenkalti/backoff" "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 mainNetFarms = []pkg.FarmID{ diff --git a/cmds/internet/main.go b/cmds/internet/main.go index 70a3f198..b68b83e9 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/netlight/bootstrap" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/dhcp" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/options" - "github.com/threefoldtech/zosbase/pkg/netlight/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/netlight/bootstrap" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/dhcp" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/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 7cd4836c..a5bf7ade 100644 --- a/cmds/modules/api_gateway/main.go +++ b/cmds/modules/api_gateway/main.go @@ -12,9 +12,9 @@ import ( "github.com/threefoldtech/zbus" registrar "github.com/threefoldtech/zos4/pkg/registrar_gateway" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/utils" - zosapi "github.com/threefoldtech/zosbase/pkg/zos_api_light" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/utils" + zosapi "github.com/threefoldtech/zos_base/pkg/zos_api_light" "github.com/urfave/cli/v2" ) diff --git a/cmds/modules/contd/main.go b/cmds/modules/contd/main.go index 354851bd..39fdc2f6 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 637fa492..2c348b36 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 97470a03..4dd248f0 100644 --- a/cmds/modules/gateway/main.go +++ b/cmds/modules/gateway/main.go @@ -4,8 +4,8 @@ import ( "context" "github.com/pkg/errors" - gateway "github.com/threefoldtech/zosbase/pkg/gateway_light" - "github.com/threefoldtech/zosbase/pkg/utils" + gateway "github.com/threefoldtech/zos_base/pkg/gateway_light" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/urfave/cli/v2" "github.com/rs/zerolog/log" diff --git a/cmds/modules/netlightd/main.go b/cmds/modules/netlightd/main.go index 9f03f52f..1d270d3e 100644 --- a/cmds/modules/netlightd/main.go +++ b/cmds/modules/netlightd/main.go @@ -10,19 +10,19 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/x25519" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" - "github.com/threefoldtech/zosbase/pkg/netlight" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/resource" + "github.com/threefoldtech/zos_base/pkg/netbase/nft" + "github.com/threefoldtech/zos_base/pkg/netlight" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/resource" "github.com/urfave/cli/v2" "github.com/cenkalti/backoff/v3" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/netlight/bootstrap" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/netlight/bootstrap" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/cmds/modules/noded/main.go b/cmds/modules/noded/main.go index fe237c47..140a9be5 100644 --- a/cmds/modules/noded/main.go +++ b/cmds/modules/noded/main.go @@ -11,18 +11,18 @@ import ( registrar "github.com/threefoldtech/zos4/pkg/registrar_light" zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" - "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/publicip" - "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/publicip" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" "github.com/rs/zerolog/log" diff --git a/cmds/modules/powerd/main.go b/cmds/modules/powerd/main.go index b863e59a..e1d1c6a3 100644 --- a/cmds/modules/powerd/main.go +++ b/cmds/modules/powerd/main.go @@ -10,10 +10,10 @@ import ( "github.com/threefoldtech/zbus" "github.com/threefoldtech/zos4/pkg/power" zos4stub "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/events" - "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/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 18965118..f9042377 100644 --- a/cmds/modules/provisiond/cap.go +++ b/cmds/modules/provisiond/cap.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zos4/pkg/stubs" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" ) type DeploymentID struct { diff --git a/cmds/modules/provisiond/events.go b/cmds/modules/provisiond/events.go index 27ab0b30..cfbe8456 100644 --- a/cmds/modules/provisiond/events.go +++ b/cmds/modules/provisiond/events.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" ) type ContractEventHandler struct { diff --git a/cmds/modules/provisiond/main.go b/cmds/modules/provisiond/main.go index a4c04524..8fa23771 100644 --- a/cmds/modules/provisiond/main.go +++ b/cmds/modules/provisiond/main.go @@ -11,22 +11,22 @@ import ( "time" "github.com/pkg/errors" - "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" zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" - "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" diff --git a/cmds/modules/provisiond/migration.go b/cmds/modules/provisiond/migration.go index baa721b2..d9bb6a8a 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" - gridtypes "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" + gridtypes "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 567f320a..99e9a803 100644 --- a/cmds/modules/provisiond/reporter.go +++ b/cmds/modules/provisiond/reporter.go @@ -14,10 +14,10 @@ import ( substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/rrd" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + gridtypes "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/storaged/main.go b/cmds/modules/storaged/main.go index b5cf1da5..f3440828 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" - storage "github.com/threefoldtech/zosbase/pkg/storage_light" - "github.com/threefoldtech/zosbase/pkg/utils" + storage "github.com/threefoldtech/zos_base/pkg/storage_light" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/cmds/modules/vmd/main.go b/cmds/modules/vmd/main.go index 85d96828..cadae570 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 65b57763..990d7471 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 4ac5f435..902d6509 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 c2ed5303..246930e2 100644 --- a/cmds/modules/zui/header.go +++ b/cmds/modules/zui/header.go @@ -14,9 +14,9 @@ import ( "github.com/threefoldtech/zbus" registrar "github.com/threefoldtech/zos4/pkg/registrar_light" zos4Stubs "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "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/stubs" ) func green(s string) string { diff --git a/cmds/modules/zui/main.go b/cmds/modules/zui/main.go index a4a7b8ad..9a84f7bf 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" - zui "github.com/threefoldtech/zosbase/pkg/zui_light" + zui "github.com/threefoldtech/zos_base/pkg/zui_light" "github.com/urfave/cli/v2" ) diff --git a/cmds/modules/zui/mem.go b/cmds/modules/zui/mem.go index aefab61e..533de61b 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 8369a54d..cea28771 100644 --- a/cmds/modules/zui/net.go +++ b/cmds/modules/zui/net.go @@ -8,9 +8,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/netlight/types" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/netlight/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 df5135ff..3b4a6758 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" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/stubs" + gridtypes "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 b317c500..4a90d258 100644 --- a/cmds/modules/zui/service.go +++ b/cmds/modules/zui/service.go @@ -8,7 +8,7 @@ import ( "github.com/threefoldtech/zbus" zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" - "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 721149f9..d7754aea 100644 --- a/cmds/zos/main.go +++ b/cmds/zos/main.go @@ -19,8 +19,8 @@ import ( "github.com/threefoldtech/zos4/cmds/modules/vmd" "github.com/threefoldtech/zos4/cmds/modules/zbusdebug" "github.com/threefoldtech/zos4/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 adc1099e..736e284d 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.3 github.com/threefoldtech/tfgrid4-sdk-go/node-registrar v0.0.0-20251124140719-d63b7b6ffe1d github.com/threefoldtech/zbus v1.0.1 - github.com/threefoldtech/zosbase v1.0.3 + github.com/threefoldtech/zos_base v1.1.0 github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect diff --git a/go.sum b/go.sum index 92a08a64..780144cf 100644 --- a/go.sum +++ b/go.sum @@ -980,3 +980,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/pkg/identity.go b/pkg/identity.go index 85af774c..028b55bd 100644 --- a/pkg/identity.go +++ b/pkg/identity.go @@ -1,6 +1,6 @@ package pkg -import "github.com/threefoldtech/zosbase/pkg" +import "github.com/threefoldtech/zos_base/pkg" //go:generate mkdir -p stubs //go:generate zbusc -module identityd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos4/pkg+IdentityManager stubs/identity_stub.go diff --git a/pkg/identity/identityd.go b/pkg/identity/identityd.go index b643bd09..4b867305 100644 --- a/pkg/identity/identityd.go +++ b/pkg/identity/identityd.go @@ -6,14 +6,14 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" - "github.com/threefoldtech/zosbase/pkg/crypto" - "github.com/threefoldtech/zosbase/pkg/identity/store" + "github.com/threefoldtech/zos_base/pkg/crypto" + "github.com/threefoldtech/zos_base/pkg/identity/store" "github.com/pkg/errors" zos4pkg "github.com/threefoldtech/zos4/pkg" - "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" ) type identityManager struct { diff --git a/pkg/power/power.go b/pkg/power/power.go index 32a67e13..2391c084 100644 --- a/pkg/power/power.go +++ b/pkg/power/power.go @@ -11,11 +11,11 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/events" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/power" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/events" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/power" + "github.com/threefoldtech/zos_base/pkg/zinit" ) type PowerServer struct { diff --git a/pkg/power/uptime.go b/pkg/power/uptime.go index c103cb76..82c93003 100644 --- a/pkg/power/uptime.go +++ b/pkg/power/uptime.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/host" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/pkg/provision/auth.go b/pkg/provision/auth.go index 858f86ab..a54d4e44 100644 --- a/pkg/provision/auth.go +++ b/pkg/provision/auth.go @@ -9,7 +9,7 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/provision" ) type registrarTwins struct { diff --git a/pkg/provision/engine.go b/pkg/provision/engine.go index ecbbbda8..9a8a5f94 100644 --- a/pkg/provision/engine.go +++ b/pkg/provision/engine.go @@ -19,11 +19,11 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" ) // EngineOption interface diff --git a/pkg/provision/engine_test.go b/pkg/provision/engine_test.go index 179bc0b8..294c2ff1 100644 --- a/pkg/provision/engine_test.go +++ b/pkg/provision/engine_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) // func TestEngine(t *testing.T) { diff --git a/pkg/provision/provisiner.go b/pkg/provision/provisiner.go index 4a600c94..c4ca8dd5 100644 --- a/pkg/provision/provisiner.go +++ b/pkg/provision/provisiner.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" ) // Response interface for custom error responses diff --git a/pkg/provision/provisioner_test.go b/pkg/provision/provisioner_test.go index 618dfb41..a001da05 100644 --- a/pkg/provision/provisioner_test.go +++ b/pkg/provision/provisioner_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestBuildResult(t *testing.T) { diff --git a/pkg/registrar_gateway.go b/pkg/registrar_gateway.go index a22c9e1b..a845c04b 100644 --- a/pkg/registrar_gateway.go +++ b/pkg/registrar_gateway.go @@ -6,7 +6,7 @@ import ( substrateTypes "github.com/centrifuge/go-substrate-rpc-client/v4/types" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) //go:generate zbusc -module api-gateway -version 0.0.1 -name api-gateway -package stubs github.com/threefoldtech/zos4/pkg+RegistrarGateway stubs/registrar-gateway.go diff --git a/pkg/registrar_gateway/registrar_gateway.go b/pkg/registrar_gateway/registrar_gateway.go index 3d097990..b2ea9eed 100644 --- a/pkg/registrar_gateway/registrar_gateway.go +++ b/pkg/registrar_gateway/registrar_gateway.go @@ -16,8 +16,8 @@ import ( "github.com/threefoldtech/zbus" zos4Pkg "github.com/threefoldtech/zos4/pkg" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" ) const AuthHeader = "X-Auth" diff --git a/pkg/registrar_light/register.go b/pkg/registrar_light/register.go index 0f4e6580..b46d723d 100644 --- a/pkg/registrar_light/register.go +++ b/pkg/registrar_light/register.go @@ -12,10 +12,10 @@ import ( "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zbus" zos4Stubs "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/geoip" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/geoip" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/stubs" ) type RegistrationInfo struct { diff --git a/pkg/registrar_light/registrar.go b/pkg/registrar_light/registrar.go index 394050e3..b589e6b1 100644 --- a/pkg/registrar_light/registrar.go +++ b/pkg/registrar_light/registrar.go @@ -11,9 +11,9 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "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/stubs" ) // should any of this be moved to pkg? diff --git a/pkg/stubs/identity_stub.go b/pkg/stubs/identity_stub.go index 64a8fe2a..ae710267 100644 --- a/pkg/stubs/identity_stub.go +++ b/pkg/stubs/identity_stub.go @@ -8,7 +8,7 @@ import ( "context" zbus "github.com/threefoldtech/zbus" pkg1 "github.com/threefoldtech/zos4/pkg" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" ) type IdentityManagerStub struct { diff --git a/pkg/stubs/registrar-gateway.go b/pkg/stubs/registrar-gateway.go index b9a9d48e..98ca6da9 100644 --- a/pkg/stubs/registrar-gateway.go +++ b/pkg/stubs/registrar-gateway.go @@ -10,7 +10,7 @@ import ( tfchainclientgo "github.com/threefoldtech/tfchain/clients/tfchain-client-go" client "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" "time" ) diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 08224d58..e0c46810 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -22,12 +22,12 @@ import ( "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zbus" "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/upgrade" - "github.com/threefoldtech/zosbase/pkg/upgrade/hub" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/upgrade" + "github.com/threefoldtech/zos_base/pkg/upgrade/hub" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/rs/zerolog/log" ) diff --git a/pkg/upgrade/upgrade_test.go b/pkg/upgrade/upgrade_test.go index 1f245900..c15ce830 100644 --- a/pkg/upgrade/upgrade_test.go +++ b/pkg/upgrade/upgrade_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/threefoldtech/0-fs/meta" - "github.com/threefoldtech/zosbase/pkg/upgrade/hub" + "github.com/threefoldtech/zos_base/pkg/upgrade/hub" ) func TestUpgraderDownload(t *testing.T) { From 3efe5c139fc153e52cf1fd96e3eb305de76562fd Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Sun, 12 Jul 2026 16:58:34 +0200 Subject: [PATCH 2/2] ci: bump actions/setup-go@v1 -> v5 in host workflows The 'Set up Go' step (setup-go@v1) fails on the current GitHub host runner (Node 24), blocking the build before it compiles. Bump to v5 so CI can validate the zos_base migration. Container builders are untouched. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/publish.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7e7ed948..54b6baeb 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.21 - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: go-version: 1.21 id: go diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a95376ca..49c69aa0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.23 - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: go-version: 1.23 id: go