Skip to content

Migrate zosbase -> zos_base dependency (v1.1.0) #1542

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

Merged
ashraffouda merged 3 commits into from
Jul 13, 2026
Merged

Migrate zosbase -> zos_base dependency (v1.1.0) #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29858c5
Migrate zosbase -> zos_base dependency (v1.1.0)
ashraffouda Jul 12, 2026
55c09d8
Complete standalone go.sum for indirect submodules
ashraffouda Jul 12, 2026
d228c06
ci(lint): fix govet reflect.Ptr and drop noisy goconst
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
1 change: 0 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: "2"
linters:
enable:
- goconst
- misspell
- unconvert
exclusions:
Expand Down
2 changes: 1 addition & 1 deletion farmerbot/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/threefoldtech/zosbase v1.0.9 // indirect
github.com/threefoldtech/zos_base v1.1.0 // indirect
github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions farmerbot/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
github.com/threefoldtech/zosbase v1.0.9 h1:jZ/km4PiOnJHSqpfg4cJRC3k9GE+vzX5LF1MaJnXOoU=
github.com/threefoldtech/zosbase v1.0.9/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
Expand Down
2 changes: 1 addition & 1 deletion grid-cli/cmd/deploy_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package cmd
import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// deployGatewayCmd represents the deploy gateway command
Expand Down
2 changes: 1 addition & 1 deletion grid-cli/cmd/deploy_zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-cli/internal/filters"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// deployZDBCmd represents the deploy zdb command
Expand Down
2 changes: 1 addition & 1 deletion grid-cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/stretchr/testify v1.11.1
github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.18
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.17.0
github.com/threefoldtech/zosbase v1.0.9
github.com/threefoldtech/zos_base v1.1.0
github.com/vedhavyas/go-subkey v1.0.3
)

Expand Down
4 changes: 2 additions & 2 deletions grid-cli/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
github.com/threefoldtech/zosbase v1.0.9 h1:jZ/km4PiOnJHSqpfg4cJRC3k9GE+vzX5LF1MaJnXOoU=
github.com/threefoldtech/zosbase v1.0.9/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
proxy "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/client"
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace"
Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
"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"
subkey "github.com/vedhavyas/go-subkey"
)

Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/deployment_deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/state"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/deployment_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// CountDeploymentPublicIPs counts the public IPs of a deployment
Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/gateway_fqdn_deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
"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 constructTestFQDNDeployer(t *testing.T, mock bool) (
Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/gateway_name_deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/state"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
)

var nameContractID uint64 = 200
Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/k8s_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
client "github.com/threefoldtech/tfgrid-sdk-go/grid-client/node"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
)

// K8sDeployer for deploying k8s
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/k8s_deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/subi"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

func constructTestK8s(t *testing.T, mock bool) (
Expand Down
4 changes: 2 additions & 2 deletions grid-client/deployer/node_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/rs/zerolog/log"
client "github.com/threefoldtech/tfgrid-sdk-go/grid-client/node"
"github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
"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"
)

const requestedPagesPerIteration = 5
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/node_filter_test.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/stretchr/testify/assert"
client "github.com/threefoldtech/tfgrid-sdk-go/grid-client/node"
"github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

func TestHasEnoughStorage(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion grid-client/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00
github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.17.0
github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6
github.com/threefoldtech/zosbase v1.0.9
github.com/threefoldtech/zos_base v1.1.0
github.com/vedhavyas/go-subkey v1.0.3
go.opentelemetry.io/otel v1.39.0
go.opentelemetry.io/otel/trace v1.39.0
Expand Down
4 changes: 2 additions & 2 deletions grid-client/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
github.com/threefoldtech/zosbase v1.0.9 h1:jZ/km4PiOnJHSqpfg4cJRC3k9GE+vzX5LF1MaJnXOoU=
github.com/threefoldtech/zosbase v1.0.9/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
Expand Down
2 changes: 1 addition & 1 deletion grid-client/integration_tests/batch_gateway_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"

"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

func TestBatchGatewayNameDeployment(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion grid-client/integration_tests/gateway_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"

"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

func TestGatewayNameDeployment(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion grid-client/integration_tests/gatway_fqdn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"

"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

func TestGatewayFQDNDeployment(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion grid-client/integration_tests/qsfs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion grid-client/integration_tests/zdb_test.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/stretchr/testify/require"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

func TestZDBDeployment(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions grid-client/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/subi"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
"github.com/threefoldtech/zosbase/pkg/capacity/dmi"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/capacity/dmi"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// ErrNoAccessibleInterfaceFound no accessible interface found
Expand Down
4 changes: 2 additions & 2 deletions grid-client/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/subi"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
"golang.org/x/exp/maps"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
Expand Down
4 changes: 2 additions & 2 deletions grid-client/state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
client "github.com/threefoldtech/tfgrid-sdk-go/grid-client/node"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)

Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package workloads
import (
"github.com/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// Disk struct
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/gateway_fqdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"

"github.com/pkg/errors"
"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"
)

var fqdnRegex = regexp.MustCompile(`^([a-zA-Z0-9-_]+\.)+[a-zA-Z0-9-_]{2,}$`)
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/gateway_fqdn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

// GatewayWorkload for tests
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/gateway_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

"github.com/pkg/errors"
"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"
)

// GatewayNameProxy struct for gateway name proxy
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/gateway_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,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"
)

// GatewayWorkload for tests
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pkg/errors"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/subi"
"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"
)

// old: https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

// K8sWorkload to be used in tests
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/qsfs.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/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// QSFS struct
Expand Down
4 changes: 2 additions & 2 deletions grid-client/workloads/vm.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/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"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"
)

// VM is a virtual machine struct
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/vm_light.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/pkg/errors"
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

// VMLight is a virtual machine struct
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// Volume struct
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/zlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"
zosTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-client/zos"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
)

// Zlog logger struct
Expand Down
Loading
Loading