diff --git a/.github/workflows/golang-test-darwin.yml b/.github/workflows/golang-test-darwin.yml index 0a9812225..7bfbe02cd 100644 --- a/.github/workflows/golang-test-darwin.yml +++ b/.github/workflows/golang-test-darwin.yml @@ -13,7 +13,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/golang-test-linux.yml b/.github/workflows/golang-test-linux.yml index e4ab3a747..64fe743a9 100644 --- a/.github/workflows/golang-test-linux.yml +++ b/.github/workflows/golang-test-linux.yml @@ -16,7 +16,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - name: Cache Go modules @@ -45,7 +45,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - name: Cache Go modules diff --git a/.github/workflows/golang-test-windows.yml b/.github/workflows/golang-test-windows.yml index fbf74a1ef..f25b6b949 100644 --- a/.github/workflows/golang-test-windows.yml +++ b/.github/workflows/golang-test-windows.yml @@ -31,7 +31,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - uses: actions/cache@v2 with: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ef855f801..5b8f8412a 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -9,13 +9,10 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - name: Install dependencies run: sudo apt update && sudo apt install -y -q libgtk-3-dev libappindicator3-dev libayatana-appindicator3-dev libgl1-mesa-dev xorg-dev - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - # SA1019: "io/ioutil" has been deprecated since Go 1.16 - args: --timeout=6m -e SA1019 - - + args: --timeout=6m \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d82074567..1da745947 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Cache Go modules uses: actions/cache@v1 @@ -88,7 +88,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Cache Go modules uses: actions/cache@v1 with: @@ -138,7 +138,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Cache Go modules uses: actions/cache@v1 diff --git a/.github/workflows/test-docker-compose-linux.yml b/.github/workflows/test-docker-compose-linux.yml index 097f30e1d..9374650c5 100644 --- a/.github/workflows/test-docker-compose-linux.yml +++ b/.github/workflows/test-docker-compose-linux.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: 1.19.x - name: Cache Go modules uses: actions/cache@v2 diff --git a/client/cmd/root.go b/client/cmd/root.go index 26e9a76bf..6a068c8f0 100644 --- a/client/cmd/root.go +++ b/client/cmd/root.go @@ -6,7 +6,6 @@ import ( "fmt" "io" "io/fs" - "io/ioutil" "os" "os/signal" "path" @@ -236,7 +235,7 @@ func copySymLink(source, dest string) error { func cpDir(src string, dst string) error { var err error - var fds []os.FileInfo + var fds []os.DirEntry var srcinfo os.FileInfo if srcinfo, err = os.Stat(src); err != nil { @@ -247,7 +246,7 @@ func cpDir(src string, dst string) error { return err } - if fds, err = ioutil.ReadDir(src); err != nil { + if fds, err = os.ReadDir(src); err != nil { return err } for _, fd := range fds { diff --git a/client/internal/routemanager/firewall_nonlinux.go b/client/internal/routemanager/firewall_nonlinux.go index 172659f26..4691f15f8 100644 --- a/client/internal/routemanager/firewall_nonlinux.go +++ b/client/internal/routemanager/firewall_nonlinux.go @@ -18,7 +18,6 @@ func (unimplementedFirewall) RemoveRoutingRules(pair routerPair) error { } func (unimplementedFirewall) CleanRoutingRules() { - return } // NewFirewall returns an unimplemented Firewall manager diff --git a/client/internal/routemanager/systemops_linux.go b/client/internal/routemanager/systemops_linux.go index f891b461f..08fecc8eb 100644 --- a/client/internal/routemanager/systemops_linux.go +++ b/client/internal/routemanager/systemops_linux.go @@ -2,9 +2,9 @@ package routemanager import ( "github.com/vishvananda/netlink" - "io/ioutil" "net" "net/netip" + "os" ) const ipv4ForwardingPath = "/proc/sys/net/ipv4/ip_forward" @@ -59,12 +59,12 @@ func removeFromRouteTable(prefix netip.Prefix) error { } func enableIPForwarding() error { - err := ioutil.WriteFile(ipv4ForwardingPath, []byte("1"), 0644) + err := os.WriteFile(ipv4ForwardingPath, []byte("1"), 0644) return err } func isNetForwardHistoryEnabled() bool { - out, err := ioutil.ReadFile(ipv4ForwardingPath) + out, err := os.ReadFile(ipv4ForwardingPath) if err != nil { // todo panic(err) diff --git a/go.mod b/go.mod index b7f92bc73..2802a369b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/netbirdio/netbird -go 1.18 +go 1.19 require ( github.com/cenkalti/backoff/v4 v4.1.3 diff --git a/iface/module_linux.go b/iface/module_linux.go index 46f46095e..2001eeb95 100644 --- a/iface/module_linux.go +++ b/iface/module_linux.go @@ -8,8 +8,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" + "io" "io/fs" - "io/ioutil" "math" "os" "path/filepath" @@ -295,7 +295,7 @@ func loadModule(name, path string) error { // first try finit_module(2), then init_module(2) err = unix.FinitModule(int(f.Fd()), "", 0) if errors.Is(err, unix.ENOSYS) { - buf, err := ioutil.ReadAll(f) + buf, err := io.ReadAll(f) if err != nil { return err } diff --git a/iface/module_linux_test.go b/iface/module_linux_test.go index 62105d1a0..982877287 100644 --- a/iface/module_linux_test.go +++ b/iface/module_linux_test.go @@ -6,7 +6,6 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sys/unix" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -133,7 +132,7 @@ func resetGlobals() { func createFiles(t *testing.T) (string, []module) { writeFile := func(path, text string) { - if err := ioutil.WriteFile(path, []byte(text), 0644); err != nil { + if err := os.WriteFile(path, []byte(text), 0644); err != nil { t.Fatal(err) } } diff --git a/signal/cmd/run.go b/signal/cmd/run.go index e5f0bcd8a..9b52fb52d 100644 --- a/signal/cmd/run.go +++ b/signal/cmd/run.go @@ -7,7 +7,6 @@ import ( "golang.org/x/crypto/acme/autocert" "io" "io/fs" - "io/ioutil" "net" "net/http" "os" @@ -231,7 +230,7 @@ func copySymLink(source, dest string) error { func cpDir(src string, dst string) error { var err error - var fds []os.FileInfo + var fds []os.DirEntry var srcinfo os.FileInfo if srcinfo, err = os.Stat(src); err != nil { @@ -242,7 +241,7 @@ func cpDir(src string, dst string) error { return err } - if fds, err = ioutil.ReadDir(src); err != nil { + if fds, err = os.ReadDir(src); err != nil { return err } for _, fd := range fds { diff --git a/util/file_test.go b/util/file_test.go index 84a7db80d..99a2708fb 100644 --- a/util/file_test.go +++ b/util/file_test.go @@ -7,7 +7,6 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "io" - "io/ioutil" "os" ) @@ -25,7 +24,7 @@ var _ = Describe("Client", func() { BeforeEach(func() { var err error - tmpDir, err = ioutil.TempDir("", "wiretrustee_util_test_tmp_*") + tmpDir, err = os.MkdirTemp("", "wiretrustee_util_test_tmp_*") Expect(err).NotTo(HaveOccurred()) })