Skip to content

Commit bc650eb

Browse files
rawdaGastanrawdaGastan
committed
Merge branch 'main' of github.com:threefoldtech/zos4 into development_rollout_configs
2 parents 89c3556 + 8430395 commit bc650eb

File tree

216 files changed

+803
-677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+803
-677
lines changed

‎.golangci.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
linters:
2+
enable:
3+
- errcheck
4+
- gofmt
5+
- govet
6+
- ineffassign
7+
- unconvert
8+
- staticcheck
9+
- gocyclo
10+
enable-all: false
11+
linters-settings:
12+
gocyclo:
13+
# Minimal code complexity to report.
14+
# Default: 30 (but we recommend 10-20)
15+
min-complexity: 100
16+
run:
17+
timeout: 20m

‎CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ exact code change can help focus discussions, so the choice is up to you.
4040

4141
## Setting up a development environment
4242

43-
Check out the [documentation](https://github.com/threefoldtech/zos/tree/master/docs) learn about the code
44-
base and setting up your [development environment](https://github.com/threefoldtech/zos/blob/master/qemu/README.md).
43+
Check out the [documentation](https://github.com/threefoldtech/zos4/tree/master/docs) learn about the code
44+
base and setting up your [development environment](https://github.com/threefoldtech/zos4/blob/master/qemu/README.md).
4545

4646
## Pull requests
4747

@@ -74,7 +74,7 @@ pull requests.
7474

7575
## Issues
7676

77-
[GitHub issues](https://github.com/threefoldtech/zos/issues/new) can be used to report bugs or submit feature requests.
77+
[GitHub issues](https://github.com/threefoldtech/zos4/issues/new) can be used to report bugs or submit feature requests.
7878

7979
When reporting a bug please include the following key pieces of information:
8080

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 0-OS ![Tests](https://github.com/threefoldtech/zos/workflows/Tests%20and%20Coverage/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/threefoldtech/zos)](https://goreportcard.com/report/github.com/threefoldtech/zos)
1+
# 0-OS ![Tests](https://github.com/threefoldtech/zos4/workflows/Tests%20and%20Coverage/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/threefoldtech/zos)](https://goreportcard.com/report/github.com/threefoldtech/zos)
22

33
0-OS is an autonomous operating system design to expose raw compute, storage and network capacity.
44

‎VALUES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ values we hold as a team:
2020
personally. Consider other people’s perspectives. Empathize with our users. Focus on the specific
2121
issue at hand, and remember that we all care about the project, first and
2222
foremost.
23-
- [GitHub issues](https://github.com/threefoldtech/zos/issues/new),
23+
- [GitHub issues](https://github.com/threefoldtech/zos4/issues/new),
2424
document comments, or meetings are often better and higher bandwidth ways to
2525
communicate complex and nuanced design issues, as opposed to protracted
2626
heated live chats.

‎bins/packages/mycelium/mycelium.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MYCELIUM_VERSION="0.5.3"
2-
MYCELIUM_CHECKSUM="a41979ca85b2d60ec4757a2dbd88e95c"
1+
MYCELIUM_VERSION="0.5.6"
2+
MYCELIUM_CHECKSUM="9e33aad058bf331c8ebbf1aa2a5a6793"
33
MYCELIUM_LINK="https://github.com/threefoldtech/mycelium/releases/download/v${MYCELIUM_VERSION}/mycelium-x86_64-unknown-linux-musl.tar.gz"
44

55
download_mycelium() {

‎client/_http/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/lestrrat-go/jwx/jwt"
1414
"github.com/pkg/errors"
1515
"github.com/rs/zerolog/log"
16-
zoscrypt "github.com/threefoldtech/zos/pkg/crypto"
16+
zoscrypt "github.com/threefoldtech/zos4/pkg/crypto"
1717
"github.com/yggdrasil-network/yggdrasil-go/src/address"
1818
"github.com/yggdrasil-network/yggdrasil-go/src/crypto"
1919
)

‎client/_http/node.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"path/filepath"
1111

1212
"github.com/pkg/errors"
13-
"github.com/threefoldtech/zos/pkg/gridtypes"
13+
"github.com/threefoldtech/zos4/pkg/gridtypes"
1414
)
1515

1616
var (

‎client/node.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ import (
7777
"net"
7878

7979
"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go"
80-
"github.com/threefoldtech/zos/pkg"
81-
"github.com/threefoldtech/zos/pkg/capacity/dmi"
82-
"github.com/threefoldtech/zos/pkg/diagnostics"
83-
"github.com/threefoldtech/zos/pkg/gridtypes"
80+
"github.com/threefoldtech/zos4/pkg"
81+
"github.com/threefoldtech/zos4/pkg/capacity/dmi"
82+
"github.com/threefoldtech/zos4/pkg/diagnostics"
83+
"github.com/threefoldtech/zos4/pkg/gridtypes"
8484
)
8585

8686
// NodeClient struct

‎cmds/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ OUT = $(shell realpath -m ../bin)
22
branch = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
33
revision = $(shell git rev-parse HEAD)
44
dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo "*")
5-
version = github.com/threefoldtech/zos/pkg/version
5+
version = github.com/threefoldtech/zos4/pkg/version
66
ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty) -extldflags "-static"'
77

88
all: identityd internet zos

‎cmds/identityd/main.go

+8-8
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/zos/pkg/app"
12-
"github.com/threefoldtech/zos/pkg/stubs"
13-
"github.com/threefoldtech/zos/pkg/upgrade"
11+
"github.com/threefoldtech/zos4/pkg/app"
12+
"github.com/threefoldtech/zos4/pkg/stubs"
13+
"github.com/threefoldtech/zos4/pkg/upgrade"
1414

15-
"github.com/threefoldtech/zos/pkg"
16-
"github.com/threefoldtech/zos/pkg/environment"
17-
"github.com/threefoldtech/zos/pkg/identity"
15+
"github.com/threefoldtech/zos4/pkg"
16+
"github.com/threefoldtech/zos4/pkg/environment"
17+
"github.com/threefoldtech/zos4/pkg/identity"
1818

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

2525
const (

‎cmds/identityd/monitor.go

+1-1
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/zos/pkg"
8+
"github.com/threefoldtech/zos4/pkg"
99
)
1010

1111
type monitorStream struct {

‎cmds/identityd/ssh.go

+3-3
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/zos/pkg"
15-
"github.com/threefoldtech/zos/pkg/environment"
16-
"github.com/threefoldtech/zos/pkg/kernel"
14+
"github.com/threefoldtech/zos4/pkg"
15+
"github.com/threefoldtech/zos4/pkg/environment"
16+
"github.com/threefoldtech/zos4/pkg/kernel"
1717
)
1818

1919
var (

‎cmds/internet/main.go

+11-11
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/zos/pkg/app"
15-
"github.com/threefoldtech/zos/pkg/environment"
16-
"github.com/threefoldtech/zos/pkg/netlight/bootstrap"
17-
"github.com/threefoldtech/zos/pkg/netlight/bridge"
18-
"github.com/threefoldtech/zos/pkg/netlight/dhcp"
19-
"github.com/threefoldtech/zos/pkg/netlight/ifaceutil"
20-
"github.com/threefoldtech/zos/pkg/netlight/options"
21-
"github.com/threefoldtech/zos/pkg/netlight/types"
22-
"github.com/threefoldtech/zos/pkg/zinit"
23-
24-
"github.com/threefoldtech/zos/pkg/version"
14+
"github.com/threefoldtech/zos4/pkg/app"
15+
"github.com/threefoldtech/zos4/pkg/environment"
16+
"github.com/threefoldtech/zos4/pkg/netlight/bootstrap"
17+
"github.com/threefoldtech/zos4/pkg/netlight/bridge"
18+
"github.com/threefoldtech/zos4/pkg/netlight/dhcp"
19+
"github.com/threefoldtech/zos4/pkg/netlight/ifaceutil"
20+
"github.com/threefoldtech/zos4/pkg/netlight/options"
21+
"github.com/threefoldtech/zos4/pkg/netlight/types"
22+
"github.com/threefoldtech/zos4/pkg/zinit"
23+
24+
"github.com/threefoldtech/zos4/pkg/version"
2525
)
2626

2727
func main() {

‎cmds/modules/api_gateway/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
1212
"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
1313
"github.com/threefoldtech/zbus"
14-
"github.com/threefoldtech/zos/pkg/environment"
15-
"github.com/threefoldtech/zos/pkg/stubs"
16-
substrategw "github.com/threefoldtech/zos/pkg/substrate_gateway"
17-
"github.com/threefoldtech/zos/pkg/utils"
18-
zosapi "github.com/threefoldtech/zos/pkg/zos_api"
14+
"github.com/threefoldtech/zos4/pkg/environment"
15+
"github.com/threefoldtech/zos4/pkg/stubs"
16+
substrategw "github.com/threefoldtech/zos4/pkg/substrate_gateway"
17+
"github.com/threefoldtech/zos4/pkg/utils"
18+
zosapi "github.com/threefoldtech/zos4/pkg/zos_api"
1919
"github.com/urfave/cli/v2"
2020
)
2121

‎cmds/modules/contd/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212
"github.com/urfave/cli/v2"
1313

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

1919
const module = "container"
2020

21-
//Module is contd entry point
21+
// Module is contd entry point
2222
var Module cli.Command = cli.Command{
2323
Name: "contd",
2424
Usage: "handles containers creations",

‎cmds/modules/flistd/main.go

+3-3
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/zos/pkg/stubs"
9-
"github.com/threefoldtech/zos/pkg/utils"
8+
"github.com/threefoldtech/zos4/pkg/stubs"
9+
"github.com/threefoldtech/zos4/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/zos/pkg/flist"
15+
"github.com/threefoldtech/zos4/pkg/flist"
1616
)
1717

1818
const (

‎cmds/modules/netlightd/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ import (
1111

1212
"github.com/oasisprotocol/curve25519-voi/primitives/x25519"
1313
"github.com/pkg/errors"
14-
"github.com/threefoldtech/zos/pkg/netlight"
15-
"github.com/threefoldtech/zos/pkg/netlight/nft"
16-
"github.com/threefoldtech/zos/pkg/netlight/resource"
14+
"github.com/threefoldtech/zos4/pkg/netlight"
15+
"github.com/threefoldtech/zos4/pkg/netlight/nft"
16+
"github.com/threefoldtech/zos4/pkg/netlight/resource"
1717
"github.com/urfave/cli/v2"
1818

1919
"github.com/cenkalti/backoff/v3"
2020
"github.com/rs/zerolog/log"
2121
"github.com/threefoldtech/zbus"
22-
"github.com/threefoldtech/zos/pkg/netlight/bootstrap"
23-
"github.com/threefoldtech/zos/pkg/stubs"
24-
"github.com/threefoldtech/zos/pkg/utils"
22+
"github.com/threefoldtech/zos4/pkg/netlight/bootstrap"
23+
"github.com/threefoldtech/zos4/pkg/stubs"
24+
"github.com/threefoldtech/zos4/pkg/utils"
2525
)
2626

2727
const (

‎cmds/modules/noded/main.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ import (
1111
"github.com/urfave/cli/v2"
1212

1313
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
14-
"github.com/threefoldtech/zos/pkg/app"
15-
"github.com/threefoldtech/zos/pkg/capacity"
16-
"github.com/threefoldtech/zos/pkg/environment"
17-
"github.com/threefoldtech/zos/pkg/events"
18-
"github.com/threefoldtech/zos/pkg/monitord"
19-
"github.com/threefoldtech/zos/pkg/perf"
20-
"github.com/threefoldtech/zos/pkg/perf/cpubench"
21-
"github.com/threefoldtech/zos/pkg/perf/healthcheck"
22-
"github.com/threefoldtech/zos/pkg/perf/iperf"
23-
"github.com/threefoldtech/zos/pkg/perf/publicip"
24-
"github.com/threefoldtech/zos/pkg/registrar"
25-
"github.com/threefoldtech/zos/pkg/stubs"
26-
"github.com/threefoldtech/zos/pkg/utils"
14+
"github.com/threefoldtech/zos4/pkg/app"
15+
"github.com/threefoldtech/zos4/pkg/capacity"
16+
"github.com/threefoldtech/zos4/pkg/environment"
17+
"github.com/threefoldtech/zos4/pkg/events"
18+
"github.com/threefoldtech/zos4/pkg/monitord"
19+
"github.com/threefoldtech/zos4/pkg/perf"
20+
"github.com/threefoldtech/zos4/pkg/perf/cpubench"
21+
"github.com/threefoldtech/zos4/pkg/perf/healthcheck"
22+
"github.com/threefoldtech/zos4/pkg/perf/iperf"
23+
"github.com/threefoldtech/zos4/pkg/perf/publicip"
24+
"github.com/threefoldtech/zos4/pkg/registrar"
25+
"github.com/threefoldtech/zos4/pkg/stubs"
26+
"github.com/threefoldtech/zos4/pkg/utils"
2727

2828
"github.com/rs/zerolog/log"
2929

‎cmds/modules/powerd/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/rs/zerolog/log"
99
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
1010
"github.com/threefoldtech/zbus"
11-
"github.com/threefoldtech/zos/pkg/environment"
12-
"github.com/threefoldtech/zos/pkg/events"
13-
"github.com/threefoldtech/zos/pkg/power"
14-
"github.com/threefoldtech/zos/pkg/stubs"
15-
"github.com/threefoldtech/zos/pkg/utils"
11+
"github.com/threefoldtech/zos4/pkg/environment"
12+
"github.com/threefoldtech/zos4/pkg/events"
13+
"github.com/threefoldtech/zos4/pkg/power"
14+
"github.com/threefoldtech/zos4/pkg/stubs"
15+
"github.com/threefoldtech/zos4/pkg/utils"
1616
"github.com/urfave/cli/v2"
1717
)
1818

‎cmds/modules/provisiond/cap.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/centrifuge/go-substrate-rpc-client/v4/types"
99
"github.com/rs/zerolog/log"
1010
substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
11-
"github.com/threefoldtech/zos/pkg/gridtypes"
12-
"github.com/threefoldtech/zos/pkg/provision"
13-
"github.com/threefoldtech/zos/pkg/stubs"
11+
"github.com/threefoldtech/zos4/pkg/gridtypes"
12+
"github.com/threefoldtech/zos4/pkg/provision"
13+
"github.com/threefoldtech/zos4/pkg/stubs"
1414
)
1515

1616
type DeploymentID struct {

‎cmds/modules/provisiond/events.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66

77
"github.com/pkg/errors"
88
"github.com/rs/zerolog/log"
9-
"github.com/threefoldtech/zos/pkg/events"
10-
"github.com/threefoldtech/zos/pkg/gridtypes"
11-
"github.com/threefoldtech/zos/pkg/provision"
12-
"github.com/threefoldtech/zos/pkg/stubs"
9+
"github.com/threefoldtech/zos4/pkg/events"
10+
"github.com/threefoldtech/zos4/pkg/gridtypes"
11+
"github.com/threefoldtech/zos4/pkg/provision"
12+
"github.com/threefoldtech/zos4/pkg/stubs"
1313
)
1414

1515
type ContractEventHandler struct {

0 commit comments

Comments
 (0)