REORG/MINOR: remove the last uses of io/ioutil

And remove 2 unused functions in the process.

Author: oliwer

.aspell.yml

@@ -82,6 +82,7 @@ allowed:
   - httpCLF
   - ineffassign
   - infos
+  - ioutil
   - ipam
   - istanbul
   - jose

spoe/spoe_client_test.go

@@ -18,7 +18,6 @@ package spoe
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -54,7 +53,7 @@ func Test_spoeclient_Create(t *testing.T) {
 			name:       "Should create a file with # _version prepended",
 			clients:    make(map[string]*SingleSpoe),
 			fileName:   "spoe.cfg",
-			readCloser: ioutil.NopCloser(bytes.NewReader([]byte("hello world"))),
+			readCloser: io.NopCloser(bytes.NewReader([]byte("hello world"))),
 			initParams: Params{
 				SpoeDir:        "/tmp",
 				TransactionDir: "/tmp",

storage/storage_test.go

@@ -18,7 +18,6 @@ package storage
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"path/filepath"
 	"reflect"
 	"testing"
@@ -374,7 +373,7 @@ func Test_storage_Create(t *testing.T) {
 			name:       "Should create file if not exists",
 			dirname:    dirWithoutFile,
 			fileType:   MapsType,
-			readCloser: ioutil.NopCloser(bytes.NewReader([]byte("hello world"))),
+			readCloser: io.NopCloser(bytes.NewReader([]byte("hello world"))),
 			file:       "newfile.map",
 			want:       filepath.Join(dirWithoutFile, "newfile.map"),
 			wantErr:    false,

test/tcp_check_test.go

@@ -17,7 +17,6 @@ package test
 
 import (
 	"fmt"
-	"io/ioutil"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -40,18 +39,6 @@ func tcpCheckExpectation() map[string]models.TCPChecks {
 	return res
 }
 
-func generateTCPCheckConfig(config string) (string, error) {
-	f, err := ioutil.TempFile("/tmp", "tcp_check")
-	if err != nil {
-		return "", err
-	}
-	err = prepareTestFile(config, f.Name())
-	if err != nil {
-		return "", err
-	}
-	return f.Name(), nil
-}
-
 func (self Counter) current() int64 {
 	return self.count
 }

test/userlist_test.go

@@ -16,24 +16,11 @@
 package test
 
 import (
-	"io/ioutil"
 	"testing"
 
 	"github.com/haproxytech/client-native/v6/models"
 )
 
-func generateUserListConfig(config string) (string, error) {
-	f, err := ioutil.TempFile("/tmp", "userlist")
-	if err != nil {
-		return "", err
-	}
-	err = prepareTestFile(config, f.Name())
-	if err != nil {
-		return "", err
-	}
-	return f.Name(), nil
-}
-
 func TestUserList(t *testing.T) {
 	config := `# _version=1
 global

test/version_test.go

@@ -16,15 +16,15 @@
 package test
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func generateConfig(config string) (string, error) {
-	f, err := ioutil.TempFile("/tmp", "version")
+	f, err := os.CreateTemp("/tmp", "version")
 	if err != nil {
 		return "", err
 	}