Merge pull request #1607 from rqlite/remove-obsolte

Remove use of deprecated ioutil

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.16.7 (unreleased)
+### Implementation changes and bug fixes
+- [PR #1607](https://github.com/rqlite/rqlite/pull/1607): Remove use of deprecated `ioutil`.
+
 ## 8.16.6 (January 16th 2024)
 ### Implementation changes and bug fixes
 - [PR #1603](https://github.com/rqlite/rqlite/pull/1603): Standardize logging by Raft module.

auto/backup/config_test.go

@@ -3,7 +3,6 @@ package backup
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"testing"
@@ -16,7 +15,7 @@ import (
 func Test_ReadConfigFile(t *testing.T) {
 	t.Run("valid config file", func(t *testing.T) {
 		// Create a temporary config file
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -52,7 +51,7 @@ func Test_ReadConfigFile(t *testing.T) {
 		defer os.Unsetenv("TEST_VAR")
 
 		// Create a temporary config file with an environment variable
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -82,7 +81,7 @@ func Test_ReadConfigFile(t *testing.T) {
 		defer os.Unsetenv("TEST_VAR1")
 
 		// Create a temporary config file with an environment variable
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}

auto/restore/config.go

@@ -2,7 +2,7 @@ package restore
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"os"
 	"time"
 
@@ -52,7 +52,7 @@ func ReadConfigFile(filename string) ([]byte, error) {
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}

auto/restore/config_test.go

@@ -3,7 +3,6 @@ package restore
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"testing"
@@ -16,7 +15,7 @@ import (
 func Test_ReadConfigFile(t *testing.T) {
 	t.Run("valid config file", func(t *testing.T) {
 		// Create a temporary config file
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -52,7 +51,7 @@ func Test_ReadConfigFile(t *testing.T) {
 		defer os.Unsetenv("TEST_VAR")
 
 		// Create a temporary config file with an environment variable
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -82,7 +81,7 @@ func Test_ReadConfigFile(t *testing.T) {
 		defer os.Unsetenv("TEST_VAR1")
 
 		// Create a temporary config file with an environment variable
-		tempFile, err := ioutil.TempFile("", "upload_config")
+		tempFile, err := os.CreateTemp("", "upload_config")
 		if err != nil {
 			t.Fatal(err)
 		}

cmd/rqbench/queued_http.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"time"
 )
@@ -60,7 +59,7 @@ func (h *QueuedHTTPTester) Once() (time.Duration, error) {
 	}
 	defer resp.Body.Close()
 
-	_, err = ioutil.ReadAll(resp.Body)
+	_, err = io.ReadAll(resp.Body)
 	if err != nil {
 		return 0, err
 	}

command/chunking/dechunker_test.go

@@ -5,7 +5,6 @@ import (
 	"compress/gzip"
 	"crypto/rand"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -22,7 +21,7 @@ func Test_SingleChunk(t *testing.T) {
 		Data:        mustCompressData(data),
 	}
 
-	dir, err := ioutil.TempDir("", "dechunker-test")
+	dir, err := os.MkdirTemp("", "dechunker-test")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -47,7 +46,7 @@ func Test_SingleChunk(t *testing.T) {
 	}
 
 	// Check the contents of the output file.
-	got, err := ioutil.ReadFile(filePath)
+	got, err := os.ReadFile(filePath)
 	if err != nil {
 		t.Fatalf("failed to read output file: %v", err)
 	}
@@ -72,7 +71,7 @@ func Test_MultiChunk(t *testing.T) {
 		Data:        mustCompressData(data2),
 	}
 
-	dir, err := ioutil.TempDir("", "dechunker-test")
+	dir, err := os.MkdirTemp("", "dechunker-test")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -99,7 +98,7 @@ func Test_MultiChunk(t *testing.T) {
 	}
 
 	// Check the contents of the output file.
-	got, err := ioutil.ReadFile(filePath)
+	got, err := os.ReadFile(filePath)
 	if err != nil {
 		t.Fatalf("failed to read output file: %v", err)
 	}
@@ -130,7 +129,7 @@ func Test_MultiChunkNilData(t *testing.T) {
 		Data:        nil,
 	}
 
-	dir, err := ioutil.TempDir("", "dechunker-test")
+	dir, err := os.MkdirTemp("", "dechunker-test")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -157,7 +156,7 @@ func Test_MultiChunkNilData(t *testing.T) {
 	}
 
 	// Check the contents of the output file.
-	got, err := ioutil.ReadFile(filePath)
+	got, err := os.ReadFile(filePath)
 	if err != nil {
 		t.Fatalf("failed to read output file: %v", err)
 	}
@@ -184,7 +183,7 @@ func Test_UnexpectedStreamID(t *testing.T) {
 		Data:        compressedData,
 	}
 
-	dir, err := ioutil.TempDir("", "dechunker-test")
+	dir, err := os.MkdirTemp("", "dechunker-test")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -228,7 +227,7 @@ func Test_ChunksOutOfOrder(t *testing.T) {
 		Data:        compressedData,
 	}
 
-	dir, err := ioutil.TempDir("", "dechunker-test")
+	dir, err := os.MkdirTemp("", "dechunker-test")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -256,7 +255,7 @@ func Test_ChunksOutOfOrder(t *testing.T) {
 }
 
 func Test_ReassemblyOfLargeData(t *testing.T) {
-	dir, err := ioutil.TempDir("", "test-*")
+	dir, err := os.MkdirTemp("", "test-*")
 	if err != nil {
 		t.Fatalf("failed to create temp dir: %v", err)
 	}
@@ -300,7 +299,7 @@ func Test_ReassemblyOfLargeData(t *testing.T) {
 	defer os.Remove(outFilePath)
 
 	// The output data should be the same as the original largeData.
-	outData, err := ioutil.ReadFile(outFilePath)
+	outData, err := os.ReadFile(outFilePath)
 	if err != nil {
 		t.Fatalf("failed to read output file data: %v", err)
 	}

db/db_common_test.go

@@ -2,7 +2,6 @@ package db
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -1139,7 +1138,7 @@ func testSerialize(t *testing.T, db *DB) {
 		t.Fatalf("failed to insert records: %s", err.Error())
 	}
 
-	dstDB, err := ioutil.TempFile("", "rqlite-bak-")
+	dstDB, err := os.CreateTemp("", "rqlite-bak-")
 	if err != nil {
 		t.Fatalf("failed to create temp file: %s", err.Error())
 	}
@@ -1156,7 +1155,7 @@ func testSerialize(t *testing.T, db *DB) {
 		t.Fatalf("expected DELETE mode to be enabled")
 	}
 
-	err = ioutil.WriteFile(dstDB.Name(), b, 0644)
+	err = os.WriteFile(dstDB.Name(), b, 0644)
 	if err != nil {
 		t.Fatalf("failed to write serialized database to file: %s", err.Error())
 	}

log/log_test.go

@@ -1,7 +1,6 @@
 package log
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -476,7 +475,7 @@ func Test_LogStats(t *testing.T) {
 // mustTempFile returns a path to a temporary file in directory dir. It is up to the
 // caller to remove the file once it is no longer needed.
 func mustTempFile() string {
-	tmpfile, err := ioutil.TempFile("", "rqlite-db-test")
+	tmpfile, err := os.CreateTemp("", "rqlite-db-test")
 	if err != nil {
 		panic(err.Error())
 	}