Skip to content

Commit 9abdbe5

Browse files
ashraffoudaclaude
ashraffouda
and
claude
committed
Migrate zosbase -> zos_base module (v1.1.0)
The zosbase module was renamed to github.com/threefoldtech/zos_base. Update the go.mod require (v1.0.10 -> zos_base v1.1.0), go.sum, and 28 import statements so we no longer depend on GitHub's rename redirect for the Go module path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 9f2a208 commit 9abdbe5

30 files changed

Lines changed: 119 additions & 117 deletions

File tree

‎cmds/identityd/main.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ import (
88
"time"
99

1010
"github.com/pkg/errors"
11-
"github.com/threefoldtech/zosbase/pkg/app"
12-
"github.com/threefoldtech/zosbase/pkg/stubs"
13-
"github.com/threefoldtech/zosbase/pkg/upgrade"
11+
"github.com/threefoldtech/zos_base/pkg/app"
12+
"github.com/threefoldtech/zos_base/pkg/stubs"
13+
"github.com/threefoldtech/zos_base/pkg/upgrade"
1414

15-
"github.com/threefoldtech/zosbase/pkg"
16-
"github.com/threefoldtech/zosbase/pkg/environment"
17-
"github.com/threefoldtech/zosbase/pkg/identity"
15+
"github.com/threefoldtech/zos_base/pkg"
16+
"github.com/threefoldtech/zos_base/pkg/environment"
17+
"github.com/threefoldtech/zos_base/pkg/identity"
1818

1919
"github.com/rs/zerolog/log"
2020
"github.com/threefoldtech/zbus"
21-
"github.com/threefoldtech/zosbase/pkg/utils"
22-
"github.com/threefoldtech/zosbase/pkg/version"
21+
"github.com/threefoldtech/zos_base/pkg/utils"
22+
"github.com/threefoldtech/zos_base/pkg/version"
2323
)
2424

2525
const (

‎cmds/identityd/monitor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/blang/semver"
8-
"github.com/threefoldtech/zosbase/pkg"
8+
"github.com/threefoldtech/zos_base/pkg"
99
)
1010

1111
type monitorStream struct {

‎cmds/identityd/ssh.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"github.com/cenkalti/backoff"
1313
"github.com/rs/zerolog/log"
14-
"github.com/threefoldtech/zosbase/pkg"
15-
"github.com/threefoldtech/zosbase/pkg/environment"
16-
"github.com/threefoldtech/zosbase/pkg/kernel"
14+
"github.com/threefoldtech/zos_base/pkg"
15+
"github.com/threefoldtech/zos_base/pkg/environment"
16+
"github.com/threefoldtech/zos_base/pkg/kernel"
1717
)
1818

1919
var (

‎cmds/internet/main.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ import (
1111
"github.com/rs/zerolog/log"
1212
"github.com/vishvananda/netlink"
1313

14-
"github.com/threefoldtech/zosbase/pkg/app"
15-
"github.com/threefoldtech/zosbase/pkg/environment"
16-
"github.com/threefoldtech/zosbase/pkg/netlight/bootstrap"
17-
"github.com/threefoldtech/zosbase/pkg/netlight/bridge"
18-
"github.com/threefoldtech/zosbase/pkg/netlight/dhcp"
19-
"github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil"
20-
"github.com/threefoldtech/zosbase/pkg/netlight/options"
21-
"github.com/threefoldtech/zosbase/pkg/netlight/types"
22-
"github.com/threefoldtech/zosbase/pkg/zinit"
23-
24-
"github.com/threefoldtech/zosbase/pkg/version"
14+
"github.com/threefoldtech/zos_base/pkg/app"
15+
"github.com/threefoldtech/zos_base/pkg/environment"
16+
"github.com/threefoldtech/zos_base/pkg/netlight/bootstrap"
17+
"github.com/threefoldtech/zos_base/pkg/netlight/bridge"
18+
"github.com/threefoldtech/zos_base/pkg/netlight/dhcp"
19+
"github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil"
20+
"github.com/threefoldtech/zos_base/pkg/netlight/options"
21+
"github.com/threefoldtech/zos_base/pkg/netlight/types"
22+
"github.com/threefoldtech/zos_base/pkg/zinit"
23+
24+
"github.com/threefoldtech/zos_base/pkg/version"
2525
)
2626

2727
func main() {

‎cmds/modules/api_gateway/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
1414
"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
1515
"github.com/threefoldtech/zbus"
16-
"github.com/threefoldtech/zosbase/pkg/environment"
17-
"github.com/threefoldtech/zosbase/pkg/stubs"
18-
substrategw "github.com/threefoldtech/zosbase/pkg/substrate_gateway"
19-
"github.com/threefoldtech/zosbase/pkg/utils"
20-
zosapi "github.com/threefoldtech/zosbase/pkg/zos_api_light"
16+
"github.com/threefoldtech/zos_base/pkg/environment"
17+
"github.com/threefoldtech/zos_base/pkg/stubs"
18+
substrategw "github.com/threefoldtech/zos_base/pkg/substrate_gateway"
19+
"github.com/threefoldtech/zos_base/pkg/utils"
20+
zosapi "github.com/threefoldtech/zos_base/pkg/zos_api_light"
2121
"github.com/urfave/cli/v2"
2222
)
2323

‎cmds/modules/contd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/urfave/cli/v2"
1313

1414
"github.com/threefoldtech/zbus"
15-
"github.com/threefoldtech/zosbase/pkg/container"
16-
"github.com/threefoldtech/zosbase/pkg/utils"
15+
"github.com/threefoldtech/zos_base/pkg/container"
16+
"github.com/threefoldtech/zos_base/pkg/utils"
1717
)
1818

