From 3510f020364c74d77690861ff1ac5a977573f7ae Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Wed, 1 Mar 2023 20:56:27 -0500
Subject: [PATCH] Remove use of ioutil package (#93)

---
 cmd/connect.go    | 4 ++--
 pkg/vpn/cache.go  | 6 +++---
 pkg/vpn/client.go | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmd/connect.go b/cmd/connect.go
index 6c00584..ae57b94 100644
--- a/cmd/connect.go
+++ b/cmd/connect.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strings"
@@ -29,6 +28,7 @@ func init() {
 
 var connectCmd = &cobra.Command{
 	Use:   "connect",
+	
 	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`,
 	Args:  cobra.RangeArgs(0, 1),
@@ -91,7 +91,7 @@ var connectCmd = &cobra.Command{
 				os.Exit(1)
 			}
 
-			tmpfile, err := ioutil.TempFile("", "vpngate-openvpn-config-")
+			tmpfile, err := os.CreateTemp("", "vpngate-openvpn-config-")
 			if err != nil {
 				log.Fatal().Msgf(err.Error())
 				os.Exit(1)
diff --git a/pkg/vpn/cache.go b/pkg/vpn/cache.go
index 3dc8e82..10d6cea 100644
--- a/pkg/vpn/cache.go
+++ b/pkg/vpn/cache.go
@@ -2,7 +2,7 @@ package vpn
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"os"
 	"path"
 	"time"
@@ -36,7 +36,7 @@ func getVpnListCache() (*[]Server, error) {
 		return nil, err
 	}
 
-	byteValue, err := ioutil.ReadAll(serversFile)
+	byteValue, err := io.ReadAll(serversFile)
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +65,7 @@ func writeVpnListToCache(servers []Server) error {
 
 	cacheFile := path.Join(getCacheDir(), serverCachefile)
 
-	err = ioutil.WriteFile(cacheFile, f, 0o644)
+	err = os.WriteFile(cacheFile, f, 0o644)
 
 	return err
 }
diff --git a/pkg/vpn/client.go b/pkg/vpn/client.go
index 6fd416e..5136c66 100644
--- a/pkg/vpn/client.go
+++ b/pkg/vpn/client.go
@@ -1,7 +1,6 @@
 package vpn
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/davegallant/vpngate/pkg/exec"
@@ -12,7 +11,7 @@ import (
 
 // Connect to a specified OpenVPN configuration
 func Connect(configPath string) error {
-	tmpLogFile, err := ioutil.TempFile("", "vpngate-openvpn-log-")
+	tmpLogFile, err := os.CreateTemp("", "vpngate-openvpn-log-")
 	if err != nil {
 		return errors.Annotate(err, "Unable to create a temporary log file")
 	}