Remove ioutil.

cmd/mixtool/generate.go

@@ -17,7 +17,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -143,15 +142,15 @@ func generateAlerts(filename string, options mixer.GenerateOptions) error {
 		return err
 	}
 
-	return ioutil.WriteFile(options.AlertsFilename, out, 0644)
+	return os.WriteFile(options.AlertsFilename, out, 0644)
 }
 
 func generateRules(filename string, options mixer.GenerateOptions) error {
 	out, err := mixer.GenerateRules(filename, options)
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(options.RulesFilename, out, 0644)
+	return os.WriteFile(options.RulesFilename, out, 0644)
 }
 
 func generateDashboards(filename string, opts mixer.GenerateOptions) error {

cmd/mixtool/install.go

@@ -17,7 +17,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -145,7 +145,7 @@ func putMixin(content []byte, bindAddress string) error {
 	if resp.StatusCode == 200 {
 		fmt.Println("PUT alerts OK")
 	} else {
-		responseData, err := ioutil.ReadAll(resp.Body)
+		responseData, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return fmt.Errorf("failed to response body in putMixin, %w", err)
 		}

cmd/mixtool/install_test.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -48,7 +47,7 @@ func TestInstallMixin(t *testing.T) {
 }
 
 func testInstallMixin(t *testing.T, m mixin) {
-	tmpdir, err := ioutil.TempDir("", "mixtool-install")
+	tmpdir, err := os.CreateTemp("", "mixtool-install")
 	assert.NoError(t, err)
 	defer os.RemoveAll(tmpdir)
 

cmd/mixtool/list.go

@@ -17,7 +17,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -68,7 +68,7 @@ func queryWebsite(mixinsWebsite string) ([]byte, error) {
 		return nil, err
 	}
 	defer res.Body.Close()
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -129,7 +129,7 @@ func listAction(c *cli.Context) error {
 		if err != nil {
 			return err
 		}
-		body, err = ioutil.ReadFile(path)
+		body, err = os.ReadFile(path)
 		if err != nil {
 			return err
 		}
@@ -149,6 +149,6 @@ func listAction(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-  
+
 	return printMixins(mixins)
 }

cmd/mixtool/list_test.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -47,14 +46,14 @@ const exampleMixins = `
 `
 
 func TestList(t *testing.T) {
-	tempFile, err := ioutil.TempFile("", "exampleMixinsTest.json")
+	tempFile, err := os.CreateTemp("", "exampleMixinsTest.json")
 	assert.NoError(t, err)
 	defer os.Remove(tempFile.Name())
 
-	err = ioutil.WriteFile(tempFile.Name(), []byte(exampleMixins), 0644)
+	err = os.WriteFile(tempFile.Name(), []byte(exampleMixins), 0644)
 	assert.NoError(t, err)
 
-	body, err := ioutil.ReadFile(tempFile.Name())
+	body, err := os.ReadFile(tempFile.Name())
 	assert.NoError(t, err)
 
 	mixins, err := parseMixinJSON([]byte(body))

cmd/mixtool/server.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -99,12 +98,12 @@ type ruleProvisioner struct {
 // to existing, does not provision them. It returns whether Prometheus should
 // be reloaded and if an error has occurred.
 func (p *ruleProvisioner) provision(r io.Reader) (bool, error) {
-	newData, err := ioutil.ReadAll(r)
+	newData, err := io.ReadAll(r)
 	if err != nil {
 		return false, fmt.Errorf("unable to read new rules: %w", err)
 	}
 
-	tempfile, err := ioutil.TempFile(filepath.Dir(p.ruleFile), "temp-mixtool")
+	tempfile, err := os.CreateTemp(filepath.Dir(p.ruleFile), "temp-mixtool")
 	if err != nil {
 		return false, fmt.Errorf("unable to create temp file: %w", err)
 	}
@@ -184,7 +183,7 @@ func (r *prometheusReloader) triggerReload(ctx context.Context) error {
 		return fmt.Errorf("reload request: %w", err)
 	}
 
-	if _, err := io.Copy(ioutil.Discard, resp.Body); err != nil {
+	if _, err := io.Copy(io.Discard, resp.Body); err != nil {
 		return fmt.Errorf("exhausting request body: %w", err)
 	}
 

pkg/jsonnetbundler/init.go

@@ -17,7 +17,7 @@ package jsonnetbundler
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
 	"github.com/jsonnet-bundler/jsonnet-bundler/pkg/jsonnetfile"
@@ -47,7 +47,7 @@ func InitCommand(dir string) error {
 
 	filename := filepath.Join(dir, jsonnetfile.File)
 
-	err = ioutil.WriteFile(filename, contents, 0644)
+	err = os.WriteFile(filename, contents, 0644)
 	if err != nil {
 		return fmt.Errorf("Failed to write new jsonnetfile.json, %s", err.Error())
 	}

pkg/jsonnetbundler/install.go

@@ -17,7 +17,6 @@ package jsonnetbundler
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -35,7 +34,7 @@ func InstallCommand(dir, jsonnetHome string, uris []string, single bool) error {
 		dir = "."
 	}
 
-	jbfilebytes, err := ioutil.ReadFile(filepath.Join(dir, jsonnetfile.File))
+	jbfilebytes, err := os.ReadFile(filepath.Join(dir, jsonnetfile.File))
 	if err != nil {
 		return fmt.Errorf("failed to load jsonnetfile %s", err.Error())
 	}
@@ -45,7 +44,7 @@ func InstallCommand(dir, jsonnetHome string, uris []string, single bool) error {
 		return err
 	}
 
-	jblockfilebytes, err := ioutil.ReadFile(filepath.Join(dir, jsonnetfile.LockFile))
+	jblockfilebytes, err := os.ReadFile(filepath.Join(dir, jsonnetfile.LockFile))
 	if !os.IsNotExist(err) {
 		if err != nil {
 			return fmt.Errorf("failed to load lockfile %s", err.Error())
@@ -117,7 +116,7 @@ func writeJSONFile(name string, d interface{}) error {
 	}
 	b = append(b, []byte("\n")...)
 
-	return ioutil.WriteFile(name, b, 0644)
+	return os.WriteFile(name, b, 0644)
 }
 
 func writeChangedJsonnetFile(originalBytes []byte, modified *v1.JsonnetFile, path string) error {

pkg/mixer/generate_test.go

@@ -15,7 +15,6 @@
 package mixer
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -63,7 +62,7 @@ const expectedYaml = `groups:
 `
 
 func TestEvalAlerts(t *testing.T) {
-	inFile, err := ioutil.TempFile(os.TempDir(), "mixtool-")
+	inFile, err := os.CreateTemp(os.TempDir(), "mixtool-")
 	assert.NoError(t, err)
 	defer os.Remove(inFile.Name())
 

pkg/mixer/lint_test.go

@@ -16,7 +16,6 @@ package mixer
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -288,7 +287,7 @@ func TestLintGrafana(t *testing.T) {
 }
 
 func writeTempFile(t *testing.T, pattern string, contents string) (filename string, delete func()) {
-	f, err := ioutil.TempFile("", pattern)
+	f, err := os.CreateTemp("", pattern)
 	if err != nil {
 		t.Errorf("failed to create temp file: %v", err)
 	}