chore: clean up ioutil deprecated methods. (#118)

Signed-off-by: Lan Liang <gcslyp@gmail.com>
kcl-lang · Aug 23, 2024 · c0d1d0e · c0d1d0e
1 parent 2067204
commit c0d1d0e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/pkg/cmds/kcl-openapi.go b/pkg/cmds/kcl-openapi.go
@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -66,7 +66,7 @@ func Main() {
 		os.Exit(0)
 	}
 	opts.Quiet = func() {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 	}
 	opts.LogFile = func(logfile string) {
 		f, err := os.OpenFile(logfile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)

diff --git a/pkg/kube_resource/generator/assets/static/gen.go b/pkg/kube_resource/generator/assets/static/gen.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"fmt"
 	"go/format"
-	"io/ioutil"
+	"os"
 	"strings"
 	"unicode"
 )
@@ -26,7 +26,7 @@ func Generate() ([]byte, error) {
 	fmt.Fprintf(buf, "%v\n\n%v\n\npackage static\n\n", license, warning)
 	fmt.Fprintf(buf, "var Files = map[string]string{\n")
 	for _, fn := range files {
-		b, err := ioutil.ReadFile(fn)
+		b, err := os.ReadFile(fn)
 		if err != nil {
 			return b, err
 		}

diff --git a/pkg/kube_resource/generator/assets/static/makestatic.go b/pkg/kube_resource/generator/assets/static/makestatic.go
@@ -11,7 +11,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"kcl-lang.io/kcl-openapi/pkg/kube_resource/generator/assets/static"
@@ -29,7 +28,7 @@ func makestatic() error {
 	if err != nil {
 		return fmt.Errorf("error while generating static.go: %v\n", err)
 	}
-	err = ioutil.WriteFile("static.go", buf, 0666)
+	err = os.WriteFile("static.go", buf, 0666)
 	if err != nil {
 		return fmt.Errorf("error while writing static.go: %v\n", err)
 	}

diff --git a/pkg/swagger/generator/shared.go b/pkg/swagger/generator/shared.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -292,7 +291,7 @@ func (g *GenOpts) write(t *TemplateOpts, data interface{}) error {
 		formatted, err = g.LanguageOpts.FormatContent(filepath.Join(dir, fname), content)
 		if err != nil {
 			log.Printf("source formatting failed on template-generated source (%q for %s). Check that your template produces valid code", filepath.Join(dir, fname), t.Name)
-			writeerr = ioutil.WriteFile(filepath.Join(dir, fname), content, 0644)
+			writeerr = os.WriteFile(filepath.Join(dir, fname), content, 0644)
 			if writeerr != nil {
 				return fmt.Errorf("failed to write (unformatted) file %q in %q: %v", fname, dir, writeerr)
 			}
@@ -301,7 +300,7 @@ func (g *GenOpts) write(t *TemplateOpts, data interface{}) error {
 		}
 	}
 
-	writeerr = ioutil.WriteFile(filepath.Join(dir, fname), formatted, 0644)
+	writeerr = os.WriteFile(filepath.Join(dir, fname), formatted, 0644)
 	if writeerr != nil {
 		return fmt.Errorf("failed to write file %q in %q: %v", fname, dir, writeerr)
 	}