Replace io/ioutil

It was deprecated in Go 1.16 and its functions moved elsewhere.
coreos · Aug 10, 2022 · 151c506 · 151c506
1 parent ec866dc
commit 151c506
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/fedoracoreos/fcos.go b/fedoracoreos/fcos.go
@@ -6,7 +6,7 @@ package fedoracoreos
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -35,7 +35,7 @@ func getStream(u url.URL) (*stream.Stream, error) {
 	if err != nil {
 		return nil, err
 	}
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		return nil, err

diff --git a/release/release_test.go b/release/release_test.go
@@ -2,7 +2,7 @@ package release
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"testing"
 	"time"
 
@@ -15,7 +15,7 @@ const (
 )
 
 func TestParseFCR(t *testing.T) {
-	d, err := ioutil.ReadFile("fixtures/fcos-release.json")
+	d, err := os.ReadFile("fixtures/fcos-release.json")
 	assert.Nil(t, err)
 	release := Release{}
 	err = json.Unmarshal(d, &release)
@@ -25,7 +25,7 @@ func TestParseFCR(t *testing.T) {
 }
 
 func TestParseFCRIndex(t *testing.T) {
-	d, err := ioutil.ReadFile("fixtures/fcos-releases.json")
+	d, err := os.ReadFile("fixtures/fcos-releases.json")
 	assert.Nil(t, err)
 	idx := Index{}
 	err = json.Unmarshal(d, &idx)
@@ -38,7 +38,7 @@ func TestParseFCRIndex(t *testing.T) {
 }
 
 func TestTranslate(t *testing.T) {
-	d, err := ioutil.ReadFile("fixtures/fcos-release.json")
+	d, err := os.ReadFile("fixtures/fcos-release.json")
 	assert.Nil(t, err)
 	rel := Release{}
 	err = json.Unmarshal(d, &rel)

diff --git a/stream/artifact_utils.go b/stream/artifact_utils.go
@@ -4,7 +4,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -63,7 +62,7 @@ func (a *Artifact) Download(destdir string) (string, error) {
 		return "", err
 	}
 	destfile := filepath.Join(destdir, name)
-	w, err := ioutil.TempFile(destdir, ".coreos-artifact-")
+	w, err := os.CreateTemp(destdir, ".coreos-artifact-")
 	if err != nil {
 		return "", err
 	}

diff --git a/stream/stream_test.go b/stream/stream_test.go
@@ -2,14 +2,14 @@ package stream
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestParseFCS(t *testing.T) {
-	d, err := ioutil.ReadFile("fixtures/fcos-stream.json")
+	d, err := os.ReadFile("fixtures/fcos-stream.json")
 	assert.Nil(t, err)
 	stream := Stream{}
 	err = json.Unmarshal(d, &stream)