Merge pull request #34 from SLoeuillet/go-refresh

Bump go version and fix some deprecations

Author: suquant

Makefile

@@ -39,4 +39,4 @@ typescript-axios-client:
 		-i openapi-spec.yaml \
 		-o clients/typeascript-axios
 
-.PHONY: clean build install
+.PHONY: clean build install

go.mod

@@ -1,18 +1,37 @@
 module github.com/suquant/wgrest
 
-go 1.16
+go 1.21
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/glendc/go-external-ip v0.1.0
-	github.com/labstack/echo/v4 v4.6.1
-	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/labstack/echo/v4 v4.11.3
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	github.com/urfave/cli/v2 v2.3.0
-	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
-	golang.org/x/net v0.0.0-20211111160137-58aab5ef257a // indirect
-	golang.org/x/sys v0.0.0-20211112143042-c6105e7cf70d // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.zx2c4.com/wireguard v0.0.0-20211111141719-cad0ff2cfbd9 // indirect
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211109202428-0073765f69ba
+	github.com/urfave/cli/v2 v2.25.7
+	golang.org/x/crypto v0.16.0
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
+)
+
+require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/josharian/native v1.1.0 // indirect
+	github.com/labstack/gommon v0.4.1 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mdlayher/genetlink v1.3.2 // indirect
+	github.com/mdlayher/netlink v1.7.2 // indirect
+	github.com/mdlayher/socket v0.5.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -2,18 +2,19 @@ package handlers
 
 import (
 	"bytes"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+
 	"github.com/labstack/echo/v4"
 	"github.com/skip2/go-qrcode"
 	"github.com/suquant/wgrest/models"
 	"github.com/suquant/wgrest/storage"
 	"github.com/suquant/wgrest/utils"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
 )
 
 // CreateDevice - Create new device

handlers/api_device.go

@@ -3,9 +3,10 @@ package models
 import (
 	"encoding/base64"
 	"fmt"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"net"
 	"time"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 var (

models/model_peer_ext.go

@@ -2,10 +2,10 @@ package storage
 
 import (
 	"encoding/base64"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-	"io/ioutil"
 	"os"
 	"path"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type FileStorage struct {
@@ -26,7 +26,7 @@ func (s *FileStorage) getFilePath(name string) string {
 
 func (s *FileStorage) WriteDeviceOptions(name string, options StoreDeviceOptions) error {
 	filePath := s.getFilePath(name)
-	f, err := ioutil.TempFile(s.dir, name)
+	f, err := os.CreateTemp(s.dir, name)
 	if err != nil {
 		return err
 	}
@@ -46,7 +46,7 @@ func (s *FileStorage) WriteDeviceOptions(name string, options StoreDeviceOptions
 func (s *FileStorage) WritePeerOptions(pubKey wgtypes.Key, options StorePeerOptions) error {
 	safeName := base64.URLEncoding.EncodeToString(pubKey[:])
 	filePath := s.getFilePath(safeName)
-	f, err := ioutil.TempFile(s.dir, safeName)
+	f, err := os.CreateTemp(s.dir, safeName)
 	if err != nil {
 		return err
 	}

storage/file_storage.go

@@ -3,9 +3,10 @@ package storage
 import (
 	"bufio"
 	"fmt"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"io"
 	"strings"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type StoreDeviceOptions struct {

storage/storage.go

@@ -1,9 +1,10 @@
 package utils
 
 import (
+	"strings"
+
 	"github.com/suquant/wgrest/models"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-	"strings"
 )
 
 func FilterPeersByQuery(q string, peers []wgtypes.Peer) []wgtypes.Peer {

utils/peers_filter.go

@@ -3,8 +3,9 @@ package utils
 import (
 	"bytes"
 	"fmt"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"sort"
+
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type sortPeerByPubKey []wgtypes.Peer

utils/peers_sort.go

@@ -3,10 +3,11 @@ package utils
 import (
 	"bytes"
 	"fmt"
-	"github.com/suquant/wgrest/models"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	"io"
 	"strings"
+
+	"github.com/suquant/wgrest/models"
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 type PeerQuickConfigOptions struct {