diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go index 15f50f39..82eaec19 100644 --- a/cmds/identityd/main.go +++ b/cmds/identityd/main.go @@ -8,18 +8,18 @@ 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/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 5d2cdd90..16cd717e 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 ( diff --git a/cmds/internet/main.go b/cmds/internet/main.go index 7df15878..35d06220 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 8ee081bc..7f31b58b 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_light" + "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_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 6d2b9ad8..0f0ca9d1 100644 --- a/cmds/modules/netlightd/main.go +++ b/cmds/modules/netlightd/main.go @@ -10,21 +10,21 @@ 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/public" - "github.com/threefoldtech/zosbase/pkg/netlight/resource" - "github.com/threefoldtech/zosbase/pkg/network" // import network just for cleanup orphaned namespaces + "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/public" + "github.com/threefoldtech/zos_base/pkg/netlight/resource" + "github.com/threefoldtech/zos_base/pkg/network" // import network just for cleanup orphaned namespaces "github.com/urfave/cli/v2" "github.com/cenkalti/backoff/v3" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/netlight/bootstrap" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/netlight/bootstrap" + "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 feb40de3..952fa0d9 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" - registrar "github.com/threefoldtech/zosbase/pkg/registrar_light" - "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" + registrar "github.com/threefoldtech/zos_base/pkg/registrar_light" + "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 96953e57..1dd3efe7 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" ) // public sets and watches changes to public config on chain and tries to apply the provided setup diff --git a/cmds/modules/powerd/main.go b/cmds/modules/powerd/main.go index be7e104a..670e7748 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 47f03857..f76fd127 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" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - provision "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + provision "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 4bfa9c3f..f6d8c310 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" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - provision "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/events" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + provision "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 276480d4..276b7279 100644 --- a/cmds/modules/provisiond/main.go +++ b/cmds/modules/provisiond/main.go @@ -12,26 +12,26 @@ import ( "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" - gridtypes "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" + gridtypes "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" - provision "github.com/threefoldtech/zosbase/pkg/provision" + provision "github.com/threefoldtech/zos_base/pkg/provision" ) const ( 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 3c057343..622f2e7a 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" - 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 9db0104a..e5419bad 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 09a7d05f..900a7466 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" - registrar "github.com/threefoldtech/zosbase/pkg/registrar_light" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" + registrar "github.com/threefoldtech/zos_base/pkg/registrar_light" + "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 f5b1f6bd..97ba3f21 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 79c3db3e..0f621945 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 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 8f57b375..3e41979f 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,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 github.com/vishvananda/netlink v1.2.1-beta.2 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect diff --git a/go.sum b/go.sum index e20d9b90..4db0f5b3 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=