Remove ioutil usage (bazel-contrib#1707)

cmd/gazelle/fix.go

@@ -18,7 +18,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -35,7 +34,7 @@ func fixFile(c *config.Config, f *rule.File) error {
 	if err := os.MkdirAll(filepath.Dir(outPath), 0o777); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(outPath, newContent, 0o666); err != nil {
+	if err := os.WriteFile(outPath, newContent, 0o666); err != nil {
 		return err
 	}
 	f.Content = newContent

cmd/gazelle/fix_test.go

@@ -18,7 +18,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -40,7 +39,7 @@ func TestMain(m *testing.M) {
 	flag.Parse()
 
 	var err error
-	tmpDir, err := ioutil.TempDir(os.Getenv("TEST_TMPDIR"), "gazelle_test")
+	tmpDir, err := os.MkdirTemp(os.Getenv("TEST_TMPDIR"), "gazelle_test")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		return
@@ -105,14 +104,14 @@ func defaultArgs(dir string) []string {
 func TestCreateFile(t *testing.T) {
 	// Create a directory with a simple .go file.
 	tmpdir := os.Getenv("TEST_TMPDIR")
-	dir, err := ioutil.TempDir(tmpdir, "")
+	dir, err := os.MkdirTemp(tmpdir, "")
 	if err != nil {
-		t.Fatalf("ioutil.TempDir(%q, %q) failed with %v; want success", tmpdir, "", err)
+		t.Fatalf("os.MkdirTemp(%q, %q) failed with %v; want success", tmpdir, "", err)
 	}
 	defer os.RemoveAll(dir)
 
 	goFile := filepath.Join(dir, "main.go")
-	if err = ioutil.WriteFile(goFile, []byte("package main"), 0o600); err != nil {
+	if err = os.WriteFile(goFile, []byte("package main"), 0o600); err != nil {
 		t.Fatalf("error writing file %q: %v", goFile, err)
 	}
 
@@ -130,19 +129,19 @@ func TestCreateFile(t *testing.T) {
 func TestUpdateFile(t *testing.T) {
 	// Create a directory with a simple .go file and an empty BUILD file.
 	tmpdir := os.Getenv("TEST_TMPDIR")
-	dir, err := ioutil.TempDir(tmpdir, "")
+	dir, err := os.MkdirTemp(tmpdir, "")
 	if err != nil {
-		t.Fatalf("ioutil.TempDir(%q, %q) failed with %v; want success", tmpdir, "", err)
+		t.Fatalf("os.MkdirTemp(%q, %q) failed with %v; want success", tmpdir, "", err)
 	}
 	defer os.RemoveAll(dir)
 
 	goFile := filepath.Join(dir, "main.go")
-	if err = ioutil.WriteFile(goFile, []byte("package main"), 0o600); err != nil {
+	if err = os.WriteFile(goFile, []byte("package main"), 0o600); err != nil {
 		t.Fatalf("error writing file %q: %v", goFile, err)
 	}
 
 	buildFile := filepath.Join(dir, "BUILD")
-	if err = ioutil.WriteFile(buildFile, nil, 0o600); err != nil {
+	if err = os.WriteFile(buildFile, nil, 0o600); err != nil {
 		t.Fatalf("error writing file %q: %v", buildFile, err)
 	}
 
@@ -165,19 +164,19 @@ func TestUpdateFile(t *testing.T) {
 func TestNoChanges(t *testing.T) {
 	// Create a directory with a BUILD file that doesn't need any changes.
 	tmpdir := os.Getenv("TEST_TMPDIR")
-	dir, err := ioutil.TempDir(tmpdir, "")
+	dir, err := os.MkdirTemp(tmpdir, "")
 	if err != nil {
-		t.Fatalf("ioutil.TempDir(%q, %q) failed with %v; want success", tmpdir, "", err)
+		t.Fatalf("os.MkdirTemp(%q, %q) failed with %v; want success", tmpdir, "", err)
 	}
 	defer os.RemoveAll(dir)
 
 	goFile := filepath.Join(dir, "main.go")
-	if err = ioutil.WriteFile(goFile, []byte("package main\n\nfunc main() {}"), 0o600); err != nil {
+	if err = os.WriteFile(goFile, []byte("package main\n\nfunc main() {}"), 0o600); err != nil {
 		t.Fatalf("error writing file %q: %v", goFile, err)
 	}
 
 	buildFile := filepath.Join(dir, "BUILD")
-	if err = ioutil.WriteFile(buildFile, []byte(`load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+	if err = os.WriteFile(buildFile, []byte(`load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
     name = "go_default_library",

cmd/gazelle/integration_test.go

@@ -22,8 +22,6 @@ package main
 import (
 	"bytes"
 	"flag"
-	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -211,7 +209,7 @@ go_library(
 	if err := runGazelle(dir, []string{"-go_prefix", "example.com/foo"}); err != nil {
 		t.Fatal(err)
 	}
-	if got, err := ioutil.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
+	if got, err := os.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
 		t.Fatal(err)
 	} else if string(got) != want {
 		t.Fatalf("got %s ; want %s", string(got), want)
@@ -310,7 +308,7 @@ go_library(
 			if err := runGazelle(dir, []string{c.cmd}); err != nil {
 				t.Fatal(err)
 			}
-			if got, err := ioutil.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
+			if got, err := os.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
 				t.Fatal(err)
 			} else if string(got) != c.want {
 				t.Fatalf("got %s ; want %s", string(got), c.want)
@@ -360,7 +358,7 @@ go_library(
 	if err := runGazelle(dir, []string{"fix", "-go_prefix", "example.com/foo"}); err != nil {
 		t.Fatal(err)
 	}
-	if got, err := ioutil.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
+	if got, err := os.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
 		t.Fatal(err)
 	} else if string(got) != want {
 		t.Fatalf("got %s ; want %s", string(got), want)
@@ -2038,7 +2036,7 @@ my_go_binary(
 `,
 		},
 		{
-			Path:    "enabled/multiple_mappings/multiple_mappings.go",
+			Path: "enabled/multiple_mappings/multiple_mappings.go",
 			Content: `
 package main
 
@@ -3046,7 +3044,7 @@ github.com/selvatico/go-mocket v1.0.7/go.mod h1:7bSWzuNieCdUlanCVu3w0ppS0LvDtPAZ
 	if err := runGazelle(dir, args); err == nil {
 		t.Fatal("expected error, got nil")
 	} else if err.Error() != errMsg {
-		t.Error(fmt.Sprintf("want %s, got %s", errMsg, err.Error()))
+		t.Errorf("want %s, got %s", errMsg, err.Error())
 	}
 }
 
@@ -4417,7 +4415,7 @@ go_library(
 	if err := runGazelle(dir, []string{"-go_prefix", "example.com/foo"}); err != nil {
 		t.Fatal(err)
 	}
-	if got, err := ioutil.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
+	if got, err := os.ReadFile(filepath.Join(dir, "BUILD")); err != nil {
 		t.Fatal(err)
 	} else if string(got) != want {
 		t.Fatalf("got %s ; want %s; diff %s", string(got), want, cmp.Diff(string(got), want))

cmd/generate_repo_config/generate_repo_config.go

@@ -28,7 +28,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -127,7 +126,7 @@ func generateRepoConfig(configDest, configSource string) ([]string, error) {
 
 	buf.WriteString("\n")
 	buf.Write(destFile.Format())
-	if err := ioutil.WriteFile(configDest, buf.Bytes(), 0o666); err != nil {
+	if err := os.WriteFile(configDest, buf.Bytes(), 0o666); err != nil {
 		return nil, err
 	}
 

cmd/move_labels/move_labels.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -64,7 +63,7 @@ func run(args []string) error {
 	var errs errorList
 	for _, file := range files {
 		content := build.Format(file)
-		if err := ioutil.WriteFile(file.Path, content, 0o666); err != nil {
+		if err := os.WriteFile(file.Path, content, 0o666); err != nil {
 			errs = append(errs, err)
 		}
 	}
@@ -90,7 +89,7 @@ func moveLabelsInDir(c *configuration) ([]*build.File, error) {
 		if name := info.Name(); name != "BUILD" && name != "BUILD.bazel" {
 			return nil
 		}
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			errors = append(errors, err)
 			return nil

config/config_test.go

@@ -17,7 +17,6 @@ package config
 
 import (
 	"flag"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -27,7 +26,7 @@ import (
 )
 
 func TestCommonConfigurerFlags(t *testing.T) {
-	dir, err := ioutil.TempDir(os.Getenv("TEST_TEMPDIR"), "config_test")
+	dir, err := os.MkdirTemp(os.Getenv("TEST_TEMPDIR"), "config_test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,7 +35,7 @@ func TestCommonConfigurerFlags(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(dir, "WORKSPACE"), nil, 0o666); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "WORKSPACE"), nil, 0o666); err != nil {
 		t.Fatal(err)
 	}
 

internal/go_repository_test.go

@@ -17,7 +17,6 @@ package bazel_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -188,7 +187,7 @@ func TestRepoCacheContainsGoEnv(t *testing.T) {
 		t.Fatal(err)
 	}
 	goEnvPath := filepath.Join(outputBase, "external/bazel_gazelle_go_repository_cache", "go.env")
-	gotBytes, err := ioutil.ReadFile(goEnvPath)
+	gotBytes, err := os.ReadFile(goEnvPath)
 	if err != nil {
 		t.Fatalf("could not read file %s: %v", goEnvPath, err)
 	}

internal/list_repository_tools_srcs.go

@@ -26,7 +26,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -98,11 +97,11 @@ func main() {
 	fmt.Fprintln(buf, "]")
 
 	if *generate != "" {
-		if err := ioutil.WriteFile(*generate, buf.Bytes(), 0o666); err != nil {
+		if err := os.WriteFile(*generate, buf.Bytes(), 0o666); err != nil {
 			log.Fatal(err)
 		}
 	} else {
-		got, err := ioutil.ReadFile(*check)
+		got, err := os.ReadFile(*check)
 		if err != nil {
 			log.Fatal(err)
 		}

internal/runner_test.go

@@ -16,20 +16,20 @@ limitations under the License.
 package bazel_test
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 	"testing"
 
 	"github.com/bazelbuild/rules_go/go/tools/bazel_testing"
 )
 
 func TestRunner(t *testing.T) {
-	origBuildData, err := ioutil.ReadFile("BUILD.bazel")
+	origBuildData, err := os.ReadFile("BUILD.bazel")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer func() {
-		if err := ioutil.WriteFile("BUILD.bazel", origBuildData, 0o666); err != nil {
+		if err := os.WriteFile("BUILD.bazel", origBuildData, 0o666); err != nil {
 			t.Fatalf("restoring build file: %v", err)
 		}
 	}()
@@ -54,12 +54,12 @@ func TestRunner(t *testing.T) {
 }
 
 func TestRunnerUpdateReposFromGoMod(t *testing.T) {
-	origWorkspaceData, err := ioutil.ReadFile("WORKSPACE")
+	origWorkspaceData, err := os.ReadFile("WORKSPACE")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer func() {
-		if err := ioutil.WriteFile("WORKSPACE", origWorkspaceData, 0o666); err != nil {
+		if err := os.WriteFile("WORKSPACE", origWorkspaceData, 0o666); err != nil {
 			t.Fatalf("restoring WORKSPACE: %v", err)
 		}
 	}()
@@ -70,12 +70,12 @@ func TestRunnerUpdateReposFromGoMod(t *testing.T) {
 }
 
 func TestRunnerUpdateReposCommand(t *testing.T) {
-	origWorkspaceData, err := ioutil.ReadFile("WORKSPACE")
+	origWorkspaceData, err := os.ReadFile("WORKSPACE")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer func() {
-		if err := ioutil.WriteFile("WORKSPACE", origWorkspaceData, 0o666); err != nil {
+		if err := os.WriteFile("WORKSPACE", origWorkspaceData, 0o666); err != nil {
 			t.Fatalf("restoring WORKSPACE: %v", err)
 		}
 	}()

internal/wspace/finder_test.go

@@ -1,8 +1,12 @@
-/* Copyright 2016 The Bazel Authors. All rights reserved.
+/*
+	Copyright 2016 The Bazel Authors. All rights reserved.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,14 +16,13 @@ limitations under the License.
 package wspace
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 )
 
 func TestFind(t *testing.T) {
-	tmp, err := ioutil.TempDir(os.Getenv("TEST_TEMPDIR"), "")
+	tmp, err := os.MkdirTemp(os.Getenv("TEST_TEMPDIR"), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -58,7 +61,7 @@ func TestFind(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				if err := ioutil.WriteFile(tc.file, nil, 0o755); err != nil {
+				if err := os.WriteFile(tc.file, nil, 0o755); err != nil {
 					t.Fatal(err)
 				}
 			}