From ed59259a72008a50bf1921ee588fb0a9e9b4cb8c Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Wed, 8 Jul 2026 14:38:05 +0200 Subject: [PATCH] Rename Go module path zosbase -> zos_base to match repo The repo was renamed zosbase -> zos_base. This renames the module directive and all 665 internal import paths (261 files) so the module no longer depends on GitHub's non-permanent rename redirect. Also updates pkg/Makefile go:generate and scripts/qsfs/go.mod (require + replace LHS; the local ../../zosbasebak path is unchanged). BREAKING: consumers importing github.com/threefoldtech/zosbase must switch to github.com/threefoldtech/zos_base and bump to a new tag cut after this merges. Consumers: zos, zos_light, zos_v4, grid_agent, grid_terraform, grid_pulumi, qss_quantum_storage. Co-Authored-By: Claude Opus 4.8 (1M context) --- client/_http/client.go | 2 +- client/_http/node.go | 2 +- client/node.go | 8 ++-- go.mod | 2 +- pkg/Makefile | 2 +- pkg/api_gateway.go | 2 +- pkg/app/boot.go | 2 +- pkg/app/boot_test.go | 2 +- pkg/app/flag.go | 2 +- pkg/app/flag_test.go | 2 +- pkg/app/log.go | 2 +- pkg/cache/cache.go | 2 +- pkg/cache/cache_test.go | 2 +- pkg/capacity/capacity.go | 14 +++---- pkg/capacity/resource.go | 4 +- pkg/container.go | 6 +-- pkg/container/container.go | 6 +-- pkg/container/opts.go | 2 +- pkg/container/watch.go | 2 +- pkg/crypto/crypto.go | 2 +- pkg/debugcmd/checks/check.go | 4 +- pkg/debugcmd/checks/network.go | 12 +++--- pkg/debugcmd/checks/vm.go | 4 +- pkg/debugcmd/deps.go | 6 +-- pkg/debugcmd/get.go | 2 +- pkg/debugcmd/health.go | 4 +- pkg/debugcmd/history.go | 2 +- pkg/debugcmd/info.go | 4 +- pkg/diagnostics/diagnostics.go | 2 +- pkg/diagnostics/diagnostics_test.go | 2 +- pkg/environment/environment.go | 4 +- pkg/environment/environment_test.go | 2 +- pkg/events/redis.go | 4 +- pkg/flist.go | 4 +- pkg/flist/cleanup.go | 2 +- pkg/flist/flist.go | 12 +++--- pkg/flist/flist_test.go | 6 +-- pkg/gateway.go | 4 +- pkg/gateway/flist.go | 6 +-- pkg/gateway/gateway.go | 12 +++--- pkg/gateway/metrics.go | 4 +- pkg/gateway/nnc.go | 6 +-- pkg/gateway_light/flist.go | 6 +-- pkg/gateway_light/gateway.go | 14 +++---- pkg/gateway_light/metrics.go | 2 +- pkg/gateway_light/nnc.go | 6 +-- pkg/geoip/geoip.go | 2 +- pkg/geoip/geoip_test.go | 2 +- pkg/gridtypes/zos/gw.go | 2 +- pkg/gridtypes/zos/gw_fqdn.go | 2 +- pkg/gridtypes/zos/gw_name.go | 2 +- pkg/gridtypes/zos/ipv4.go | 2 +- pkg/gridtypes/zos/network.go | 2 +- pkg/gridtypes/zos/network_light.go | 2 +- pkg/gridtypes/zos/qsfs.go | 2 +- pkg/gridtypes/zos/types.go | 2 +- pkg/gridtypes/zos/types_test.go | 2 +- pkg/gridtypes/zos/volume.go | 2 +- pkg/gridtypes/zos/zdb.go | 2 +- pkg/gridtypes/zos/zlogs.go | 2 +- pkg/gridtypes/zos/zmachine.go | 2 +- pkg/gridtypes/zos/zmachine_light.go | 2 +- pkg/gridtypes/zos/zmachine_test.go | 2 +- pkg/gridtypes/zos/zmachine_utils.go | 2 +- pkg/gridtypes/zos/zmachinelight_test.go | 2 +- pkg/gridtypes/zos/zmount.go | 2 +- pkg/identity.go | 2 +- pkg/identity/builder.go | 2 +- pkg/identity/identityd.go | 8 ++-- pkg/identity/keys.go | 2 +- pkg/identity/store/file.go | 2 +- pkg/identity/store/tpm.go | 2 +- pkg/monitor.go | 6 +-- pkg/monitord/host.go | 2 +- pkg/monitord/system.go | 8 ++-- pkg/netbase/ifaceutil/ifaceutil.go | 2 +- pkg/netbase/nft/nft.go | 2 +- pkg/netlight/bootstrap/bootstrap.go | 8 ++-- pkg/netlight/bootstrap/bridge.go | 8 ++-- pkg/netlight/bridge/bridge.go | 4 +- pkg/netlight/dhcp/service.go | 2 +- pkg/netlight/iperf/iperf.go | 2 +- pkg/netlight/macvlan/macvlan.go | 2 +- pkg/netlight/macvtap/tap.go | 2 +- pkg/netlight/network.go | 28 +++++++------- pkg/netlight/public/persist.go | 2 +- pkg/netlight/public/public.go | 24 ++++++------ pkg/netlight/public/public_test.go | 10 ++--- pkg/netlight/resource/mycelium.go | 6 +-- pkg/netlight/resource/peers/peerlist.go | 2 +- pkg/netlight/resource/resource.go | 20 +++++----- pkg/netlight/tuntap/tap.go | 2 +- pkg/netlight/types/types.go | 2 +- pkg/netlight/types/types_test.go | 2 +- pkg/network.go | 6 +-- pkg/network/bootstrap/bootstrap.go | 8 ++-- pkg/network/bootstrap/bridge.go | 8 ++-- pkg/network/bridge/bridge.go | 4 +- pkg/network/dhcp/service.go | 2 +- pkg/network/iperf/iperf.go | 2 +- pkg/network/macvlan/macvlan.go | 2 +- pkg/network/macvtap/tap.go | 2 +- pkg/network/migrate_macvlan.go | 6 +-- pkg/network/mycelium/mycelium.go | 4 +- pkg/network/mycelium/namespace.go | 10 ++--- pkg/network/mycelium/public_peerlist.go | 2 +- pkg/network/ndmz/dhcp_monitor.go | 8 ++-- pkg/network/ndmz/dualstack.go | 26 ++++++------- pkg/network/ndmz/ndmz.go | 2 +- pkg/network/network_test.go | 2 +- pkg/network/networker.go | 42 ++++++++++----------- pkg/network/nr/net_resource.go | 28 +++++++------- pkg/network/nr/net_resource_test.go | 2 +- pkg/network/portm/allocator.go | 2 +- pkg/network/public/persist.go | 2 +- pkg/network/public/public.go | 24 ++++++------ pkg/network/public/public_test.go | 8 ++-- pkg/network/public/wireguard.go | 2 +- pkg/network/qsfs.go | 6 +-- pkg/network/tuntap/tap.go | 2 +- pkg/network/types/types.go | 2 +- pkg/network/types/types_test.go | 2 +- pkg/network/yggdrasil/namespace.go | 10 ++--- pkg/network/yggdrasil/public_peerlist.go | 2 +- pkg/network/yggdrasil/utils.go | 2 +- pkg/network/yggdrasil/yygdrasil.go | 4 +- pkg/network_light.go | 6 +-- pkg/perf/cache.go | 2 +- pkg/perf/cache_test.go | 4 +- pkg/perf/cpubench/cpubench_task.go | 6 +-- pkg/perf/cpubench/cpubench_task_test.go | 6 +-- pkg/perf/healthcheck/healthcheck.go | 6 +-- pkg/perf/healthcheck/network.go | 4 +- pkg/perf/healthcheck/ntp.go | 6 +-- pkg/perf/iperf/graphql_wrapper.go | 2 +- pkg/perf/iperf/iperf_task.go | 4 +- pkg/perf/iperf/iperf_task_test.go | 2 +- pkg/perf/iperf/mock_graphql_client.go | 2 +- pkg/perf/monitor.go | 4 +- pkg/perf/monitor_test.go | 4 +- pkg/perf/provisiontest/provisiontest.go | 4 +- pkg/perf/provisiontest/vm.go | 12 +++--- pkg/perf/publicip/publicip_task.go | 12 +++--- pkg/perf/speedtest/speedtest_task.go | 2 +- pkg/perf/zbusctx_test.go | 2 +- pkg/performance_monitor.go | 2 +- pkg/power/power.go | 10 ++--- pkg/power/uptime.go | 6 +-- pkg/primitives/gateway/gatewayfqdn.go | 8 ++-- pkg/primitives/gateway/gatewayname.go | 8 ++-- pkg/primitives/network-light/network.go | 8 ++-- pkg/primitives/network/network.go | 10 ++--- pkg/primitives/provisioner.go | 28 +++++++------- pkg/primitives/pubip/public_ip.go | 10 ++--- pkg/primitives/qsfs/qsfs.go | 8 ++-- pkg/primitives/statistics.go | 12 +++--- pkg/primitives/vm-light/pause.go | 6 +-- pkg/primitives/vm-light/utils.go | 8 ++-- pkg/primitives/vm-light/vm.go | 14 +++---- pkg/primitives/vm/pause.go | 6 +-- pkg/primitives/vm/utils.go | 12 +++--- pkg/primitives/vm/vm.go | 14 +++---- pkg/primitives/vmgpu/vmgpu.go | 6 +-- pkg/primitives/volume/volume.go | 8 ++-- pkg/primitives/zdb/zdb.go | 18 ++++----- pkg/primitives/zlogs/zlogs.go | 10 ++--- pkg/primitives/zmount/zmount.go | 8 ++-- pkg/provision.go | 6 +-- pkg/provision/auth.go | 2 +- pkg/provision/engine.go | 10 ++--- pkg/provision/engine_test.go | 4 +- pkg/provision/interface.go | 2 +- pkg/provision/mw/auth.go | 2 +- pkg/provision/provisiner.go | 2 +- pkg/provision/provisioner_test.go | 2 +- pkg/provision/storage.fs/shared.go | 2 +- pkg/provision/storage.fs/storage.go | 6 +-- pkg/provision/storage.fs/storage_test.go | 4 +- pkg/provision/storage/storage.go | 4 +- pkg/provision/storage/storage_test.go | 4 +- pkg/qsfsd.go | 4 +- pkg/qsfsd/cleanup.go | 4 +- pkg/qsfsd/metrics.go | 6 +-- pkg/qsfsd/qsfs.go | 10 ++--- pkg/registrar.go | 2 +- pkg/registrar/register.go | 10 ++--- pkg/registrar/registrar.go | 6 +-- pkg/registrar_light/register.go | 10 ++--- pkg/registrar_light/registrar.go | 6 +-- pkg/storage.go | 6 +-- pkg/storage/device.go | 6 +-- pkg/storage/disk.go | 4 +- pkg/storage/filesystem/btrfs.go | 2 +- pkg/storage/filesystem/btrfs_test.go | 2 +- pkg/storage/filesystem/device.go | 2 +- pkg/storage/filesystem/device_test.go | 2 +- pkg/storage/filesystem/filesystem.go | 2 +- pkg/storage/filesystem/utils.go | 2 +- pkg/storage/pools.go | 4 +- pkg/storage/storage.go | 14 +++---- pkg/storage/storage_test.go | 4 +- pkg/storage_light/device.go | 6 +-- pkg/storage_light/disk.go | 4 +- pkg/storage_light/filesystem/btrfs.go | 2 +- pkg/storage_light/filesystem/btrfs_test.go | 2 +- pkg/storage_light/filesystem/device.go | 2 +- pkg/storage_light/filesystem/device_test.go | 2 +- pkg/storage_light/filesystem/filesystem.go | 2 +- pkg/storage_light/filesystem/utils.go | 2 +- pkg/storage_light/pools.go | 4 +- pkg/storage_light/storage.go | 14 +++---- pkg/storage_light/storage_test.go | 4 +- pkg/stubs/api_gateway_stub.go | 2 +- pkg/stubs/container_stub.go | 2 +- pkg/stubs/flist_stub.go | 4 +- pkg/stubs/gateway_stub.go | 4 +- pkg/stubs/identity_stub.go | 2 +- pkg/stubs/network_light_stub.go | 6 +-- pkg/stubs/network_stub.go | 6 +-- pkg/stubs/performance_monitor_stub.go | 2 +- pkg/stubs/provision_stub.go | 2 +- pkg/stubs/qsfsd_stub.go | 4 +- pkg/stubs/statistics_stub.go | 4 +- pkg/stubs/storage_stub.go | 6 +-- pkg/stubs/system_monitor_stub.go | 2 +- pkg/stubs/vmd_stub.go | 2 +- pkg/substrate_gateway/substrate_gateway.go | 2 +- pkg/upgrade/boot.go | 4 +- pkg/upgrade/hub/hub.go | 4 +- pkg/upgrade/upgrade.go | 12 +++--- pkg/upgrade/upgrade_test.go | 4 +- pkg/vm.go | 6 +-- pkg/vm/ch.go | 6 +-- pkg/vm/log_helpers.go | 2 +- pkg/vm/logs.go | 4 +- pkg/vm/machine.go | 2 +- pkg/vm/manager.go | 10 ++--- pkg/vm/metrics.go | 2 +- pkg/vm/monitor.go | 6 +-- pkg/zdb/ns_header.go | 2 +- pkg/zdb/ns_header_test.go | 2 +- pkg/zdb/pool.go | 2 +- pkg/zdb/pool_test.go | 2 +- pkg/zdb/zdb.go | 4 +- pkg/zos_api/debug.go | 2 +- pkg/zos_api/deployment.go | 2 +- pkg/zos_api/location.go | 2 +- pkg/zos_api/middlewares.go | 2 +- pkg/zos_api/network.go | 2 +- pkg/zos_api/zos_api.go | 8 ++-- pkg/zos_api_light/deployment.go | 2 +- pkg/zos_api_light/location.go | 2 +- pkg/zos_api_light/network.go | 2 +- pkg/zos_api_light/zos_api.go | 8 ++-- pkg/zui.go | 2 +- pkg/zui/zui.go | 2 +- pkg/zui_light/zui.go | 2 +- scripts/qsfs/go.mod | 4 +- scripts/qsfs/main.go | 6 +-- tools/certify/main.go | 2 +- tools/farmup/main.go | 2 +- 261 files changed, 665 insertions(+), 665 deletions(-) diff --git a/client/_http/client.go b/client/_http/client.go index ccba0a7c..23591245 100644 --- a/client/_http/client.go +++ b/client/_http/client.go @@ -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" ) diff --git a/client/_http/node.go b/client/_http/node.go index d7a25769..271beeb3 100644 --- a/client/_http/node.go +++ b/client/_http/node.go @@ -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 ( diff --git a/client/node.go b/client/node.go index 26be38c3..55d38080 100644 --- a/client/node.go +++ b/client/node.go @@ -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 diff --git a/go.mod b/go.mod index 47d7c7dc..0438b1c4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/threefoldtech/zosbase +module github.com/threefoldtech/zos_base go 1.25.0 diff --git a/pkg/Makefile b/pkg/Makefile index 3fdc85ae..0df9ad58 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -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 ./... diff --git a/pkg/api_gateway.go b/pkg/api_gateway.go index 7bed48c4..9a6fc9e8 100644 --- a/pkg/api_gateway.go +++ b/pkg/api_gateway.go @@ -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) diff --git a/pkg/app/boot.go b/pkg/app/boot.go index 7c43adf2..82419c07 100644 --- a/pkg/app/boot.go +++ b/pkg/app/boot.go @@ -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 diff --git a/pkg/app/boot_test.go b/pkg/app/boot_test.go index 03d50b6c..a57ec388 100644 --- a/pkg/app/boot_test.go +++ b/pkg/app/boot_test.go @@ -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 { diff --git a/pkg/app/flag.go b/pkg/app/flag.go index 87f41e1f..449b0000 100644 --- a/pkg/app/flag.go +++ b/pkg/app/flag.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/app/flag_test.go b/pkg/app/flag_test.go index 7477340b..2e00f3e7 100644 --- a/pkg/app/flag_test.go +++ b/pkg/app/flag_test.go @@ -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. diff --git a/pkg/app/log.go b/pkg/app/log.go index 15cd26c1..00d36172 100644 --- a/pkg/app/log.go +++ b/pkg/app/log.go @@ -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 diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index f84a4ffe..0cabac17 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go index b495d44e..f2a8b61c 100644 --- a/pkg/cache/cache_test.go +++ b/pkg/cache/cache_test.go @@ -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. diff --git a/pkg/capacity/capacity.go b/pkg/capacity/capacity.go index 880846e5..9e5f7853 100644 --- a/pkg/capacity/capacity.go +++ b/pkg/capacity/capacity.go @@ -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 diff --git a/pkg/capacity/resource.go b/pkg/capacity/resource.go index 1e6880b4..b45376f6 100644 --- a/pkg/capacity/resource.go +++ b/pkg/capacity/resource.go @@ -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) { diff --git a/pkg/container.go b/pkg/container.go index 1c5fef98..31ab9d24 100644 --- a/pkg/container.go +++ b/pkg/container.go @@ -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 ( diff --git a/pkg/container/container.go b/pkg/container/container.go index 122d2ed6..72884d23 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -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" ) diff --git a/pkg/container/opts.go b/pkg/container/opts.go index 2c0f136c..70af5905 100644 --- a/pkg/container/opts.go +++ b/pkg/container/opts.go @@ -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" diff --git a/pkg/container/watch.go b/pkg/container/watch.go index e4dc2345..669816ec 100644 --- a/pkg/container/watch.go +++ b/pkg/container/watch.go @@ -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) { diff --git a/pkg/crypto/crypto.go b/pkg/crypto/crypto.go index dc2c231b..3037841b 100644 --- a/pkg/crypto/crypto.go +++ b/pkg/crypto/crypto.go @@ -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" ) diff --git a/pkg/debugcmd/checks/check.go b/pkg/debugcmd/checks/check.go index 3ce8974b..5cbd6028 100644 --- a/pkg/debugcmd/checks/check.go +++ b/pkg/debugcmd/checks/check.go @@ -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 { diff --git a/pkg/debugcmd/checks/network.go b/pkg/debugcmd/checks/network.go index eeb55309..64799e32 100644 --- a/pkg/debugcmd/checks/network.go +++ b/pkg/debugcmd/checks/network.go @@ -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" ) diff --git a/pkg/debugcmd/checks/vm.go b/pkg/debugcmd/checks/vm.go index 1ea94500..ccc80e09 100644 --- a/pkg/debugcmd/checks/vm.go +++ b/pkg/debugcmd/checks/vm.go @@ -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" diff --git a/pkg/debugcmd/deps.go b/pkg/debugcmd/deps.go index 0d62a252..1bc645a7 100644 --- a/pkg/debugcmd/deps.go +++ b/pkg/debugcmd/deps.go @@ -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. diff --git a/pkg/debugcmd/get.go b/pkg/debugcmd/get.go index 0146946f..93b83f0a 100644 --- a/pkg/debugcmd/get.go +++ b/pkg/debugcmd/get.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type GetRequest struct { diff --git a/pkg/debugcmd/health.go b/pkg/debugcmd/health.go index 8dc337ba..ef2563d8 100644 --- a/pkg/debugcmd/health.go +++ b/pkg/debugcmd/health.go @@ -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 { diff --git a/pkg/debugcmd/history.go b/pkg/debugcmd/history.go index 090d8850..b756f7ae 100644 --- a/pkg/debugcmd/history.go +++ b/pkg/debugcmd/history.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type HistoryRequest struct { diff --git a/pkg/debugcmd/info.go b/pkg/debugcmd/info.go index 06c0fcc9..278fe4e1 100644 --- a/pkg/debugcmd/info.go +++ b/pkg/debugcmd/info.go @@ -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 { diff --git a/pkg/diagnostics/diagnostics.go b/pkg/diagnostics/diagnostics.go index aec432d4..1bc9c071 100644 --- a/pkg/diagnostics/diagnostics.go +++ b/pkg/diagnostics/diagnostics.go @@ -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 ( diff --git a/pkg/diagnostics/diagnostics_test.go b/pkg/diagnostics/diagnostics_test.go index 5e8e1c71..751ea27b 100644 --- a/pkg/diagnostics/diagnostics_test.go +++ b/pkg/diagnostics/diagnostics_test.go @@ -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" ) diff --git a/pkg/environment/environment.go b/pkg/environment/environment.go index 522c1933..5aa3efc0 100644 --- a/pkg/environment/environment.go +++ b/pkg/environment/environment.go @@ -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 ( diff --git a/pkg/environment/environment_test.go b/pkg/environment/environment_test.go index 631d9b12..8ef32a25 100644 --- a/pkg/environment/environment_test.go +++ b/pkg/environment/environment_test.go @@ -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 diff --git a/pkg/events/redis.go b/pkg/events/redis.go index 90e49ef4..39b9eb8b 100644 --- a/pkg/events/redis.go +++ b/pkg/events/redis.go @@ -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 ( diff --git a/pkg/flist.go b/pkg/flist.go index 35d43685..f357390c 100644 --- a/pkg/flist.go +++ b/pkg/flist.go @@ -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 diff --git a/pkg/flist/cleanup.go b/pkg/flist/cleanup.go index a751f4b8..0bd0b055 100644 --- a/pkg/flist/cleanup.go +++ b/pkg/flist/cleanup.go @@ -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 diff --git a/pkg/flist/flist.go b/pkg/flist/flist.go index 1ad61efd..022022e8 100644 --- a/pkg/flist/flist.go +++ b/pkg/flist/flist.go @@ -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 ( diff --git a/pkg/flist/flist_test.go b/pkg/flist/flist_test.go index 2592a4c0..f39a8882 100644 --- a/pkg/flist/flist_test.go +++ b/pkg/flist/flist_test.go @@ -15,9 +15,9 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) var templ = template.Must(template.New("script").Parse(` diff --git a/pkg/gateway.go b/pkg/gateway.go index 35034706..ef2e0072 100644 --- a/pkg/gateway.go +++ b/pkg/gateway.go @@ -1,10 +1,10 @@ package pkg -import "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" +import "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" //go:generate mkdir -p stubs -//go:generate zbusc -module gateway -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zosbase/pkg+Gateway stubs/gateway_stub.go +//go:generate zbusc -module gateway -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos_base/pkg+Gateway stubs/gateway_stub.go type GatewayMetrics struct { Request map[string]float64 diff --git a/pkg/gateway/flist.go b/pkg/gateway/flist.go index 344c48b0..bc21d859 100644 --- a/pkg/gateway/flist.go +++ b/pkg/gateway/flist.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "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/stubs" ) // ensureTraefikBin makes sure traefik flist is mounted. diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go index bf48289c..b2aa5c7f 100644 --- a/pkg/gateway/gateway.go +++ b/pkg/gateway/gateway.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/zinit" "gopkg.in/yaml.v2" ) diff --git a/pkg/gateway/metrics.go b/pkg/gateway/metrics.go index 1e30b4c8..5c9416aa 100644 --- a/pkg/gateway/metrics.go +++ b/pkg/gateway/metrics.go @@ -15,8 +15,8 @@ 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/network/namespace" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/network/namespace" ) const ( diff --git a/pkg/gateway/nnc.go b/pkg/gateway/nnc.go index 3b1366a2..823a8c29 100644 --- a/pkg/gateway/nnc.go +++ b/pkg/gateway/nnc.go @@ -13,9 +13,9 @@ import ( "github.com/google/shlex" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/zinit" "gopkg.in/yaml.v2" ) diff --git a/pkg/gateway_light/flist.go b/pkg/gateway_light/flist.go index b3e179ea..66329c94 100644 --- a/pkg/gateway_light/flist.go +++ b/pkg/gateway_light/flist.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - "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/stubs" ) // ensureTraefikBin makes sure traefik flist is mounted. diff --git a/pkg/gateway_light/gateway.go b/pkg/gateway_light/gateway.go index 024884ba..a24ab446 100644 --- a/pkg/gateway_light/gateway.go +++ b/pkg/gateway_light/gateway.go @@ -16,13 +16,13 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/netlight/types" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/netlight/types" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/zinit" "gopkg.in/yaml.v2" ) diff --git a/pkg/gateway_light/metrics.go b/pkg/gateway_light/metrics.go index 2295a222..c7b61e81 100644 --- a/pkg/gateway_light/metrics.go +++ b/pkg/gateway_light/metrics.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/gateway_light/nnc.go b/pkg/gateway_light/nnc.go index 5ddae16d..7bc8c092 100644 --- a/pkg/gateway_light/nnc.go +++ b/pkg/gateway_light/nnc.go @@ -14,9 +14,9 @@ import ( "github.com/google/shlex" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/zinit" "gopkg.in/yaml.v2" ) diff --git a/pkg/geoip/geoip.go b/pkg/geoip/geoip.go index ed668023..3550800e 100644 --- a/pkg/geoip/geoip.go +++ b/pkg/geoip/geoip.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) // Location holds the result of a geoip request diff --git a/pkg/geoip/geoip_test.go b/pkg/geoip/geoip_test.go index eef9a91e..d551f509 100644 --- a/pkg/geoip/geoip_test.go +++ b/pkg/geoip/geoip_test.go @@ -6,7 +6,7 @@ import ( "github.com/jarcoal/httpmock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) func TestGetLocation(t *testing.T) { diff --git a/pkg/gridtypes/zos/gw.go b/pkg/gridtypes/zos/gw.go index d02b2d29..a287dd45 100644 --- a/pkg/gridtypes/zos/gw.go +++ b/pkg/gridtypes/zos/gw.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type Backend string diff --git a/pkg/gridtypes/zos/gw_fqdn.go b/pkg/gridtypes/zos/gw_fqdn.go index c7634665..8bc72632 100644 --- a/pkg/gridtypes/zos/gw_fqdn.go +++ b/pkg/gridtypes/zos/gw_fqdn.go @@ -5,7 +5,7 @@ import ( "io" "regexp" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) var fqdnRegex = regexp.MustCompile(`^([a-zA-Z0-9-_]+\.)+[a-zA-Z0-9-_]{2,}$`) diff --git a/pkg/gridtypes/zos/gw_name.go b/pkg/gridtypes/zos/gw_name.go index fb7e9c2c..17a3395a 100644 --- a/pkg/gridtypes/zos/gw_name.go +++ b/pkg/gridtypes/zos/gw_name.go @@ -5,7 +5,7 @@ import ( "io" "regexp" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) var gwNameRegex = regexp.MustCompile(`^[a-zA-Z0-9-_]+$`) diff --git a/pkg/gridtypes/zos/ipv4.go b/pkg/gridtypes/zos/ipv4.go index 43943d49..4bb08e1a 100644 --- a/pkg/gridtypes/zos/ipv4.go +++ b/pkg/gridtypes/zos/ipv4.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // PublicIP4 structure diff --git a/pkg/gridtypes/zos/network.go b/pkg/gridtypes/zos/network.go index 31fabfc6..2867f3b8 100644 --- a/pkg/gridtypes/zos/network.go +++ b/pkg/gridtypes/zos/network.go @@ -7,7 +7,7 @@ import ( "io" "github.com/jbenet/go-base58" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) const ( diff --git a/pkg/gridtypes/zos/network_light.go b/pkg/gridtypes/zos/network_light.go index 26017741..9f1b9ad8 100644 --- a/pkg/gridtypes/zos/network_light.go +++ b/pkg/gridtypes/zos/network_light.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // NetworkLight is the description of a part of a network local to a specific node. diff --git a/pkg/gridtypes/zos/qsfs.go b/pkg/gridtypes/zos/qsfs.go index 8f92a35f..61f44d68 100644 --- a/pkg/gridtypes/zos/qsfs.go +++ b/pkg/gridtypes/zos/qsfs.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type EncryptionAlgorithm string diff --git a/pkg/gridtypes/zos/types.go b/pkg/gridtypes/zos/types.go index a3952017..bfbb2655 100644 --- a/pkg/gridtypes/zos/types.go +++ b/pkg/gridtypes/zos/types.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) const ( diff --git a/pkg/gridtypes/zos/types_test.go b/pkg/gridtypes/zos/types_test.go index 677ab17e..6e1f0d66 100644 --- a/pkg/gridtypes/zos/types_test.go +++ b/pkg/gridtypes/zos/types_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestWorkloadData(t *testing.T) { diff --git a/pkg/gridtypes/zos/volume.go b/pkg/gridtypes/zos/volume.go index e5ee8436..ae151f07 100644 --- a/pkg/gridtypes/zos/volume.go +++ b/pkg/gridtypes/zos/volume.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type Volume struct { diff --git a/pkg/gridtypes/zos/zdb.go b/pkg/gridtypes/zos/zdb.go index aa90a2ae..871e4e2d 100644 --- a/pkg/gridtypes/zos/zdb.go +++ b/pkg/gridtypes/zos/zdb.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // ZDBMode is the enumeration of the modes 0-db can operate in diff --git a/pkg/gridtypes/zos/zlogs.go b/pkg/gridtypes/zos/zlogs.go index b24e4dfa..f41ef038 100644 --- a/pkg/gridtypes/zos/zlogs.go +++ b/pkg/gridtypes/zos/zlogs.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) var ( diff --git a/pkg/gridtypes/zos/zmachine.go b/pkg/gridtypes/zos/zmachine.go index 01034ba9..627f4eae 100644 --- a/pkg/gridtypes/zos/zmachine.go +++ b/pkg/gridtypes/zos/zmachine.go @@ -7,7 +7,7 @@ import ( "sort" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // MachineNetwork structure diff --git a/pkg/gridtypes/zos/zmachine_light.go b/pkg/gridtypes/zos/zmachine_light.go index 40e7e24b..de19bfd7 100644 --- a/pkg/gridtypes/zos/zmachine_light.go +++ b/pkg/gridtypes/zos/zmachine_light.go @@ -5,7 +5,7 @@ import ( "io" "sort" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // MachineNetworkLight structure diff --git a/pkg/gridtypes/zos/zmachine_test.go b/pkg/gridtypes/zos/zmachine_test.go index 39458a33..3e061ca3 100644 --- a/pkg/gridtypes/zos/zmachine_test.go +++ b/pkg/gridtypes/zos/zmachine_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestZMachineSRU(t *testing.T) { diff --git a/pkg/gridtypes/zos/zmachine_utils.go b/pkg/gridtypes/zos/zmachine_utils.go index 7b5a836c..708b03ea 100644 --- a/pkg/gridtypes/zos/zmachine_utils.go +++ b/pkg/gridtypes/zos/zmachine_utils.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) const ( diff --git a/pkg/gridtypes/zos/zmachinelight_test.go b/pkg/gridtypes/zos/zmachinelight_test.go index 02143cd6..9f80bc05 100644 --- a/pkg/gridtypes/zos/zmachinelight_test.go +++ b/pkg/gridtypes/zos/zmachinelight_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestZMachineLightSRU(t *testing.T) { diff --git a/pkg/gridtypes/zos/zmount.go b/pkg/gridtypes/zos/zmount.go index 6054091a..63445e2d 100644 --- a/pkg/gridtypes/zos/zmount.go +++ b/pkg/gridtypes/zos/zmount.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // ZMount defines a mount point diff --git a/pkg/identity.go b/pkg/identity.go index 5ace45f4..0b2c72eb 100644 --- a/pkg/identity.go +++ b/pkg/identity.go @@ -1,7 +1,7 @@ package pkg //go:generate mkdir -p stubs -//go:generate zbusc -module identityd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zosbase/pkg+IdentityManager stubs/identity_stub.go +//go:generate zbusc -module identityd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos_base/pkg+IdentityManager stubs/identity_stub.go // Identifier is the interface that defines // how an object can be used as an identity diff --git a/pkg/identity/builder.go b/pkg/identity/builder.go index aa236aee..55b288bf 100644 --- a/pkg/identity/builder.go +++ b/pkg/identity/builder.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/identity/store" + "github.com/threefoldtech/zos_base/pkg/identity/store" ) const ( diff --git a/pkg/identity/identityd.go b/pkg/identity/identityd.go index 64c59eab..266831f4 100644 --- a/pkg/identity/identityd.go +++ b/pkg/identity/identityd.go @@ -5,12 +5,12 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "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" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" ) type identityManager struct { diff --git a/pkg/identity/keys.go b/pkg/identity/keys.go index 519691f5..9f1fbd54 100644 --- a/pkg/identity/keys.go +++ b/pkg/identity/keys.go @@ -2,7 +2,7 @@ package identity import ( "github.com/jbenet/go-base58" - "github.com/threefoldtech/zosbase/pkg/versioned" + "github.com/threefoldtech/zos_base/pkg/versioned" "golang.org/x/crypto/ed25519" ) diff --git a/pkg/identity/store/file.go b/pkg/identity/store/file.go index f376c1b0..e0ca39c4 100644 --- a/pkg/identity/store/file.go +++ b/pkg/identity/store/file.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/versioned" + "github.com/threefoldtech/zos_base/pkg/versioned" "github.com/tyler-smith/go-bip39" ) diff --git a/pkg/identity/store/tpm.go b/pkg/identity/store/tpm.go index 635f4276..588279a5 100644 --- a/pkg/identity/store/tpm.go +++ b/pkg/identity/store/tpm.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/threefoldtech/zosbase/pkg/identity/store/tpm" + "github.com/threefoldtech/zos_base/pkg/identity/store/tpm" ) const ( diff --git a/pkg/monitor.go b/pkg/monitor.go index 68a46cee..f354af6b 100644 --- a/pkg/monitor.go +++ b/pkg/monitor.go @@ -1,9 +1,9 @@ package pkg //go:generate mkdir -p stubs -//go:generate zbusc -module node -version 0.0.1 -name system -package stubs github.com/threefoldtech/zosbase/pkg+SystemMonitor stubs/system_monitor_stub.go -//go:generate zbusc -module node -version 0.0.1 -name host -package stubs github.com/threefoldtech/zosbase/pkg+HostMonitor stubs/host_monitor_stub.go -//go:generate zbusc -module identityd -version 0.0.1 -name monitor -package stubs github.com/threefoldtech/zosbase/pkg+VersionMonitor stubs/version_monitor_stub.go +//go:generate zbusc -module node -version 0.0.1 -name system -package stubs github.com/threefoldtech/zos_base/pkg+SystemMonitor stubs/system_monitor_stub.go +//go:generate zbusc -module node -version 0.0.1 -name host -package stubs github.com/threefoldtech/zos_base/pkg+HostMonitor stubs/host_monitor_stub.go +//go:generate zbusc -module identityd -version 0.0.1 -name monitor -package stubs github.com/threefoldtech/zos_base/pkg+VersionMonitor stubs/version_monitor_stub.go import ( "context" diff --git a/pkg/monitord/host.go b/pkg/monitord/host.go index 7d1a5ba1..592143a9 100644 --- a/pkg/monitord/host.go +++ b/pkg/monitord/host.go @@ -7,7 +7,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) // HostMonitor monitor host information diff --git a/pkg/monitord/system.go b/pkg/monitord/system.go index 7f3cfd85..46c15ca7 100644 --- a/pkg/monitord/system.go +++ b/pkg/monitord/system.go @@ -10,10 +10,10 @@ import ( "github.com/shirou/gopsutil/mem" "github.com/shirou/gopsutil/net" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var _ pkg.SystemMonitor = (*systemMonitor)(nil) diff --git a/pkg/netbase/ifaceutil/ifaceutil.go b/pkg/netbase/ifaceutil/ifaceutil.go index 9b233659..ec40a748 100644 --- a/pkg/netbase/ifaceutil/ifaceutil.go +++ b/pkg/netbase/ifaceutil/ifaceutil.go @@ -5,7 +5,7 @@ import ( "net" "github.com/containernetworking/plugins/pkg/ns" - "github.com/threefoldtech/zosbase/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/namespace" "github.com/vishvananda/netlink" ) diff --git a/pkg/netbase/nft/nft.go b/pkg/netbase/nft/nft.go index 91919c3e..e094a043 100644 --- a/pkg/netbase/nft/nft.go +++ b/pkg/netbase/nft/nft.go @@ -10,7 +10,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/bootstrap/bootstrap.go b/pkg/netlight/bootstrap/bootstrap.go index 1f872b07..15fc0e1c 100644 --- a/pkg/netlight/bootstrap/bootstrap.go +++ b/pkg/netlight/bootstrap/bootstrap.go @@ -12,14 +12,14 @@ import ( "sync" "time" - "github.com/threefoldtech/zosbase/pkg/netlight/dhcp" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" - "github.com/threefoldtech/zosbase/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/dhcp" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" + "github.com/threefoldtech/zos_base/pkg/netlight/options" "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/bootstrap/bridge.go b/pkg/netlight/bootstrap/bridge.go index 48907a28..0f854799 100644 --- a/pkg/netlight/bootstrap/bridge.go +++ b/pkg/netlight/bootstrap/bridge.go @@ -3,13 +3,13 @@ package bootstrap import ( "fmt" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/options" - "github.com/threefoldtech/zosbase/pkg/netlight/types" + "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/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/bridge/bridge.go b/pkg/netlight/bridge/bridge.go index 2a80e0e6..94c5302f 100644 --- a/pkg/netlight/bridge/bridge.go +++ b/pkg/netlight/bridge/bridge.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/dhcp/service.go b/pkg/netlight/dhcp/service.go index 44c1fc77..229a7599 100644 --- a/pkg/netlight/dhcp/service.go +++ b/pkg/netlight/dhcp/service.go @@ -6,7 +6,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/netlight/iperf/iperf.go b/pkg/netlight/iperf/iperf.go index da9402f2..05123a36 100644 --- a/pkg/netlight/iperf/iperf.go +++ b/pkg/netlight/iperf/iperf.go @@ -5,7 +5,7 @@ import ( "os/exec" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/netlight/macvlan/macvlan.go b/pkg/netlight/macvlan/macvlan.go index 3c8bdcdc..a3265466 100644 --- a/pkg/netlight/macvlan/macvlan.go +++ b/pkg/netlight/macvlan/macvlan.go @@ -7,7 +7,7 @@ import ( "os" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/options" "github.com/containernetworking/plugins/pkg/ip" "github.com/containernetworking/plugins/pkg/ns" diff --git a/pkg/netlight/macvtap/tap.go b/pkg/netlight/macvtap/tap.go index 3b6c2945..5bb20f73 100644 --- a/pkg/netlight/macvtap/tap.go +++ b/pkg/netlight/macvtap/tap.go @@ -5,7 +5,7 @@ import ( "net" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/network.go b/pkg/netlight/network.go index de436204..262728a4 100644 --- a/pkg/netlight/network.go +++ b/pkg/netlight/network.go @@ -17,20 +17,20 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/netbase/wireguard" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/ipam" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" - "github.com/threefoldtech/zosbase/pkg/netlight/options" - "github.com/threefoldtech/zosbase/pkg/netlight/public" - "github.com/threefoldtech/zosbase/pkg/netlight/resource" - "github.com/threefoldtech/zosbase/pkg/set" - "github.com/threefoldtech/zosbase/pkg/versioned" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/netbase/wireguard" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/ipam" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" + "github.com/threefoldtech/zos_base/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/public" + "github.com/threefoldtech/zos_base/pkg/netlight/resource" + "github.com/threefoldtech/zos_base/pkg/set" + "github.com/threefoldtech/zos_base/pkg/versioned" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/public/persist.go b/pkg/netlight/public/persist.go index ea905c43..663e907b 100644 --- a/pkg/netlight/public/persist.go +++ b/pkg/netlight/public/persist.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/netlight/public/public.go b/pkg/netlight/public/public.go index 39ef087b..df60be2d 100644 --- a/pkg/netlight/public/public.go +++ b/pkg/netlight/public/public.go @@ -10,18 +10,18 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/environment" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/netlight/bootstrap" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/iperf" - "github.com/threefoldtech/zosbase/pkg/netlight/macvlan" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" - "github.com/threefoldtech/zosbase/pkg/netlight/options" - "github.com/threefoldtech/zosbase/pkg/netlight/types" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/environment" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/netlight/bootstrap" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/iperf" + "github.com/threefoldtech/zos_base/pkg/netlight/macvlan" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" + "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/vishvananda/netlink" ) diff --git a/pkg/netlight/public/public_test.go b/pkg/netlight/public/public_test.go index 5694adc8..3f32ab1e 100644 --- a/pkg/netlight/public/public_test.go +++ b/pkg/netlight/public/public_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" - "github.com/threefoldtech/zosbase/pkg/netlight/types" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" + "github.com/threefoldtech/zos_base/pkg/netlight/types" ) func TestCreatePublicNS(t *testing.T) { diff --git a/pkg/netlight/resource/mycelium.go b/pkg/netlight/resource/mycelium.go index 32f2444c..d8a22778 100644 --- a/pkg/netlight/resource/mycelium.go +++ b/pkg/netlight/resource/mycelium.go @@ -13,9 +13,9 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/netbase/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/resource/peers" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/netbase/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/resource/peers" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/netlight/resource/peers/peerlist.go b/pkg/netlight/resource/peers/peerlist.go index 267c6b96..0d9d6b1a 100644 --- a/pkg/netlight/resource/peers/peerlist.go +++ b/pkg/netlight/resource/peers/peerlist.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) // Peers is a peers list diff --git a/pkg/netlight/resource/resource.go b/pkg/netlight/resource/resource.go index f37bffcd..890a5745 100644 --- a/pkg/netlight/resource/resource.go +++ b/pkg/netlight/resource/resource.go @@ -13,16 +13,16 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/rs/zerolog/log" - localPkg "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" - "github.com/threefoldtech/zosbase/pkg/netbase/wireguard" - "github.com/threefoldtech/zosbase/pkg/netlight/bridge" - "github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/netlight/namespace" - "github.com/threefoldtech/zosbase/pkg/netlight/options" - "github.com/threefoldtech/zosbase/pkg/netlight/tuntap" - "github.com/threefoldtech/zosbase/pkg/zinit" + localPkg "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/netbase/nft" + "github.com/threefoldtech/zos_base/pkg/netbase/wireguard" + "github.com/threefoldtech/zos_base/pkg/netlight/bridge" + "github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/netlight/namespace" + "github.com/threefoldtech/zos_base/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/tuntap" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/tuntap/tap.go b/pkg/netlight/tuntap/tap.go index 6e8ea791..71293d54 100644 --- a/pkg/netlight/tuntap/tap.go +++ b/pkg/netlight/tuntap/tap.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/netlight/options" + "github.com/threefoldtech/zos_base/pkg/netlight/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/netlight/types/types.go b/pkg/netlight/types/types.go index 27881069..411ab643 100644 --- a/pkg/netlight/types/types.go +++ b/pkg/netlight/types/types.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // MacAddress type diff --git a/pkg/netlight/types/types_test.go b/pkg/netlight/types/types_test.go index 11d42a5b..4e2ab610 100644 --- a/pkg/netlight/types/types_test.go +++ b/pkg/netlight/types/types_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestParseIPNet(t *testing.T) { diff --git a/pkg/network.go b/pkg/network.go index e83a57bb..c94e2099 100644 --- a/pkg/network.go +++ b/pkg/network.go @@ -7,12 +7,12 @@ import ( "reflect" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "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" ) //go:generate mkdir -p stubs -//go:generate zbusc -module network -version 0.0.1 -name network -package stubs github.com/threefoldtech/zosbase/pkg+Networker stubs/network_stub.go +//go:generate zbusc -module network -version 0.0.1 -name network -package stubs github.com/threefoldtech/zos_base/pkg+Networker stubs/network_stub.go // ContainerNetworkConfig defines how to construct the network namespace of a container type ContainerNetworkConfig struct { diff --git a/pkg/network/bootstrap/bootstrap.go b/pkg/network/bootstrap/bootstrap.go index f4cf214b..31a24542 100644 --- a/pkg/network/bootstrap/bootstrap.go +++ b/pkg/network/bootstrap/bootstrap.go @@ -12,14 +12,14 @@ import ( "sync" "time" - "github.com/threefoldtech/zosbase/pkg/network/dhcp" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/dhcp" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/bootstrap/bridge.go b/pkg/network/bootstrap/bridge.go index ede74fd2..56b993d5 100644 --- a/pkg/network/bootstrap/bridge.go +++ b/pkg/network/bootstrap/bridge.go @@ -3,13 +3,13 @@ package bootstrap import ( "fmt" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/options" - "github.com/threefoldtech/zosbase/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/types" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/bridge" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/bridge/bridge.go b/pkg/network/bridge/bridge.go index 248f1a78..eac73ef6 100644 --- a/pkg/network/bridge/bridge.go +++ b/pkg/network/bridge/bridge.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/dhcp/service.go b/pkg/network/dhcp/service.go index 44c1fc77..229a7599 100644 --- a/pkg/network/dhcp/service.go +++ b/pkg/network/dhcp/service.go @@ -6,7 +6,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/network/iperf/iperf.go b/pkg/network/iperf/iperf.go index da9402f2..05123a36 100644 --- a/pkg/network/iperf/iperf.go +++ b/pkg/network/iperf/iperf.go @@ -5,7 +5,7 @@ import ( "os/exec" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/network/macvlan/macvlan.go b/pkg/network/macvlan/macvlan.go index 7cf9d0e7..22d79a49 100644 --- a/pkg/network/macvlan/macvlan.go +++ b/pkg/network/macvlan/macvlan.go @@ -7,7 +7,7 @@ import ( "os" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/containernetworking/plugins/pkg/ip" "github.com/containernetworking/plugins/pkg/ns" diff --git a/pkg/network/macvtap/tap.go b/pkg/network/macvtap/tap.go index 218e9c62..454caad8 100644 --- a/pkg/network/macvtap/tap.go +++ b/pkg/network/macvtap/tap.go @@ -5,7 +5,7 @@ import ( "net" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/migrate_macvlan.go b/pkg/network/migrate_macvlan.go index d8306e34..f841672b 100644 --- a/pkg/network/migrate_macvlan.go +++ b/pkg/network/migrate_macvlan.go @@ -8,9 +8,9 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/mycelium/mycelium.go b/pkg/network/mycelium/mycelium.go index 21afaccf..2ce1c0da 100644 --- a/pkg/network/mycelium/mycelium.go +++ b/pkg/network/mycelium/mycelium.go @@ -16,8 +16,8 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/x25519" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/network/mycelium/namespace.go b/pkg/network/mycelium/namespace.go index be4ed792..31760f00 100644 --- a/pkg/network/mycelium/namespace.go +++ b/pkg/network/mycelium/namespace.go @@ -8,11 +8,11 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/macvlan" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/types" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/mycelium/public_peerlist.go b/pkg/network/mycelium/public_peerlist.go index 2244ff7a..3c661635 100644 --- a/pkg/network/mycelium/public_peerlist.go +++ b/pkg/network/mycelium/public_peerlist.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) // Peers is a peers list diff --git a/pkg/network/ndmz/dhcp_monitor.go b/pkg/network/ndmz/dhcp_monitor.go index b2417135..5d326734 100644 --- a/pkg/network/ndmz/dhcp_monitor.go +++ b/pkg/network/ndmz/dhcp_monitor.go @@ -7,10 +7,10 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/dhcp" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/network/dhcp" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/ndmz/dualstack.go b/pkg/network/ndmz/dualstack.go index 8cfc3e10..06efdcf1 100644 --- a/pkg/network/ndmz/dualstack.go +++ b/pkg/network/ndmz/dualstack.go @@ -11,25 +11,25 @@ import ( "time" "github.com/cenkalti/backoff/v3" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/dhcp" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/options" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/network/yggdrasil" - "github.com/threefoldtech/zosbase/pkg/zinit" - - "github.com/threefoldtech/zosbase/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/netbase/nft" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/dhcp" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/network/yggdrasil" + "github.com/threefoldtech/zos_base/pkg/zinit" + + "github.com/threefoldtech/zos_base/pkg/network/macvlan" "github.com/rs/zerolog/log" "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/namespace" ) const ( diff --git a/pkg/network/ndmz/ndmz.go b/pkg/network/ndmz/ndmz.go index 5eefc473..4c9f522e 100644 --- a/pkg/network/ndmz/ndmz.go +++ b/pkg/network/ndmz/ndmz.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/threefoldtech/zosbase/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/network/types" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/network_test.go b/pkg/network/network_test.go index f1e35339..03ec7c60 100644 --- a/pkg/network/network_test.go +++ b/pkg/network/network_test.go @@ -9,7 +9,7 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "github.com/threefoldtech/zosbase/pkg/crypto" + "github.com/threefoldtech/zos_base/pkg/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/network/networker.go b/pkg/network/networker.go index 1bb98a8f..96b0b3ac 100644 --- a/pkg/network/networker.go +++ b/pkg/network/networker.go @@ -18,38 +18,38 @@ import ( "github.com/blang/semver" "github.com/cenkalti/backoff/v3" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/netbase/wireguard" - "github.com/threefoldtech/zosbase/pkg/network/bootstrap" - "github.com/threefoldtech/zosbase/pkg/network/iperf" - "github.com/threefoldtech/zosbase/pkg/network/mycelium" - "github.com/threefoldtech/zosbase/pkg/network/ndmz" - "github.com/threefoldtech/zosbase/pkg/network/public" - "github.com/threefoldtech/zosbase/pkg/network/tuntap" - "github.com/threefoldtech/zosbase/pkg/network/yggdrasil" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/cache" + "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/netbase/wireguard" + "github.com/threefoldtech/zos_base/pkg/network/bootstrap" + "github.com/threefoldtech/zos_base/pkg/network/iperf" + "github.com/threefoldtech/zos_base/pkg/network/mycelium" + "github.com/threefoldtech/zos_base/pkg/network/ndmz" + "github.com/threefoldtech/zos_base/pkg/network/public" + "github.com/threefoldtech/zos_base/pkg/network/tuntap" + "github.com/threefoldtech/zos_base/pkg/network/yggdrasil" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/vishvananda/netlink" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" "github.com/containernetworking/plugins/pkg/ns" - "github.com/threefoldtech/zosbase/pkg/network/nr" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/set" - "github.com/threefoldtech/zosbase/pkg/versioned" + "github.com/threefoldtech/zos_base/pkg/network/nr" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/set" + "github.com/threefoldtech/zos_base/pkg/versioned" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/network/nr/net_resource.go b/pkg/network/nr/net_resource.go index 7d72d1c9..2a6f5aad 100644 --- a/pkg/network/nr/net_resource.go +++ b/pkg/network/nr/net_resource.go @@ -15,14 +15,14 @@ import ( "time" "github.com/cenkalti/backoff/v3" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/macvlan" - "github.com/threefoldtech/zosbase/pkg/network/mycelium" - "github.com/threefoldtech/zosbase/pkg/network/ndmz" - "github.com/threefoldtech/zosbase/pkg/network/options" - "github.com/threefoldtech/zosbase/pkg/network/tuntap" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/network/mycelium" + "github.com/threefoldtech/zos_base/pkg/network/ndmz" + "github.com/threefoldtech/zos_base/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/tuntap" + "github.com/threefoldtech/zos_base/pkg/zinit" mapset "github.com/deckarep/golang-set" @@ -30,14 +30,14 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" - "github.com/threefoldtech/zosbase/pkg/netbase/wireguard" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/netbase/nft" + "github.com/threefoldtech/zos_base/pkg/netbase/wireguard" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/namespace" "github.com/vishvananda/netlink" - baseifaceutil "github.com/threefoldtech/zosbase/pkg/netbase/ifaceutil" + baseifaceutil "github.com/threefoldtech/zos_base/pkg/netbase/ifaceutil" ) const ( diff --git a/pkg/network/nr/net_resource_test.go b/pkg/network/nr/net_resource_test.go index 26540f39..1942c365 100644 --- a/pkg/network/nr/net_resource_test.go +++ b/pkg/network/nr/net_resource_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/portm/allocator.go b/pkg/network/portm/allocator.go index f44d0276..1c4fad71 100644 --- a/pkg/network/portm/allocator.go +++ b/pkg/network/portm/allocator.go @@ -3,7 +3,7 @@ package portm import ( "errors" - "github.com/threefoldtech/zosbase/pkg/network/portm/backend" + "github.com/threefoldtech/zos_base/pkg/network/portm/backend" ) // ErrNoFreePort is returned when trying to reserve a port but all the diff --git a/pkg/network/public/persist.go b/pkg/network/public/persist.go index ea905c43..663e907b 100644 --- a/pkg/network/public/persist.go +++ b/pkg/network/public/persist.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/network/public/public.go b/pkg/network/public/public.go index f351e0f9..da389a38 100644 --- a/pkg/network/public/public.go +++ b/pkg/network/public/public.go @@ -10,18 +10,18 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "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/network/bootstrap" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/iperf" - "github.com/threefoldtech/zosbase/pkg/network/macvlan" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/options" - "github.com/threefoldtech/zosbase/pkg/network/types" - "github.com/threefoldtech/zosbase/pkg/zinit" + "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/network/bootstrap" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/iperf" + "github.com/threefoldtech/zos_base/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/public/public_test.go b/pkg/network/public/public_test.go index 47722154..79b4d82d 100644 --- a/pkg/network/public/public_test.go +++ b/pkg/network/public/public_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/types" ) func TestCreatePublicNS(t *testing.T) { diff --git a/pkg/network/public/wireguard.go b/pkg/network/public/wireguard.go index d3dcce42..7d106f21 100644 --- a/pkg/network/public/wireguard.go +++ b/pkg/network/public/wireguard.go @@ -2,7 +2,7 @@ package public import ( "github.com/containernetworking/plugins/pkg/ns" - "github.com/threefoldtech/zosbase/pkg/netbase/wireguard" + "github.com/threefoldtech/zos_base/pkg/netbase/wireguard" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/qsfs.go b/pkg/network/qsfs.go index cccc64e0..89edf3ca 100644 --- a/pkg/network/qsfs.go +++ b/pkg/network/qsfs.go @@ -7,9 +7,9 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/netbase/nft" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/netbase/nft" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/namespace" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/tuntap/tap.go b/pkg/network/tuntap/tap.go index b3813d9c..ea44d5f5 100644 --- a/pkg/network/tuntap/tap.go +++ b/pkg/network/tuntap/tap.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/network/options" + "github.com/threefoldtech/zos_base/pkg/network/options" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/types/types.go b/pkg/network/types/types.go index 380fa663..e6b82e22 100644 --- a/pkg/network/types/types.go +++ b/pkg/network/types/types.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // MacAddress type diff --git a/pkg/network/types/types_test.go b/pkg/network/types/types_test.go index 198c6873..4ac4f103 100644 --- a/pkg/network/types/types_test.go +++ b/pkg/network/types/types_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestParseIPNet(t *testing.T) { diff --git a/pkg/network/yggdrasil/namespace.go b/pkg/network/yggdrasil/namespace.go index d13719b3..020910bf 100644 --- a/pkg/network/yggdrasil/namespace.go +++ b/pkg/network/yggdrasil/namespace.go @@ -8,11 +8,11 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/network/macvlan" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/network/types" + "github.com/threefoldtech/zos_base/pkg/network/bridge" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/network/types" "github.com/vishvananda/netlink" ) diff --git a/pkg/network/yggdrasil/public_peerlist.go b/pkg/network/yggdrasil/public_peerlist.go index e41362f0..b4bb600c 100644 --- a/pkg/network/yggdrasil/public_peerlist.go +++ b/pkg/network/yggdrasil/public_peerlist.go @@ -5,7 +5,7 @@ import ( "net/url" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) // Peers is a peers list diff --git a/pkg/network/yggdrasil/utils.go b/pkg/network/yggdrasil/utils.go index 586e6021..5df18942 100644 --- a/pkg/network/yggdrasil/utils.go +++ b/pkg/network/yggdrasil/utils.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/zinit" ) func EnsureYggdrasil(ctx context.Context, privateKey ed25519.PrivateKey, ns YggdrasilNamespace) (*YggServer, error) { diff --git a/pkg/network/yggdrasil/yygdrasil.go b/pkg/network/yggdrasil/yygdrasil.go index dea326d8..c7444cdf 100644 --- a/pkg/network/yggdrasil/yygdrasil.go +++ b/pkg/network/yggdrasil/yygdrasil.go @@ -13,8 +13,8 @@ import ( "time" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/zinit" "github.com/yggdrasil-network/yggdrasil-go/src/address" ) diff --git a/pkg/network_light.go b/pkg/network_light.go index 13cc490d..d4a2debd 100644 --- a/pkg/network_light.go +++ b/pkg/network_light.go @@ -4,12 +4,12 @@ import ( "context" "net" - "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" ) //go:generate mkdir -p stubs -//go:generate zbusc -module netlight -version 0.0.1 -name netlight -package stubs github.com/threefoldtech/zosbase/pkg+NetworkerLight stubs/network_light_stub.go +//go:generate zbusc -module netlight -version 0.0.1 -name netlight -package stubs github.com/threefoldtech/zos_base/pkg+NetworkerLight stubs/network_light_stub.go // NetworkerLight is the interface for the network light module type NetworkerLight interface { diff --git a/pkg/perf/cache.go b/pkg/perf/cache.go index b9d6d237..3972ff73 100644 --- a/pkg/perf/cache.go +++ b/pkg/perf/cache.go @@ -7,7 +7,7 @@ import ( "github.com/garyburd/redigo/redis" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) const ( diff --git a/pkg/perf/cache_test.go b/pkg/perf/cache_test.go index 46e99b96..4776ce78 100644 --- a/pkg/perf/cache_test.go +++ b/pkg/perf/cache_test.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/utils" "go.uber.org/mock/gomock" ) diff --git a/pkg/perf/cpubench/cpubench_task.go b/pkg/perf/cpubench/cpubench_task.go index ef6524bd..02ac280a 100644 --- a/pkg/perf/cpubench/cpubench_task.go +++ b/pkg/perf/cpubench/cpubench_task.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "github.com/threefoldtech/zosbase/pkg/perf" - execwrapper "github.com/threefoldtech/zosbase/pkg/perf/exec_wrapper" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/perf" + execwrapper "github.com/threefoldtech/zos_base/pkg/perf/exec_wrapper" + "github.com/threefoldtech/zos_base/pkg/stubs" ) // CPUBenchmarkTask defines CPU benchmark task. diff --git a/pkg/perf/cpubench/cpubench_task_test.go b/pkg/perf/cpubench/cpubench_task_test.go index b2c1653e..f01c16c7 100644 --- a/pkg/perf/cpubench/cpubench_task_test.go +++ b/pkg/perf/cpubench/cpubench_task_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/mocks" - "github.com/threefoldtech/zosbase/pkg/perf" - execwrapper "github.com/threefoldtech/zosbase/pkg/perf/exec_wrapper" + "github.com/threefoldtech/zos_base/pkg/mocks" + "github.com/threefoldtech/zos_base/pkg/perf" + execwrapper "github.com/threefoldtech/zos_base/pkg/perf/exec_wrapper" "go.uber.org/mock/gomock" ) diff --git a/pkg/perf/healthcheck/healthcheck.go b/pkg/perf/healthcheck/healthcheck.go index 2d038292..7cd90fb7 100644 --- a/pkg/perf/healthcheck/healthcheck.go +++ b/pkg/perf/healthcheck/healthcheck.go @@ -9,9 +9,9 @@ import ( "github.com/cenkalti/backoff" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/perf/healthcheck/network.go b/pkg/perf/healthcheck/network.go index 438895ab..8bd86a1b 100644 --- a/pkg/perf/healthcheck/network.go +++ b/pkg/perf/healthcheck/network.go @@ -10,8 +10,8 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" ) const defaultRequestTimeout = 10 * time.Second diff --git a/pkg/perf/healthcheck/ntp.go b/pkg/perf/healthcheck/ntp.go index 6cc4fdc6..173402b1 100644 --- a/pkg/perf/healthcheck/ntp.go +++ b/pkg/perf/healthcheck/ntp.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const acceptableSkew = 10 * time.Minute diff --git a/pkg/perf/iperf/graphql_wrapper.go b/pkg/perf/iperf/graphql_wrapper.go index f55d8d6f..300dfacd 100644 --- a/pkg/perf/iperf/graphql_wrapper.go +++ b/pkg/perf/iperf/graphql_wrapper.go @@ -3,7 +3,7 @@ package iperf import ( "context" - "github.com/threefoldtech/zosbase/pkg/perf/graphql" + "github.com/threefoldtech/zos_base/pkg/perf/graphql" ) // GraphQLClient interface for mocking GraphQL operations diff --git a/pkg/perf/iperf/iperf_task.go b/pkg/perf/iperf/iperf_task.go index a8ae3746..c724ce76 100644 --- a/pkg/perf/iperf/iperf_task.go +++ b/pkg/perf/iperf/iperf_task.go @@ -18,8 +18,8 @@ import ( "github.com/cenkalti/backoff" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/perf" - execwrapper "github.com/threefoldtech/zosbase/pkg/perf/exec_wrapper" + "github.com/threefoldtech/zos_base/pkg/perf" + execwrapper "github.com/threefoldtech/zos_base/pkg/perf/exec_wrapper" ) const ( diff --git a/pkg/perf/iperf/iperf_task_test.go b/pkg/perf/iperf/iperf_task_test.go index c34b531c..7147cf73 100644 --- a/pkg/perf/iperf/iperf_task_test.go +++ b/pkg/perf/iperf/iperf_task_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - execwrapper "github.com/threefoldtech/zosbase/pkg/perf/exec_wrapper" + execwrapper "github.com/threefoldtech/zos_base/pkg/perf/exec_wrapper" "go.uber.org/mock/gomock" ) diff --git a/pkg/perf/iperf/mock_graphql_client.go b/pkg/perf/iperf/mock_graphql_client.go index 57a1875a..98c87f55 100644 --- a/pkg/perf/iperf/mock_graphql_client.go +++ b/pkg/perf/iperf/mock_graphql_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - graphql "github.com/threefoldtech/zosbase/pkg/perf/graphql" + graphql "github.com/threefoldtech/zos_base/pkg/perf/graphql" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/perf/monitor.go b/pkg/perf/monitor.go index 3d47ea38..0ec166cf 100644 --- a/pkg/perf/monitor.go +++ b/pkg/perf/monitor.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/utils" ) // PerformanceMonitor holds the module data diff --git a/pkg/perf/monitor_test.go b/pkg/perf/monitor_test.go index 2c38989d..a96b43de 100644 --- a/pkg/perf/monitor_test.go +++ b/pkg/perf/monitor_test.go @@ -9,8 +9,8 @@ import ( "github.com/go-co-op/gocron" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/mocks" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/mocks" + "github.com/threefoldtech/zos_base/pkg/utils" "go.uber.org/mock/gomock" ) diff --git a/pkg/perf/provisiontest/provisiontest.go b/pkg/perf/provisiontest/provisiontest.go index 5a58504b..8d47d53f 100644 --- a/pkg/perf/provisiontest/provisiontest.go +++ b/pkg/perf/provisiontest/provisiontest.go @@ -7,8 +7,8 @@ import ( "github.com/cenkalti/backoff" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/perf/provisiontest/vm.go b/pkg/perf/provisiontest/vm.go index 1479efb3..faffb3b3 100644 --- a/pkg/perf/provisiontest/vm.go +++ b/pkg/perf/provisiontest/vm.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/stubs" ) // FListInfo contains virtual machine flist details diff --git a/pkg/perf/publicip/publicip_task.go b/pkg/perf/publicip/publicip_task.go index aeb58ecd..92718dd8 100644 --- a/pkg/perf/publicip/publicip_task.go +++ b/pkg/perf/publicip/publicip_task.go @@ -14,12 +14,12 @@ import ( "github.com/pion/stun" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/network/macvlan" - "github.com/threefoldtech/zosbase/pkg/network/namespace" - "github.com/threefoldtech/zosbase/pkg/perf" - "github.com/threefoldtech/zosbase/pkg/perf/graphql" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/network/macvlan" + "github.com/threefoldtech/zos_base/pkg/network/namespace" + "github.com/threefoldtech/zos_base/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/perf/graphql" + "github.com/threefoldtech/zos_base/pkg/stubs" "github.com/vishvananda/netlink" ) diff --git a/pkg/perf/speedtest/speedtest_task.go b/pkg/perf/speedtest/speedtest_task.go index c3214800..5394897f 100644 --- a/pkg/perf/speedtest/speedtest_task.go +++ b/pkg/perf/speedtest/speedtest_task.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog/log" "github.com/showwin/speedtest-go/speedtest" - "github.com/threefoldtech/zosbase/pkg/perf" + "github.com/threefoldtech/zos_base/pkg/perf" ) type SpeedTestTask struct { diff --git a/pkg/perf/zbusctx_test.go b/pkg/perf/zbusctx_test.go index 5cfadf7a..686c9264 100644 --- a/pkg/perf/zbusctx_test.go +++ b/pkg/perf/zbusctx_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "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" ) diff --git a/pkg/performance_monitor.go b/pkg/performance_monitor.go index fef8b413..93e8a25a 100644 --- a/pkg/performance_monitor.go +++ b/pkg/performance_monitor.go @@ -1,6 +1,6 @@ package pkg -//go:generate zbusc -module node -version 0.0.1 -name performance-monitor -package stubs github.com/threefoldtech/zosbase/pkg+PerformanceMonitor stubs/performance_monitor_stub.go +//go:generate zbusc -module node -version 0.0.1 -name performance-monitor -package stubs github.com/threefoldtech/zos_base/pkg+PerformanceMonitor stubs/performance_monitor_stub.go type PerformanceMonitor interface { Get(taskName string) (TaskResult, error) diff --git a/pkg/power/power.go b/pkg/power/power.go index 6ab94ee4..bccb73a9 100644 --- a/pkg/power/power.go +++ b/pkg/power/power.go @@ -10,11 +10,11 @@ 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/events" - "github.com/threefoldtech/zosbase/pkg/network/bridge" - "github.com/threefoldtech/zosbase/pkg/stubs" - "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/stubs" + "github.com/threefoldtech/zos_base/pkg/zinit" ) type PowerServer struct { diff --git a/pkg/power/uptime.go b/pkg/power/uptime.go index c1a14a4a..820162e3 100644 --- a/pkg/power/uptime.go +++ b/pkg/power/uptime.go @@ -12,9 +12,9 @@ import ( "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/host" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/app" - "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/stubs" + "github.com/threefoldtech/zos_base/pkg/utils" ) const ( diff --git a/pkg/primitives/gateway/gatewayfqdn.go b/pkg/primitives/gateway/gatewayfqdn.go index a8af5ec5..7d5272a1 100644 --- a/pkg/primitives/gateway/gatewayfqdn.go +++ b/pkg/primitives/gateway/gatewayfqdn.go @@ -7,10 +7,10 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/gateway/gatewayname.go b/pkg/primitives/gateway/gatewayname.go index f07fc42e..13fdae4f 100644 --- a/pkg/primitives/gateway/gatewayname.go +++ b/pkg/primitives/gateway/gatewayname.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/network-light/network.go b/pkg/primitives/network-light/network.go index 98d51b1e..c8f853d1 100644 --- a/pkg/primitives/network-light/network.go +++ b/pkg/primitives/network-light/network.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - provision "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + provision "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/network/network.go b/pkg/primitives/network/network.go index 37819929..7ef955dd 100644 --- a/pkg/primitives/network/network.go +++ b/pkg/primitives/network/network.go @@ -9,11 +9,11 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/provisioner.go b/pkg/primitives/provisioner.go index cedcefe5..a549f276 100644 --- a/pkg/primitives/provisioner.go +++ b/pkg/primitives/provisioner.go @@ -2,20 +2,20 @@ package primitives import ( "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/primitives/gateway" - "github.com/threefoldtech/zosbase/pkg/primitives/network" - netlight "github.com/threefoldtech/zosbase/pkg/primitives/network-light" - "github.com/threefoldtech/zosbase/pkg/primitives/pubip" - "github.com/threefoldtech/zosbase/pkg/primitives/qsfs" - "github.com/threefoldtech/zosbase/pkg/primitives/vm" - vmlight "github.com/threefoldtech/zosbase/pkg/primitives/vm-light" - "github.com/threefoldtech/zosbase/pkg/primitives/volume" - "github.com/threefoldtech/zosbase/pkg/primitives/zdb" - "github.com/threefoldtech/zosbase/pkg/primitives/zlogs" - "github.com/threefoldtech/zosbase/pkg/primitives/zmount" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/primitives/gateway" + "github.com/threefoldtech/zos_base/pkg/primitives/network" + netlight "github.com/threefoldtech/zos_base/pkg/primitives/network-light" + "github.com/threefoldtech/zos_base/pkg/primitives/pubip" + "github.com/threefoldtech/zos_base/pkg/primitives/qsfs" + "github.com/threefoldtech/zos_base/pkg/primitives/vm" + vmlight "github.com/threefoldtech/zos_base/pkg/primitives/vm-light" + "github.com/threefoldtech/zos_base/pkg/primitives/volume" + "github.com/threefoldtech/zos_base/pkg/primitives/zdb" + "github.com/threefoldtech/zos_base/pkg/primitives/zlogs" + "github.com/threefoldtech/zos_base/pkg/primitives/zmount" + "github.com/threefoldtech/zos_base/pkg/provision" ) // NewPrimitivesProvisioner creates a new 0-OS provisioner diff --git a/pkg/primitives/pubip/public_ip.go b/pkg/primitives/pubip/public_ip.go index 7cd07984..dee7b514 100644 --- a/pkg/primitives/pubip/public_ip.go +++ b/pkg/primitives/pubip/public_ip.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/qsfs/qsfs.go b/pkg/primitives/qsfs/qsfs.go index 1528237d..b1ea4ddb 100644 --- a/pkg/primitives/qsfs/qsfs.go +++ b/pkg/primitives/qsfs/qsfs.go @@ -7,10 +7,10 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/statistics.go b/pkg/primitives/statistics.go index 635e71a0..b8aff51d 100644 --- a/pkg/primitives/statistics.go +++ b/pkg/primitives/statistics.go @@ -12,12 +12,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/mem" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/capacity" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/provision" ) type ( diff --git a/pkg/primitives/vm-light/pause.go b/pkg/primitives/vm-light/pause.go index 71f568e4..65d3a41e 100644 --- a/pkg/primitives/vm-light/pause.go +++ b/pkg/primitives/vm-light/pause.go @@ -3,9 +3,9 @@ package vmlight import ( "context" - "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/gridtypes" + provision "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func (m *Manager) Pause(ctx context.Context, wl *gridtypes.WorkloadWithID) error { diff --git a/pkg/primitives/vm-light/utils.go b/pkg/primitives/vm-light/utils.go index 9e826373..e334900a 100644 --- a/pkg/primitives/vm-light/utils.go +++ b/pkg/primitives/vm-light/utils.go @@ -11,10 +11,10 @@ import ( "github.com/BurntSushi/toml" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/stubs" ) // fill up the VM (machine) object with write boot config for a full virtual machine (with a disk image) diff --git a/pkg/primitives/vm-light/vm.go b/pkg/primitives/vm-light/vm.go index 9a25944e..205b5665 100644 --- a/pkg/primitives/vm-light/vm.go +++ b/pkg/primitives/vm-light/vm.go @@ -12,13 +12,13 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "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/primitives/vmgpu" - provision "github.com/threefoldtech/zosbase/pkg/provision" - "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/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/primitives/vmgpu" + provision "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/primitives/vm/pause.go b/pkg/primitives/vm/pause.go index 135c2070..9a52707e 100644 --- a/pkg/primitives/vm/pause.go +++ b/pkg/primitives/vm/pause.go @@ -3,9 +3,9 @@ package vm import ( "context" - "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/gridtypes" + provision "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) func (m *Manager) Pause(ctx context.Context, wl *gridtypes.WorkloadWithID) error { diff --git a/pkg/primitives/vm/utils.go b/pkg/primitives/vm/utils.go index 2944305c..949b09cf 100644 --- a/pkg/primitives/vm/utils.go +++ b/pkg/primitives/vm/utils.go @@ -11,12 +11,12 @@ import ( "github.com/BurntSushi/toml" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/network/ifaceutil" - "github.com/threefoldtech/zosbase/pkg/primitives/pubip" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/network/ifaceutil" + "github.com/threefoldtech/zos_base/pkg/primitives/pubip" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var networkResourceNet = net.IPNet{ diff --git a/pkg/primitives/vm/vm.go b/pkg/primitives/vm/vm.go index 8dc20e07..434e9f5a 100644 --- a/pkg/primitives/vm/vm.go +++ b/pkg/primitives/vm/vm.go @@ -12,13 +12,13 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "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/primitives/vmgpu" - "github.com/threefoldtech/zosbase/pkg/provision" - "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/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/primitives/vmgpu" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/primitives/vmgpu/vmgpu.go b/pkg/primitives/vmgpu/vmgpu.go index f5ad9173..4b34a3e2 100644 --- a/pkg/primitives/vmgpu/vmgpu.go +++ b/pkg/primitives/vmgpu/vmgpu.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/capacity" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/kernel" ) const ( diff --git a/pkg/primitives/volume/volume.go b/pkg/primitives/volume/volume.go index fd2cd975..97758e2a 100644 --- a/pkg/primitives/volume/volume.go +++ b/pkg/primitives/volume/volume.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) type Volume = zos.Volume diff --git a/pkg/primitives/zdb/zdb.go b/pkg/primitives/zdb/zdb.go index 17ca0a23..bf7e9754 100644 --- a/pkg/primitives/zdb/zdb.go +++ b/pkg/primitives/zdb/zdb.go @@ -14,18 +14,18 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/zdb" + "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/kernel" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/zdb" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - nwmod "github.com/threefoldtech/zosbase/pkg/network" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + nwmod "github.com/threefoldtech/zos_base/pkg/network" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/primitives/zlogs/zlogs.go b/pkg/primitives/zlogs/zlogs.go index a0da9a74..00ab9f76 100644 --- a/pkg/primitives/zlogs/zlogs.go +++ b/pkg/primitives/zlogs/zlogs.go @@ -7,11 +7,11 @@ import ( "github.com/pkg/errors" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/primitives/zmount/zmount.go b/pkg/primitives/zmount/zmount.go index 00c10c7f..3f4c1b4f 100644 --- a/pkg/primitives/zmount/zmount.go +++ b/pkg/primitives/zmount/zmount.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/stubs" ) var ( diff --git a/pkg/provision.go b/pkg/provision.go index 8169aa84..75b9702b 100644 --- a/pkg/provision.go +++ b/pkg/provision.go @@ -1,12 +1,12 @@ package pkg -//go:generate zbusc -module provision -version 0.0.1 -name provision -package stubs github.com/threefoldtech/zosbase/pkg+Provision stubs/provision_stub.go -//go:generate zbusc -module provision -version 0.0.1 -name statistics -package stubs github.com/threefoldtech/zosbase/pkg+Statistics stubs/statistics_stub.go +//go:generate zbusc -module provision -version 0.0.1 -name provision -package stubs github.com/threefoldtech/zos_base/pkg+Provision stubs/provision_stub.go +//go:generate zbusc -module provision -version 0.0.1 -name statistics -package stubs github.com/threefoldtech/zos_base/pkg+Statistics stubs/statistics_stub.go import ( "context" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // Provision interface diff --git a/pkg/provision/auth.go b/pkg/provision/auth.go index 5c38633b..3e2efd78 100644 --- a/pkg/provision/auth.go +++ b/pkg/provision/auth.go @@ -8,7 +8,7 @@ import ( cache "github.com/patrickmn/go-cache" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/provision/engine.go b/pkg/provision/engine.go index d782d9ff..ba1e1387 100644 --- a/pkg/provision/engine.go +++ b/pkg/provision/engine.go @@ -18,11 +18,11 @@ 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/environment" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "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/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/stubs" ) // 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/interface.go b/pkg/provision/interface.go index 68fc2e44..297e0f70 100644 --- a/pkg/provision/interface.go +++ b/pkg/provision/interface.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // Twins is used to get twin public key diff --git a/pkg/provision/mw/auth.go b/pkg/provision/mw/auth.go index e056de18..8a80d08e 100644 --- a/pkg/provision/mw/auth.go +++ b/pkg/provision/mw/auth.go @@ -15,7 +15,7 @@ import ( "github.com/lestrrat-go/jwx/jwt" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/provision" ) type twinPublicKeyID struct{} diff --git a/pkg/provision/provisiner.go b/pkg/provision/provisiner.go index 0472b347..479f8ae5 100644 --- a/pkg/provision/provisiner.go +++ b/pkg/provision/provisiner.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // 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/provision/storage.fs/shared.go b/pkg/provision/storage.fs/shared.go index da0c4cea..40bd398d 100644 --- a/pkg/provision/storage.fs/shared.go +++ b/pkg/provision/storage.fs/shared.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // Shared, returns a workload id that reference the workload with that diff --git a/pkg/provision/storage.fs/storage.go b/pkg/provision/storage.fs/storage.go index bf310fd0..66d44faa 100644 --- a/pkg/provision/storage.fs/storage.go +++ b/pkg/provision/storage.fs/storage.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/provision" - "github.com/threefoldtech/zosbase/pkg/versioned" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/provision" + "github.com/threefoldtech/zos_base/pkg/versioned" ) var ( diff --git a/pkg/provision/storage.fs/storage_test.go b/pkg/provision/storage.fs/storage_test.go index f829fd93..1f199508 100644 --- a/pkg/provision/storage.fs/storage_test.go +++ b/pkg/provision/storage.fs/storage_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "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" ) var TestType = gridtypes.WorkloadType("test") diff --git a/pkg/provision/storage/storage.go b/pkg/provision/storage/storage.go index 528ec705..9a4b6d2d 100644 --- a/pkg/provision/storage/storage.go +++ b/pkg/provision/storage/storage.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "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" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/provision/storage/storage_test.go b/pkg/provision/storage/storage_test.go index 1180483e..f00bbb95 100644 --- a/pkg/provision/storage/storage_test.go +++ b/pkg/provision/storage/storage_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "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" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/qsfsd.go b/pkg/qsfsd.go index 6bc05e2e..8c41862c 100644 --- a/pkg/qsfsd.go +++ b/pkg/qsfsd.go @@ -1,12 +1,12 @@ package pkg import ( - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) //go:generate mkdir -p stubs -//go:generate zbusc -module qsfsd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zosbase/pkg+QSFSD stubs/qsfsd_stub.go +//go:generate zbusc -module qsfsd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos_base/pkg+QSFSD stubs/qsfsd_stub.go type QSFSMetrics struct { Consumption map[string]NetMetric diff --git a/pkg/qsfsd/cleanup.go b/pkg/qsfsd/cleanup.go index 44d3f886..98cba5e9 100644 --- a/pkg/qsfsd/cleanup.go +++ b/pkg/qsfsd/cleanup.go @@ -12,8 +12,8 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/qsfsd/metrics.go b/pkg/qsfsd/metrics.go index 763f4ec9..51dc9486 100644 --- a/pkg/qsfsd/metrics.go +++ b/pkg/qsfsd/metrics.go @@ -8,9 +8,9 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "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/network/namespace" + "github.com/threefoldtech/zos_base/pkg/stubs" "github.com/vishvananda/netlink" ) diff --git a/pkg/qsfsd/qsfs.go b/pkg/qsfsd/qsfs.go index af4a0004..6c5a95ea 100644 --- a/pkg/qsfsd/qsfs.go +++ b/pkg/qsfsd/qsfs.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "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/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/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/registrar.go b/pkg/registrar.go index 81cd9bec..940d5bbc 100644 --- a/pkg/registrar.go +++ b/pkg/registrar.go @@ -2,7 +2,7 @@ package pkg //go:generate mkdir -p stubs -//go:generate zbusc -module registrar -version 0.0.1 -name registrar -package stubs github.com/threefoldtech/zosbase/pkg+Registrar stubs/registrar_stub.go +//go:generate zbusc -module registrar -version 0.0.1 -name registrar -package stubs github.com/threefoldtech/zos_base/pkg+Registrar stubs/registrar_stub.go type Registrar interface { NodeID() (uint32, error) diff --git a/pkg/registrar/register.go b/pkg/registrar/register.go index b7abcf0c..03935dd2 100644 --- a/pkg/registrar/register.go +++ b/pkg/registrar/register.go @@ -12,11 +12,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" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/geoip" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "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/geoip" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/registrar/registrar.go b/pkg/registrar/registrar.go index 5530d2c9..6d9b7cbe 100644 --- a/pkg/registrar/registrar.go +++ b/pkg/registrar/registrar.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "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/registrar_light/register.go b/pkg/registrar_light/register.go index 33491ca1..c3491f9a 100644 --- a/pkg/registrar_light/register.go +++ b/pkg/registrar_light/register.go @@ -12,11 +12,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" - "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" + "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" ) const ( diff --git a/pkg/registrar_light/registrar.go b/pkg/registrar_light/registrar.go index 7d47e567..c295b70c 100644 --- a/pkg/registrar_light/registrar.go +++ b/pkg/registrar_light/registrar.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "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/storage.go b/pkg/storage.go index 66eda55e..a3b4ed07 100644 --- a/pkg/storage.go +++ b/pkg/storage.go @@ -5,12 +5,12 @@ import ( "fmt" "path/filepath" - "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" ) //go:generate mkdir -p stubs -//go:generate zbusc -module storage -version 0.0.1 -name storage -package stubs github.com/threefoldtech/zosbase/pkg+StorageModule stubs/storage_stub.go +//go:generate zbusc -module storage -version 0.0.1 -name storage -package stubs github.com/threefoldtech/zos_base/pkg+StorageModule stubs/storage_stub.go // RaidProfile type diff --git a/pkg/storage/device.go b/pkg/storage/device.go index 1f552816..64b43fe0 100644 --- a/pkg/storage/device.go +++ b/pkg/storage/device.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/storage/filesystem" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/storage/filesystem" ) const ( diff --git a/pkg/storage/disk.go b/pkg/storage/disk.go index 7cbadcb0..f7dcd275 100644 --- a/pkg/storage/disk.go +++ b/pkg/storage/disk.go @@ -12,8 +12,8 @@ import ( "github.com/g0rbe/go-chattr" "github.com/pkg/errors" log "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) const ( diff --git a/pkg/storage/filesystem/btrfs.go b/pkg/storage/filesystem/btrfs.go index bf55d156..b6c3acbc 100644 --- a/pkg/storage/filesystem/btrfs.go +++ b/pkg/storage/filesystem/btrfs.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) var ( diff --git a/pkg/storage/filesystem/btrfs_test.go b/pkg/storage/filesystem/btrfs_test.go index 457e8f9d..5feb30c7 100644 --- a/pkg/storage/filesystem/btrfs_test.go +++ b/pkg/storage/filesystem/btrfs_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) type TestDeviceManager struct { diff --git a/pkg/storage/filesystem/device.go b/pkg/storage/filesystem/device.go index b9f79ab9..4a8c41cf 100644 --- a/pkg/storage/filesystem/device.go +++ b/pkg/storage/filesystem/device.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) // DeviceManager is able to list all/specific devices on a system diff --git a/pkg/storage/filesystem/device_test.go b/pkg/storage/filesystem/device_test.go index bbc81c12..42b2036b 100644 --- a/pkg/storage/filesystem/device_test.go +++ b/pkg/storage/filesystem/device_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) func TestDeviceManagerScan(t *testing.T) { diff --git a/pkg/storage/filesystem/filesystem.go b/pkg/storage/filesystem/filesystem.go index 6c2e673c..a8565da7 100644 --- a/pkg/storage/filesystem/filesystem.go +++ b/pkg/storage/filesystem/filesystem.go @@ -4,7 +4,7 @@ import ( "context" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) // Usage struct (in bytes) diff --git a/pkg/storage/filesystem/utils.go b/pkg/storage/filesystem/utils.go index 187bfe4a..b717b065 100644 --- a/pkg/storage/filesystem/utils.go +++ b/pkg/storage/filesystem/utils.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/zdb" + "github.com/threefoldtech/zos_base/pkg/zdb" ) const ( diff --git a/pkg/storage/pools.go b/pkg/storage/pools.go index 8c4e15d0..361ba42f 100644 --- a/pkg/storage/pools.go +++ b/pkg/storage/pools.go @@ -3,8 +3,8 @@ package storage import ( "slices" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/storage/filesystem" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/storage/filesystem" ) // utils for pool ordering and presence diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 0b9f2b2b..41dfc45c 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -15,13 +15,13 @@ import ( "github.com/pkg/errors" log "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/disk" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/storage/filesystem" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/storage/filesystem" ) const ( diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 6152b9e6..94087b6e 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/storage/filesystem" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/storage/filesystem" ) type testVolume struct { diff --git a/pkg/storage_light/device.go b/pkg/storage_light/device.go index baadeff0..82287959 100644 --- a/pkg/storage_light/device.go +++ b/pkg/storage_light/device.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/storage_light/filesystem" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/storage_light/filesystem" ) const ( diff --git a/pkg/storage_light/disk.go b/pkg/storage_light/disk.go index 7cbadcb0..f7dcd275 100644 --- a/pkg/storage_light/disk.go +++ b/pkg/storage_light/disk.go @@ -12,8 +12,8 @@ import ( "github.com/g0rbe/go-chattr" "github.com/pkg/errors" log "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) const ( diff --git a/pkg/storage_light/filesystem/btrfs.go b/pkg/storage_light/filesystem/btrfs.go index bec07b36..17220035 100644 --- a/pkg/storage_light/filesystem/btrfs.go +++ b/pkg/storage_light/filesystem/btrfs.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) var ( diff --git a/pkg/storage_light/filesystem/btrfs_test.go b/pkg/storage_light/filesystem/btrfs_test.go index 245f5798..16834a3e 100644 --- a/pkg/storage_light/filesystem/btrfs_test.go +++ b/pkg/storage_light/filesystem/btrfs_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) type TestDeviceManager struct { diff --git a/pkg/storage_light/filesystem/device.go b/pkg/storage_light/filesystem/device.go index 3f147c90..5c13334d 100644 --- a/pkg/storage_light/filesystem/device.go +++ b/pkg/storage_light/filesystem/device.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) // DeviceManager is able to list all/specific devices on a system diff --git a/pkg/storage_light/filesystem/device_test.go b/pkg/storage_light/filesystem/device_test.go index 7e72b44d..b1d5934b 100644 --- a/pkg/storage_light/filesystem/device_test.go +++ b/pkg/storage_light/filesystem/device_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) func TestDeviceManagerScan(t *testing.T) { diff --git a/pkg/storage_light/filesystem/filesystem.go b/pkg/storage_light/filesystem/filesystem.go index 6c2e673c..a8565da7 100644 --- a/pkg/storage_light/filesystem/filesystem.go +++ b/pkg/storage_light/filesystem/filesystem.go @@ -4,7 +4,7 @@ import ( "context" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) // Usage struct (in bytes) diff --git a/pkg/storage_light/filesystem/utils.go b/pkg/storage_light/filesystem/utils.go index 187bfe4a..b717b065 100644 --- a/pkg/storage_light/filesystem/utils.go +++ b/pkg/storage_light/filesystem/utils.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/zdb" + "github.com/threefoldtech/zos_base/pkg/zdb" ) const ( diff --git a/pkg/storage_light/pools.go b/pkg/storage_light/pools.go index 110ff865..ba53f418 100644 --- a/pkg/storage_light/pools.go +++ b/pkg/storage_light/pools.go @@ -3,8 +3,8 @@ package storage import ( "slices" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/storage_light/filesystem" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/storage_light/filesystem" ) // utils for pool ordering and presence diff --git a/pkg/storage_light/storage.go b/pkg/storage_light/storage.go index 39186265..dda41ba9 100644 --- a/pkg/storage_light/storage.go +++ b/pkg/storage_light/storage.go @@ -15,13 +15,13 @@ import ( "github.com/pkg/errors" log "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/disk" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/cache" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/storage_light/filesystem" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/app" + "github.com/threefoldtech/zos_base/pkg/cache" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/storage_light/filesystem" ) const ( diff --git a/pkg/storage_light/storage_test.go b/pkg/storage_light/storage_test.go index 244896e5..9fa2e9e3 100644 --- a/pkg/storage_light/storage_test.go +++ b/pkg/storage_light/storage_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" - "github.com/threefoldtech/zosbase/pkg/storage_light/filesystem" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/pkg/storage_light/filesystem" ) type testVolume struct { diff --git a/pkg/stubs/api_gateway_stub.go b/pkg/stubs/api_gateway_stub.go index 5a29485f..f2d70684 100644 --- a/pkg/stubs/api_gateway_stub.go +++ b/pkg/stubs/api_gateway_stub.go @@ -9,7 +9,7 @@ import ( types "github.com/centrifuge/go-substrate-rpc-client/v4/types" tfchainclientgo "github.com/threefoldtech/tfchain/clients/tfchain-client-go" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" "time" ) diff --git a/pkg/stubs/container_stub.go b/pkg/stubs/container_stub.go index cc371803..9663fce3 100644 --- a/pkg/stubs/container_stub.go +++ b/pkg/stubs/container_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" "time" ) diff --git a/pkg/stubs/flist_stub.go b/pkg/stubs/flist_stub.go index df84e1ee..1fce6791 100644 --- a/pkg/stubs/flist_stub.go +++ b/pkg/stubs/flist_stub.go @@ -7,8 +7,8 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + pkg "github.com/threefoldtech/zos_base/pkg" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type FlisterStub struct { diff --git a/pkg/stubs/gateway_stub.go b/pkg/stubs/gateway_stub.go index 0e41d606..2e802011 100644 --- a/pkg/stubs/gateway_stub.go +++ b/pkg/stubs/gateway_stub.go @@ -7,8 +7,8 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + pkg "github.com/threefoldtech/zos_base/pkg" + zos "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) type GatewayStub struct { diff --git a/pkg/stubs/identity_stub.go b/pkg/stubs/identity_stub.go index 5b72c2f9..a8f18225 100644 --- a/pkg/stubs/identity_stub.go +++ b/pkg/stubs/identity_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" ) type IdentityManagerStub struct { diff --git a/pkg/stubs/network_light_stub.go b/pkg/stubs/network_light_stub.go index 51195634..56c8947f 100644 --- a/pkg/stubs/network_light_stub.go +++ b/pkg/stubs/network_light_stub.go @@ -7,9 +7,9 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + pkg "github.com/threefoldtech/zos_base/pkg" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + zos "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" "net" ) diff --git a/pkg/stubs/network_stub.go b/pkg/stubs/network_stub.go index e80f7587..768bd339 100644 --- a/pkg/stubs/network_stub.go +++ b/pkg/stubs/network_stub.go @@ -7,9 +7,9 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + pkg "github.com/threefoldtech/zos_base/pkg" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + zos "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" "net" ) diff --git a/pkg/stubs/performance_monitor_stub.go b/pkg/stubs/performance_monitor_stub.go index 003ac849..fa4a7fc2 100644 --- a/pkg/stubs/performance_monitor_stub.go +++ b/pkg/stubs/performance_monitor_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" ) type PerformanceMonitorStub struct { diff --git a/pkg/stubs/provision_stub.go b/pkg/stubs/provision_stub.go index cc24258f..6448169f 100644 --- a/pkg/stubs/provision_stub.go +++ b/pkg/stubs/provision_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type ProvisionStub struct { diff --git a/pkg/stubs/qsfsd_stub.go b/pkg/stubs/qsfsd_stub.go index 3dc0c58e..ac692d90 100644 --- a/pkg/stubs/qsfsd_stub.go +++ b/pkg/stubs/qsfsd_stub.go @@ -7,8 +7,8 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + pkg "github.com/threefoldtech/zos_base/pkg" + zos "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) type QSFSDStub struct { diff --git a/pkg/stubs/statistics_stub.go b/pkg/stubs/statistics_stub.go index 31f66d1c..aee87d15 100644 --- a/pkg/stubs/statistics_stub.go +++ b/pkg/stubs/statistics_stub.go @@ -7,8 +7,8 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + pkg "github.com/threefoldtech/zos_base/pkg" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type StatisticsStub struct { diff --git a/pkg/stubs/storage_stub.go b/pkg/stubs/storage_stub.go index 9d0ad27a..6e6928bb 100644 --- a/pkg/stubs/storage_stub.go +++ b/pkg/stubs/storage_stub.go @@ -7,9 +7,9 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" - zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + pkg "github.com/threefoldtech/zos_base/pkg" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" + zos "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) type StorageModuleStub struct { diff --git a/pkg/stubs/system_monitor_stub.go b/pkg/stubs/system_monitor_stub.go index 72c7c912..d6443b62 100644 --- a/pkg/stubs/system_monitor_stub.go +++ b/pkg/stubs/system_monitor_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" ) type SystemMonitorStub struct { diff --git a/pkg/stubs/vmd_stub.go b/pkg/stubs/vmd_stub.go index 9017acdf..c4d99dea 100644 --- a/pkg/stubs/vmd_stub.go +++ b/pkg/stubs/vmd_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg "github.com/threefoldtech/zosbase/pkg" + pkg "github.com/threefoldtech/zos_base/pkg" ) type VMModuleStub struct { diff --git a/pkg/substrate_gateway/substrate_gateway.go b/pkg/substrate_gateway/substrate_gateway.go index 283ba4cd..23f7e673 100644 --- a/pkg/substrate_gateway/substrate_gateway.go +++ b/pkg/substrate_gateway/substrate_gateway.go @@ -10,7 +10,7 @@ import ( "github.com/centrifuge/go-substrate-rpc-client/v4/types" "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" ) type substrateGateway struct { diff --git a/pkg/upgrade/boot.go b/pkg/upgrade/boot.go index 8cade715..0a90c6dc 100644 --- a/pkg/upgrade/boot.go +++ b/pkg/upgrade/boot.go @@ -9,8 +9,8 @@ import ( "github.com/blang/semver" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/upgrade/hub" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/upgrade/hub" ) const ( diff --git a/pkg/upgrade/hub/hub.go b/pkg/upgrade/hub/hub.go index 4ba242a8..1cdd385b 100644 --- a/pkg/upgrade/hub/hub.go +++ b/pkg/upgrade/hub/hub.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/0-fs/meta" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/kernel" ) const ( diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 372a5ee7..289c6346 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -21,12 +21,12 @@ import ( "github.com/threefoldtech/0-fs/rofs" "github.com/threefoldtech/0-fs/storage" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/stubs" - "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/stubs" + "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 4fca868c..46591f2c 100644 --- a/pkg/upgrade/upgrade_test.go +++ b/pkg/upgrade/upgrade_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "github.com/threefoldtech/0-fs/meta" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/upgrade/hub" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/upgrade/hub" ) func TestUpgraderDownload(t *testing.T) { diff --git a/pkg/vm.go b/pkg/vm.go index 551d4010..ea18120c 100644 --- a/pkg/vm.go +++ b/pkg/vm.go @@ -7,11 +7,11 @@ import ( "path/filepath" "github.com/shirou/gopsutil/cpu" - "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" ) -//go:generate zbusc -module vmd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zosbase/pkg+VMModule stubs/vmd_stub.go +//go:generate zbusc -module vmd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos_base/pkg+VMModule stubs/vmd_stub.go // Route structure type Route struct { diff --git a/pkg/vm/ch.go b/pkg/vm/ch.go index fe5e9fb2..638c22cc 100644 --- a/pkg/vm/ch.go +++ b/pkg/vm/ch.go @@ -16,9 +16,9 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/netlight/resource" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/netlight/resource" ) const ( diff --git a/pkg/vm/log_helpers.go b/pkg/vm/log_helpers.go index ef7d57a3..f24f8343 100644 --- a/pkg/vm/log_helpers.go +++ b/pkg/vm/log_helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/rs/zerolog" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) func logInterfaceDetails(logEvent *zerolog.Event, interfaces []Interface, networkInfo *pkg.VMNetworkInfo) *zerolog.Event { diff --git a/pkg/vm/logs.go b/pkg/vm/logs.go index 1398c98f..9fb7ba4b 100644 --- a/pkg/vm/logs.go +++ b/pkg/vm/logs.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/zinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/zinit" ) const ( diff --git a/pkg/vm/machine.go b/pkg/vm/machine.go index 0d90fa96..a2cb5001 100644 --- a/pkg/vm/machine.go +++ b/pkg/vm/machine.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" "github.com/vishvananda/netlink" ) diff --git a/pkg/vm/manager.go b/pkg/vm/manager.go index d004f0e8..4ee12fd7 100644 --- a/pkg/vm/manager.go +++ b/pkg/vm/manager.go @@ -16,11 +16,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zosbase/pkg" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/kernel" - "github.com/threefoldtech/zosbase/pkg/stubs" - "github.com/threefoldtech/zosbase/pkg/vm/cloudinit" + "github.com/threefoldtech/zos_base/pkg" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/kernel" + "github.com/threefoldtech/zos_base/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/vm/cloudinit" ) const ( diff --git a/pkg/vm/metrics.go b/pkg/vm/metrics.go index 12ae8ba1..3b7ed94c 100644 --- a/pkg/vm/metrics.go +++ b/pkg/vm/metrics.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) // Metrics gets running machines network metrics diff --git a/pkg/vm/monitor.go b/pkg/vm/monitor.go index 2128bbe0..b6ba8d53 100644 --- a/pkg/vm/monitor.go +++ b/pkg/vm/monitor.go @@ -12,9 +12,9 @@ import ( "github.com/patrickmn/go-cache" "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/rotate" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/rotate" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/zdb/ns_header.go b/pkg/zdb/ns_header.go index e2932f32..c6bc29e0 100644 --- a/pkg/zdb/ns_header.go +++ b/pkg/zdb/ns_header.go @@ -5,7 +5,7 @@ import ( "io" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) type internalHeaderV2 struct { diff --git a/pkg/zdb/ns_header_test.go b/pkg/zdb/ns_header_test.go index 5c61a9f8..be079954 100644 --- a/pkg/zdb/ns_header_test.go +++ b/pkg/zdb/ns_header_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestReadHeader(t *testing.T) { diff --git a/pkg/zdb/pool.go b/pkg/zdb/pool.go index 16cde98b..ee5058db 100644 --- a/pkg/zdb/pool.go +++ b/pkg/zdb/pool.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) // Prefix is a string used as prefix in the filesystem volume used diff --git a/pkg/zdb/pool_test.go b/pkg/zdb/pool_test.go index dcabb9c0..9ee333e2 100644 --- a/pkg/zdb/pool_test.go +++ b/pkg/zdb/pool_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func TestNamespaces(t *testing.T) { diff --git a/pkg/zdb/zdb.go b/pkg/zdb/zdb.go index c73c67ed..0cfc9380 100644 --- a/pkg/zdb/zdb.go +++ b/pkg/zdb/zdb.go @@ -4,8 +4,8 @@ package zdb import ( "github.com/gomodule/redigo/redis" "github.com/pkg/errors" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/utils" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/utils" ) type Namespace struct { diff --git a/pkg/zos_api/debug.go b/pkg/zos_api/debug.go index cea2097a..4c6161e4 100644 --- a/pkg/zos_api/debug.go +++ b/pkg/zos_api/debug.go @@ -3,7 +3,7 @@ package zosapi import ( "context" - "github.com/threefoldtech/zosbase/pkg/debugcmd" + "github.com/threefoldtech/zos_base/pkg/debugcmd" ) func (g *ZosAPI) debugDeploymentListHandler(ctx context.Context, payload []byte) (interface{}, error) { diff --git a/pkg/zos_api/deployment.go b/pkg/zos_api/deployment.go index 86d419c1..d6b4f41c 100644 --- a/pkg/zos_api/deployment.go +++ b/pkg/zos_api/deployment.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func (g *ZosAPI) deploymentDeployHandler(ctx context.Context, payload []byte) (interface{}, error) { diff --git a/pkg/zos_api/location.go b/pkg/zos_api/location.go index 3b935633..2ac490c5 100644 --- a/pkg/zos_api/location.go +++ b/pkg/zos_api/location.go @@ -4,7 +4,7 @@ import ( "context" "github.com/patrickmn/go-cache" - "github.com/threefoldtech/zosbase/pkg/geoip" + "github.com/threefoldtech/zos_base/pkg/geoip" ) const ( diff --git a/pkg/zos_api/middlewares.go b/pkg/zos_api/middlewares.go index ef167923..122856bf 100644 --- a/pkg/zos_api/middlewares.go +++ b/pkg/zos_api/middlewares.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - "github.com/threefoldtech/zosbase/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/environment" ) func (g *ZosAPI) authorized(ctx context.Context, _ []byte) (context.Context, error) { diff --git a/pkg/zos_api/network.go b/pkg/zos_api/network.go index 454ea012..b72a2625 100644 --- a/pkg/zos_api/network.go +++ b/pkg/zos_api/network.go @@ -7,7 +7,7 @@ import ( "net" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - "github.com/threefoldtech/zosbase/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func (g *ZosAPI) networkListWGPortsHandler(ctx context.Context, payload []byte) (interface{}, error) { diff --git a/pkg/zos_api/zos_api.go b/pkg/zos_api/zos_api.go index d9287ce1..469abf31 100644 --- a/pkg/zos_api/zos_api.go +++ b/pkg/zos_api/zos_api.go @@ -9,10 +9,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/capacity" - "github.com/threefoldtech/zosbase/pkg/diagnostics" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/diagnostics" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/zos_api_light/deployment.go b/pkg/zos_api_light/deployment.go index 290c3b4c..d9f72c93 100644 --- a/pkg/zos_api_light/deployment.go +++ b/pkg/zos_api_light/deployment.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func (g *ZosAPI) deploymentDeployHandler(ctx context.Context, payload []byte) (interface{}, error) { diff --git a/pkg/zos_api_light/location.go b/pkg/zos_api_light/location.go index 3b935633..2ac490c5 100644 --- a/pkg/zos_api_light/location.go +++ b/pkg/zos_api_light/location.go @@ -4,7 +4,7 @@ import ( "context" "github.com/patrickmn/go-cache" - "github.com/threefoldtech/zosbase/pkg/geoip" + "github.com/threefoldtech/zos_base/pkg/geoip" ) const ( diff --git a/pkg/zos_api_light/network.go b/pkg/zos_api_light/network.go index ef16018b..dbc15504 100644 --- a/pkg/zos_api_light/network.go +++ b/pkg/zos_api_light/network.go @@ -7,7 +7,7 @@ import ( "net" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" + gridtypes "github.com/threefoldtech/zos_base/pkg/gridtypes" ) func (g *ZosAPI) networkInterfacesHandler(ctx context.Context, payload []byte) (interface{}, error) { diff --git a/pkg/zos_api_light/zos_api.go b/pkg/zos_api_light/zos_api.go index 12da2682..6771c988 100644 --- a/pkg/zos_api_light/zos_api.go +++ b/pkg/zos_api_light/zos_api.go @@ -9,10 +9,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/capacity" - "github.com/threefoldtech/zosbase/pkg/diagnostics" - "github.com/threefoldtech/zosbase/pkg/environment" - "github.com/threefoldtech/zosbase/pkg/stubs" + "github.com/threefoldtech/zos_base/pkg/capacity" + "github.com/threefoldtech/zos_base/pkg/diagnostics" + "github.com/threefoldtech/zos_base/pkg/environment" + "github.com/threefoldtech/zos_base/pkg/stubs" ) const ( diff --git a/pkg/zui.go b/pkg/zui.go index d226abc1..629ab01c 100644 --- a/pkg/zui.go +++ b/pkg/zui.go @@ -1,6 +1,6 @@ package pkg -//go:generate zbusc -module zui -version 0.0.1 -name zui -package stubs github.com/threefoldtech/zosbase/pkg+ZUI stubs/zui_stub.go +//go:generate zbusc -module zui -version 0.0.1 -name zui -package stubs github.com/threefoldtech/zos_base/pkg+ZUI stubs/zui_stub.go type ZUI interface { PushErrors(label string, errors []string) error diff --git a/pkg/zui/zui.go b/pkg/zui/zui.go index b792ffe7..d3bb8479 100644 --- a/pkg/zui/zui.go +++ b/pkg/zui/zui.go @@ -7,7 +7,7 @@ import ( "time" "github.com/gizak/termui/v3/widgets" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) type module struct { diff --git a/pkg/zui_light/zui.go b/pkg/zui_light/zui.go index b792ffe7..d3bb8479 100644 --- a/pkg/zui_light/zui.go +++ b/pkg/zui_light/zui.go @@ -7,7 +7,7 @@ import ( "time" "github.com/gizak/termui/v3/widgets" - "github.com/threefoldtech/zosbase/pkg" + "github.com/threefoldtech/zos_base/pkg" ) type module struct { diff --git a/scripts/qsfs/go.mod b/scripts/qsfs/go.mod index b1e268ad..1ee120e8 100644 --- a/scripts/qsfs/go.mod +++ b/scripts/qsfs/go.mod @@ -5,7 +5,7 @@ go 1.25.0 require ( github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20250929084418-b950278ead30 github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.5 - github.com/threefoldtech/zosbase v0.1.0 + github.com/threefoldtech/zos_base v0.1.0 ) require ( @@ -63,4 +63,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/threefoldtech/zosbase => ../../zosbasebak +replace github.com/threefoldtech/zos_base => ../../zosbasebak diff --git a/scripts/qsfs/main.go b/scripts/qsfs/main.go index d344cd5f..5a867b2b 100644 --- a/scripts/qsfs/main.go +++ b/scripts/qsfs/main.go @@ -14,9 +14,9 @@ import ( substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" - "github.com/threefoldtech/zosbase/client" - "github.com/threefoldtech/zosbase/pkg/gridtypes" - "github.com/threefoldtech/zosbase/pkg/gridtypes/zos" + "github.com/threefoldtech/zos_base/client" + "github.com/threefoldtech/zos_base/pkg/gridtypes" + "github.com/threefoldtech/zos_base/pkg/gridtypes/zos" ) const ( diff --git a/tools/certify/main.go b/tools/certify/main.go index fe157ccd..fcfac0d3 100644 --- a/tools/certify/main.go +++ b/tools/certify/main.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/app" + "github.com/threefoldtech/zos_base/pkg/app" ) type Urls struct { diff --git a/tools/farmup/main.go b/tools/farmup/main.go index bf1d9b1c..0a65f275 100644 --- a/tools/farmup/main.go +++ b/tools/farmup/main.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zosbase/pkg/app" + "github.com/threefoldtech/zos_base/pkg/app" ) type Urls struct {