From 8e8d474ae8a595f63ac8d7535b388b08ad1c0509 Mon Sep 17 00:00:00 2001 From: Dave Date: Sun, 30 Jul 2023 07:23:43 -0400 Subject: [PATCH] refactor: Remove remaining uses of depreciated package `io/ioutil` (#837) --- api/api_test.go | 7 +++---- api/openai/image.go | 3 +-- pkg/gallery/models_test.go | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/api/api_test.go b/api/api_test.go index 2947842e..c88002be 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "os" "path/filepath" @@ -45,7 +44,7 @@ func getModelStatus(url string) (response map[string]interface{}) { } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { fmt.Println("Error reading response body:", err) return @@ -97,7 +96,7 @@ func postModelApplyRequest(url string, request modelApplyRequest) (response map[ } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { fmt.Println("Error reading response body:", err) return @@ -153,7 +152,7 @@ var _ = Describe("API test", func() { } out, err := yaml.Marshal(g) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(filepath.Join(tmpdir, "gallery_simple.yaml"), out, 0644) + err = os.WriteFile(filepath.Join(tmpdir, "gallery_simple.yaml"), out, 0644) Expect(err).ToNot(HaveOccurred()) galleries := []gallery.Gallery{ diff --git a/api/openai/image.go b/api/openai/image.go index 8d0e7b8a..d5cf9f2b 100644 --- a/api/openai/image.go +++ b/api/openai/image.go @@ -4,7 +4,6 @@ import ( "encoding/base64" "encoding/json" "fmt" - "io/ioutil" "os" "path/filepath" "strconv" @@ -105,7 +104,7 @@ func ImageEndpoint(cm *config.ConfigLoader, o *options.Option) func(c *fiber.Ctx tempDir = o.ImageDir } // Create a temporary file - outputFile, err := ioutil.TempFile(tempDir, "b64") + outputFile, err := os.CreateTemp(tempDir, "b64") if err != nil { return err } diff --git a/pkg/gallery/models_test.go b/pkg/gallery/models_test.go index 9ea87a70..f454c611 100644 --- a/pkg/gallery/models_test.go +++ b/pkg/gallery/models_test.go @@ -1,7 +1,6 @@ package gallery_test import ( - "io/ioutil" "os" "path/filepath" @@ -50,7 +49,7 @@ var _ = Describe("Model test", func() { }} out, err := yaml.Marshal(gallery) Expect(err).ToNot(HaveOccurred()) - err = ioutil.WriteFile(filepath.Join(tempdir, "gallery_simple.yaml"), out, 0644) + err = os.WriteFile(filepath.Join(tempdir, "gallery_simple.yaml"), out, 0644) Expect(err).ToNot(HaveOccurred()) galleries := []Gallery{