Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 client/_http/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/lestrrat-go/jwx/jwt"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
zoscrypt "github.com/threefoldtech/zosbase/pkg/crypto"
zoscrypt "github.com/threefoldtech/zos_base/pkg/crypto"
"github.com/yggdrasil-network/yggdrasil-go/src/address"
"github.com/yggdrasil-network/yggdrasil-go/src/crypto"
)
Expand Down
2 changes: 1 addition & 1 deletion client/_http/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/hashicorp/go-retryablehttp"
"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions client/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"net"

"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/capacity/dmi"
"github.com/threefoldtech/zosbase/pkg/diagnostics"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/capacity/dmi"
"github.com/threefoldtech/zos_base/pkg/diagnostics"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

// NodeClient struct
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/threefoldtech/zosbase
module github.com/threefoldtech/zos_base

go 1.25.0

Expand Down
2 changes: 1 addition & 1 deletion pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ testrace: lint build

generate:
@echo "Generating modules client stubs"
go generate github.com/threefoldtech/zosbase/pkg
go generate github.com/threefoldtech/zos_base/pkg

build:
@CGO_ENABLED=0 go build -v ./...
2 changes: 1 addition & 1 deletion pkg/api_gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
)

//go:generate zbusc -module api-gateway -version 0.0.1 -name api-gateway -package stubs github.com/threefoldtech/zosbase/pkg+SubstrateGateway stubs/api_gateway_stub.go
//go:generate zbusc -module api-gateway -version 0.0.1 -name api-gateway -package stubs github.com/threefoldtech/zos_base/pkg+SubstrateGateway stubs/api_gateway_stub.go

type SubstrateGateway interface {
UpdateSubstrateGatewayConnection(manager substrate.Manager) (err error)
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/boot.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"path/filepath"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

// defaultBootedPath is the path where to store the booted flag
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/boot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/stretchr/testify/require"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

type readCloser struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"

"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

// TestSetFlag tests the setFlag function against multiple scenarios.
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zos_base/pkg/kernel"
)

// nolint
Expand Down
2 changes: 1 addition & 1 deletion pkg/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"path/filepath"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
)

// TestVolatileDir tests the volatileDir function against multiple scenarios.
Expand Down
14 changes: 7 additions & 7 deletions pkg/capacity/capacity.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/shirou/gopsutil/host"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/capacity/dmi"
"github.com/threefoldtech/zosbase/pkg/capacity/smartctl"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zosbase/pkg/storage/filesystem"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/capacity/dmi"
"github.com/threefoldtech/zos_base/pkg/capacity/smartctl"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/kernel"
"github.com/threefoldtech/zos_base/pkg/storage/filesystem"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

// Capacity hold the amount of resource unit of a node
Expand Down
4 changes: 2 additions & 2 deletions pkg/capacity/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/mem"
"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 (r *ResourceOracle) cru() (uint64, error) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/container.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package pkg

//go:generate mkdir -p stubs
//go:generate zbusc -module container -version 0.0.1 -name container -package stubs github.com/threefoldtech/zosbase/pkg+ContainerModule stubs/container_stub.go
//go:generate zbusc -module container -version 0.0.1 -name container -package stubs github.com/threefoldtech/zos_base/pkg+ContainerModule stubs/container_stub.go