1919
const module = "container"

‎cmds/modules/flistd/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import (
55
"time"
66

77
"github.com/pkg/errors"
8-
"github.com/threefoldtech/zosbase/pkg/stubs"
9-
"github.com/threefoldtech/zosbase/pkg/utils"
8+
"github.com/threefoldtech/zos_base/pkg/stubs"
9+
"github.com/threefoldtech/zos_base/pkg/utils"
1010
"github.com/urfave/cli/v2"
1111

1212
"github.com/rs/zerolog/log"
1313

1414
"github.com/threefoldtech/zbus"
15-
"github.com/threefoldtech/zosbase/pkg/flist"
15+
"github.com/threefoldtech/zos_base/pkg/flist"
1616
)
1717

1818
const (

‎cmds/modules/gateway/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55

66
"github.com/pkg/errors"
7-
gateway "github.com/threefoldtech/zosbase/pkg/gateway_light"
8-
"github.com/threefoldtech/zosbase/pkg/utils"
7+
gateway "github.com/threefoldtech/zos_base/pkg/gateway_light"
8+
"github.com/threefoldtech/zos_base/pkg/utils"
99
"github.com/urfave/cli/v2"
1010

1111
"github.com/rs/zerolog/log"

‎cmds/modules/netlightd/main.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ import (
1010

1111
"github.com/oasisprotocol/curve25519-voi/primitives/x25519"
1212
"github.com/pkg/errors"
13-
"github.com/threefoldtech/zosbase/pkg/netbase/nft"
14-
"github.com/threefoldtech/zosbase/pkg/netlight"
15-
"github.com/threefoldtech/zosbase/pkg/netlight/bridge"
16-
"github.com/threefoldtech/zosbase/pkg/netlight/ifaceutil"
17-
"github.com/threefoldtech/zosbase/pkg/netlight/public"
18-
"github.com/threefoldtech/zosbase/pkg/netlight/resource"
19-
"github.com/threefoldtech/zosbase/pkg/network" // import network just for cleanup orphaned namespaces
13+
"github.com/threefoldtech/zos_base/pkg/netbase/nft"
14+
"github.com/threefoldtech/zos_base/pkg/netlight"
15+
"github.com/threefoldtech/zos_base/pkg/netlight/bridge"
16+
"github.com/threefoldtech/zos_base/pkg/netlight/ifaceutil"
17+
"github.com/threefoldtech/zos_base/pkg/netlight/public"
18+
"github.com/threefoldtech/zos_base/pkg/netlight/resource"
19+
"github.com/threefoldtech/zos_base/pkg/network" // import network just for cleanup orphaned namespaces
2020
"github.com/urfave/cli/v2"
2121

2222
"github.com/cenkalti/backoff/v3"
2323
"github.com/rs/zerolog/log"
2424
"github.com/threefoldtech/zbus"
25-
"github.com/threefoldtech/zosbase/pkg/netlight/bootstrap"
26-
"github.com/threefoldtech/zosbase/pkg/stubs"
27-
"github.com/threefoldtech/zosbase/pkg/utils"
25+
"github.com/threefoldtech/zos_base/pkg/netlight/bootstrap"
26+
"github.com/threefoldtech/zos_base/pkg/stubs"
27+
"github.com/threefoldtech/zos_base/pkg/utils"
2828
)
2929

3030
const (

‎cmds/modules/noded/main.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ import (
1212
"github.com/urfave/cli/v2"
1313

1414
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
15-
"github.com/threefoldtech/zosbase/pkg/app"
16-
"github.com/threefoldtech/zosbase/pkg/capacity"
17-
"github.com/threefoldtech/zosbase/pkg/environment"
18-
"github.com/threefoldtech/zosbase/pkg/events"
19-
"github.com/threefoldtech/zosbase/pkg/monitord"
20-
"github.com/threefoldtech/zosbase/pkg/perf"
21-
"github.com/threefoldtech/zosbase/pkg/perf/cpubench"
22-
"github.com/threefoldtech/zosbase/pkg/perf/healthcheck"
23-
"github.com/threefoldtech/zosbase/pkg/perf/iperf"
24-
"github.com/threefoldtech/zosbase/pkg/perf/provisiontest"
25-
"github.com/threefoldtech/zosbase/pkg/perf/publicip"
26-
registrar "github.com/threefoldtech/zosbase/pkg/registrar_light"
27-
"github.com/threefoldtech/zosbase/pkg/stubs"
28-
"github.com/threefoldtech/zosbase/pkg/utils"
15+
"github.com/threefoldtech/zos_base/pkg/app"
16+
"github.com/threefoldtech/zos_base/pkg/capacity"
17+
"github.com/threefoldtech/zos_base/pkg/environment"
18+
"github.com/threefoldtech/zos_base/pkg/events"
19+
"github.com/threefoldtech/zos_base/pkg/monitord"
20+
"github.com/threefoldtech/zos_base/pkg/perf"
21+
"github.com/threefoldtech/zos_base/pkg/perf/cpubench"
22+
"github.com/threefoldtech/zos_base/pkg/perf/healthcheck"
23+
"github.com/threefoldtech/zos_base/pkg/perf/iperf"
24+
"github.com/threefoldtech/zos_base/pkg/perf/provisiontest"
25+
"github.com/threefoldtech/zos_base/pkg/perf/publicip"
26+
registrar "github.com/threefoldtech/zos_base/pkg/registrar_light"
27+
"github.com/threefoldtech/zos_base/pkg/stubs"
28+
"github.com/threefoldtech/zos_base/pkg/utils"
2929

3030
"github.com/rs/zerolog/log"
3131

0 commit comments

Comments
 (0)