dave/vpngate
1
0
Fork 0
mirror of https://github.com/davegallant/vpngate.git synced 2025-08-06 08:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of ioutil package (#93)

Browse Source
This commit is contained in:
Dave Gallant
2023-03-01 20:56:27 -05:00
committed by GitHub
parent 3044ecef5f
commit 3510f02036
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/connect.go
View File

@@ -3,7 +3,6 @@ package cmd
import ( import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"io/ioutil"
"math/rand" "math/rand"
"os" "os"
"strings" "strings"
@@ -29,6 +28,7 @@ func init() {
var connectCmd = &cobra.Command{ var connectCmd = &cobra.Command{
Use: "connect", Use: "connect",
Short: "Connect to a vpn server (survey selection appears if hostname is not provided)", Short: "Connect to a vpn server (survey selection appears if hostname is not provided)",
Long: `Connect to a vpn from a list of relay servers`, Long: `Connect to a vpn from a list of relay servers`,
Args: cobra.RangeArgs(0, 1), Args: cobra.RangeArgs(0, 1),
@@ -91,7 +91,7 @@ var connectCmd = &cobra.Command{
os.Exit(1) os.Exit(1)
} }
tmpfile, err := ioutil.TempFile("", "vpngate-openvpn-config-") tmpfile, err := os.CreateTemp("", "vpngate-openvpn-config-")
if err != nil { if err != nil {
log.Fatal().Msgf(err.Error()) log.Fatal().Msgf(err.Error())
os.Exit(1) os.Exit(1)

6
pkg/vpn/cache.go
View File

@@ -2,7 +2,7 @@ package vpn
import ( import (
"encoding/json" "encoding/json"
"io/ioutil" "io"
"os" "os"
"path" "path"
"time" "time"
@@ -36,7 +36,7 @@ func getVpnListCache() (*[]Server, error) {
return nil, err return nil, err
} }
byteValue, err := ioutil.ReadAll(serversFile) byteValue, err := io.ReadAll(serversFile)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -65,7 +65,7 @@ func writeVpnListToCache(servers []Server) error {
cacheFile := path.Join(getCacheDir(), serverCachefile) cacheFile := path.Join(getCacheDir(), serverCachefile)
err = ioutil.WriteFile(cacheFile, f, 0o644) err = os.WriteFile(cacheFile, f, 0o644)
return err return err
} }

3
pkg/vpn/client.go
View File

@@ -1,7 +1,6 @@
package vpn package vpn
import ( import (
"io/ioutil"
"os" "os"
"github.com/davegallant/vpngate/pkg/exec" "github.com/davegallant/vpngate/pkg/exec"
@@ -12,7 +11,7 @@ import (
// Connect to a specified OpenVPN configuration // Connect to a specified OpenVPN configuration
func Connect(configPath string) error { func Connect(configPath string) error {
tmpLogFile, err := ioutil.TempFile("", "vpngate-openvpn-log-") tmpLogFile, err := os.CreateTemp("", "vpngate-openvpn-log-")
if err != nil { if err != nil {
return errors.Annotate(err, "Unable to create a temporary log file") return errors.Annotate(err, "Unable to create a temporary log file")
} }