From 4359978ef22a22ddd5a19adf18cbc80cb44244fb Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Thu, 23 Feb 2023 14:28:18 +0100
Subject: all: ioutil is deprecated in go1.19 (#3718)

---
 pkg/image/compression.go      | 3 +--
 pkg/image/compression_test.go | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'pkg/image')

diff --git a/pkg/image/compression.go b/pkg/image/compression.go
index c374ed07b..70e314ae5 100644
--- a/pkg/image/compression.go
+++ b/pkg/image/compression.go
@@ -9,7 +9,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
-	"io/ioutil"
 )
 
 func Compress(rawData []byte) []byte {
@@ -37,7 +36,7 @@ func MustDecompress(compressed []byte) (data []byte, dtor func()) {
 }
 
 func DecompressCheck(compressed []byte) error {
-	return decompressWriter(ioutil.Discard, compressed)
+	return decompressWriter(io.Discard, compressed)
 }
 
 func decompressWriter(w io.Writer, compressed []byte) error {
diff --git a/pkg/image/compression_test.go b/pkg/image/compression_test.go
index 15a225052..08caa40d6 100644
--- a/pkg/image/compression_test.go
+++ b/pkg/image/compression_test.go
@@ -6,8 +6,8 @@ package image_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -51,7 +51,7 @@ func TestEncode(t *testing.T) {
 
 func BenchmarkDecompress(b *testing.B) {
 	// Extract the largest image seed.
-	data, err := ioutil.ReadFile(filepath.FromSlash("../../sys/linux/test/syz_mount_image_gfs2_0"))
+	data, err := os.ReadFile(filepath.FromSlash("../../sys/linux/test/syz_mount_image_gfs2_0"))
 	if err != nil {
 		b.Fatal(err)
 	}
-- 
cgit mrf-deployment