From 7d6ee74e62f9930fc2fab1f727ed89d068d06761 Mon Sep 17 00:00:00 2001
From: Nick Santos <nick@tilt.dev>
Date: Fri, 12 Aug 2022 16:17:41 -0400
Subject: [PATCH] cleanup deprecated ioutil functions (#5919)

Signed-off-by: Nick Santos <nick.santos@docker.com>

Signed-off-by: Nick Santos <nick.santos@docker.com>
---
 pkg/watch/notify_test.go | 11 +++++------
 pkg/watch/temp.go        |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkg/watch/notify_test.go b/pkg/watch/notify_test.go
index bdc0d9d12..1834a1ae6 100644
--- a/pkg/watch/notify_test.go
+++ b/pkg/watch/notify_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -72,7 +71,7 @@ func TestEventOrdering(t *testing.T) {
 	for i, dir := range dirs {
 		base := fmt.Sprintf("%d.txt", i)
 		p := filepath.Join(dir, base)
-		err := ioutil.WriteFile(p, []byte(base), os.FileMode(0777))
+		err := os.WriteFile(p, []byte(base), os.FileMode(0777))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -237,7 +236,7 @@ func TestRemoveAndAddBack(t *testing.T) {
 	path := filepath.Join(f.paths[0], "change")
 
 	d1 := []byte("hello\ngo\n")
-	err := ioutil.WriteFile(path, d1, 0644)
+	err := os.WriteFile(path, d1, 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -252,7 +251,7 @@ func TestRemoveAndAddBack(t *testing.T) {
 	f.assertEvents(path)
 	f.events = nil
 
-	err = ioutil.WriteFile(path, d1, 0644)
+	err = os.WriteFile(path, d1, 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -273,7 +272,7 @@ func TestSingleFile(t *testing.T) {
 	f.fsync()
 
 	d2 := []byte("hello\nworld\n")
-	err := ioutil.WriteFile(path, d2, 0644)
+	err := os.WriteFile(path, d2, 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -303,7 +302,7 @@ func TestWriteGoodLink(t *testing.T) {
 	f := newNotifyFixture(t)
 
 	goodFile := filepath.Join(f.paths[0], "goodFile")
-	err := ioutil.WriteFile(goodFile, []byte("hello"), 0644)
+	err := os.WriteFile(goodFile, []byte("hello"), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/watch/temp.go b/pkg/watch/temp.go
index 1573edf94..d6b094aaa 100644
--- a/pkg/watch/temp.go
+++ b/pkg/watch/temp.go
@@ -1,7 +1,6 @@
 package watch
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -18,7 +17,7 @@ func NewDir(prefix string) (*TempDir, error) {
 
 // NewDir creates a new TempDir at the given root.
 func NewDirAtRoot(root, prefix string) (*TempDir, error) {
-	tmpDir, err := ioutil.TempDir(root, prefix)
+	tmpDir, err := os.MkdirTemp(root, prefix)
 	if err != nil {
 		return nil, err
 	}
@@ -42,7 +41,7 @@ func NewDirAtSlashTmp(prefix string) (*TempDir, error) {
 
 // d.NewDir creates a new TempDir under d
 func (d *TempDir) NewDir(prefix string) (*TempDir, error) {
-	d2, err := ioutil.TempDir(d.dir, prefix)
+	d2, err := os.MkdirTemp(d.dir, prefix)
 	if err != nil {
 		return nil, err
 	}