import (
"time"

"github.com/threefoldtech/zosbase/pkg/container/logger"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/container/logger"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/container/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/google/uuid"
"github.com/patrickmn/go-cache"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/container/logger"
"github.com/threefoldtech/zosbase/pkg/container/stats"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/container/logger"
"github.com/threefoldtech/zos_base/pkg/container/stats"

"github.com/containerd/containerd/cio"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/container/opts.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/opencontainers/runtime-spec/specs-go"
"github.com/shirou/gopsutil/cpu"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"

"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
Expand Down
2 changes: 1 addition & 1 deletion pkg/container/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/containerd/typeurl/v2"
"github.com/patrickmn/go-cache"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/stubs"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

func (c *Module) handlerEventTaskExit(ctx context.Context, ns string, event *events.TaskExit) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/crypto/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/jbenet/go-base58"
"github.com/pkg/errors"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"
"golang.org/x/crypto/ed25519"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/debugcmd/checks/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package checks
import (
"context"

"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"
)

type Checker interface {
Expand Down
12 changes: 6 additions & 6 deletions pkg/debugcmd/checks/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"path/filepath"

cnins "github.com/containernetworking/plugins/pkg/ns"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
"github.com/threefoldtech/zosbase/pkg/network/namespace"
"github.com/threefoldtech/zosbase/pkg/network/nr"
"github.com/threefoldtech/zosbase/pkg/versioned"
"github.com/threefoldtech/zosbase/pkg/zinit"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/gridtypes/zos"
"github.com/threefoldtech/zos_base/pkg/network/namespace"
"github.com/threefoldtech/zos_base/pkg/network/nr"
"github.com/threefoldtech/zos_base/pkg/versioned"
"github.com/threefoldtech/zos_base/pkg/zinit"
"github.com/vishvananda/netlink"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/debugcmd/checks/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path/filepath"

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

const vmdVolatileDir = "/var/run/cache/vmd"
Expand Down
6 changes: 3 additions & 3 deletions pkg/debugcmd/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

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

// Provision is the subset of the provision zbus interface used by debug commands.
Expand Down
2 changes: 1 addition & 1 deletion pkg/debugcmd/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"

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

type GetRequest struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/debugcmd/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"fmt"

"github.com/threefoldtech/zosbase/pkg/debugcmd/checks"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zos_base/pkg/debugcmd/checks"
"github.com/threefoldtech/zos_base/pkg/gridtypes"
)

type HealthRequest struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/debugcmd/history.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"

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

type HistoryRequest struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/debugcmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"fmt"

"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"
)

type InfoRequest struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/diagnostics/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gomodule/redigo/redis"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/diagnostics/diagnostics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/gomodule/redigo/redis"
"github.com/stretchr/testify/require"
"github.com/threefoldtech/zbus"
"github.com/threefoldtech/zosbase/pkg/mocks"
"github.com/threefoldtech/zos_base/pkg/mocks"
"go.uber.org/mock/gomock"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/environment/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zos_base/pkg"

"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zos_base/pkg/kernel"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/environment/environment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/stretchr/testify/assert"
"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zos_base/pkg/kernel"
)

// There are no test against GetEnvironment since the
Expand Down
4 changes: 2 additions & 2 deletions pkg/events/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/utils"
"github.com/threefoldtech/zos_base/pkg"
"github.com/threefoldtech/zos_base/pkg/utils"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/flist.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package pkg

import "github.com/threefoldtech/zosbase/pkg/gridtypes"
import "github.com/threefoldtech/zos_base/pkg/gridtypes"

//go:generate mkdir -p stubs

//go:generate zbusc -module flist -version 0.0.1 -name flist -package stubs github.com/threefoldtech/zosbase/pkg+Flister stubs/flist_stub.go
//go:generate zbusc -module flist -version 0.0.1 -name flist -package stubs github.com/threefoldtech/zos_base/pkg+Flister stubs/flist_stub.go

var (
//DefaultMountOptions has sane values for mount
Expand Down
2 changes: 1 addition & 1 deletion pkg/flist/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg/app"
"github.com/threefoldtech/zos_base/pkg/app"
)

// Cleaner interface, implementer of this interface
Expand Down
12 changes: 6 additions & 6 deletions pkg/flist/flist.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"github.com/hashicorp/go-retryablehttp"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/threefoldtech/zosbase/pkg"
"github.com/threefoldtech/zosbase/pkg/environment"
"github.com/threefoldtech/zosbase/pkg/gridtypes"
"github.com/threefoldtech/zosbase/pkg/kernel"
"github.com/threefoldtech/zosbase/pkg/network/namespace"
"github.com/threefoldtech/zosbase/pkg/stubs"
"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/kernel"
"github.com/threefoldtech/zos_base/pkg/network/namespace"
"github.com/threefoldtech/zos_base/pkg/stubs"
)

const (
Expand Down
Loading
Loading