From 9a330d187142be5c1498c29e8523bdbbb148e39d Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Mon, 24 Nov 2025 15:36:21 -0600 Subject: [PATCH] Migrate away from deprecated ioutil --- pkg/build/controller/build/build_controller_test.go | 3 +-- pkg/image/controller/imagestream_controller_test.go | 5 ++--- pkg/template/controller/templateinstance_controller_test.go | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/build/controller/build/build_controller_test.go b/pkg/build/controller/build/build_controller_test.go index fff21030d..43745d415 100644 --- a/pkg/build/controller/build/build_controller_test.go +++ b/pkg/build/controller/build/build_controller_test.go @@ -3,7 +3,6 @@ package build import ( "context" "fmt" - "io/ioutil" "os" "reflect" "strings" @@ -1761,7 +1760,7 @@ func TestHandleControllerConfig(t *testing.T) { } // Ensure that the generated configuration is actually valid. - registriesConf, err := ioutil.TempFile("", "registries.conf") + registriesConf, err := os.CreateTemp("", "registries.conf") defer os.Remove(registriesConf.Name()) if err != nil { t.Errorf("unexpected error creating temp file: %s", err.Error()) diff --git a/pkg/image/controller/imagestream_controller_test.go b/pkg/image/controller/imagestream_controller_test.go index a2f6f7769..1f7c1e85e 100644 --- a/pkg/image/controller/imagestream_controller_test.go +++ b/pkg/image/controller/imagestream_controller_test.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "reflect" "strings" @@ -478,7 +477,7 @@ func objBody(object interface{}) io.ReadCloser { if err != nil { panic(err) } - return ioutil.NopCloser(bytes.NewReader([]byte(output))) + return io.NopCloser(bytes.NewReader([]byte(output))) } func header() http.Header { @@ -488,7 +487,7 @@ func header() http.Header { } func decode(reader io.ReadCloser, decoder runtime.Decoder) (runtime.Object, error) { - data, err := ioutil.ReadAll(reader) + data, err := io.ReadAll(reader) if err != nil { return nil, err } diff --git a/pkg/template/controller/templateinstance_controller_test.go b/pkg/template/controller/templateinstance_controller_test.go index 9c779b2ad..9c20083c5 100644 --- a/pkg/template/controller/templateinstance_controller_test.go +++ b/pkg/template/controller/templateinstance_controller_test.go @@ -3,7 +3,7 @@ package controller import ( "bytes" "encoding/json" - "io/ioutil" + "io" "net/http" "testing" "time" @@ -72,7 +72,7 @@ func TestControllerCheckReadiness(t *testing.T) { } return &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(bytes.NewBuffer(b)), + Body: io.NopCloser(bytes.NewBuffer(b)), }, nil }) },