Skip to content

Migrate zosbase -> zos_base module (v1.1.0) #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ashraffouda wants to merge 2 commits into from
Closed

Migrate zosbase -> zos_base module (v1.1.0) #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1114dd7
Migrate zosbase -> zos_base module (v1.1.0)
ashraffouda Jul 12, 2026
3efe5c1
ci: bump actions/setup-go@v1 -> v5 in host workflows
ashraffouda Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cmds/identityd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cmds/identityd/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/blang/semver"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

type monitorStream struct {
Expand Down
6 changes: 3 additions & 3 deletions cmds/identityd/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
22 changes: 11 additions & 11 deletions cmds/internet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/api_gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/contd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/flistd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/gateway/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions cmds/modules/netlightd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
24 changes: 12 additions & 12 deletions cmds/modules/noded/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/powerd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/provisiond/cap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/provisiond/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 12 additions & 12 deletions cmds/modules/provisiond/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/provisiond/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions cmds/modules/provisiond/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmds/modules/storaged/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/vmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zlf/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zui/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/zui/header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zui/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmds/modules/zui/mem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmds/modules/zui/net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading