From 74de2621c33b7b3fd3b08e7c0acc717283796b28 Mon Sep 17 00:00:00 2001
From: Tristan Swadell <tswadell@google.com>
Date: Thu, 6 Jun 2024 07:28:53 -0700
Subject: [PATCH] Remove deprecated ioutil (#957)

---
 cel/cel_test.go   | 12 ++++++------
 repl/evaluator.go |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cel/cel_test.go b/cel/cel_test.go
index 3f6f790b..261f97be 100644
--- a/cel/cel_test.go
+++ b/cel/cel_test.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"reflect"
 	"strings"
 	"sync"
@@ -416,7 +416,7 @@ func TestCustomTypes(t *testing.T) {
 }
 
 func TestTypeIsolation(t *testing.T) {
-	b, err := ioutil.ReadFile("testdata/team.fds")
+	b, err := os.ReadFile("testdata/team.fds")
 	if err != nil {
 		t.Fatal("can't read fds file: ", err)
 	}
@@ -441,9 +441,9 @@ func TestTypeIsolation(t *testing.T) {
 }
 
 func TestDynamicProto(t *testing.T) {
-	b, err := ioutil.ReadFile("testdata/team.fds")
+	b, err := os.ReadFile("testdata/team.fds")
 	if err != nil {
-		t.Fatalf("ioutil.ReadFile() failed: %v", err)
+		t.Fatalf("os.ReadFile() failed: %v", err)
 	}
 	var fds descpb.FileDescriptorSet
 	if err = proto.Unmarshal(b, &fds); err != nil {
@@ -496,9 +496,9 @@ func TestDynamicProto(t *testing.T) {
 }
 
 func TestDynamicProtoFileDescriptors(t *testing.T) {
-	b, err := ioutil.ReadFile("testdata/team.fds")
+	b, err := os.ReadFile("testdata/team.fds")
 	if err != nil {
-		t.Fatalf("ioutil.ReadFile() failed: %v", err)
+		t.Fatalf("os.ReadFile() failed: %v", err)
 	}
 	var fds descpb.FileDescriptorSet
 	if err = proto.Unmarshal(b, &fds); err != nil {
diff --git a/repl/evaluator.go b/repl/evaluator.go
index c77775d5..4e1aeb9d 100644
--- a/repl/evaluator.go
+++ b/repl/evaluator.go
@@ -18,7 +18,7 @@ package repl
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/google/cel-go/cel"
@@ -816,7 +816,7 @@ func (e *Evaluator) loadExtensionOptionType(extType string) error {
 }
 
 func loadFileDescriptorSet(path string, textfmt bool) (*descpb.FileDescriptorSet, error) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}