Merge pull request #59 from ipld/ioutil

chore: replace deprecated ioutil with io/os
ipld · Sep 2, 2022 · 305fd37 · 305fd37
2 parents 941f417 + 7485b8d
commit 305fd37
Show file tree

Hide file tree

Showing 6 changed files with 963 additions and 969 deletions.
diff --git a/blueprints/base/services.go b/blueprints/base/services.go
@@ -29,7 +29,7 @@ var (
 	IOReadCloser       = &cg.GoRef{PkgPath: "io", Name: "ReadCloser"}
 	IOEOF              = &cg.GoRef{PkgPath: "io", Name: "EOF"}
 	IOErrUnexpectedEOF = &cg.GoRef{PkgPath: "io", Name: "ErrUnexpectedEOF"}
-	IOUtilReadAll      = &cg.GoRef{PkgPath: "io/ioutil", Name: "ReadAll"}
+	IOReadAll          = &cg.GoRef{PkgPath: "io", Name: "ReadAll"}
 )
 
 const EdelweissServicesPkg = services.PkgPath

diff --git a/blueprints/services/dagjson-over-http/server.go b/blueprints/services/dagjson-over-http/server.go
@@ -138,7 +138,7 @@ func (x GoServerImpl) GoDef() cg.Blueprint {
 		"HTTPResponseWriter": base.HTTPResponseWriter,
 		"IPLDDecode":         base.IPLDDecode,
 		"DAGJSONDecode":      base.DAGJSONDecode,
-		"IOUtilReadAll":      base.IOUtilReadAll,
+		"IOReadAll":          base.IOReadAll,
 		//
 		"Interface":    x.Ref.Append("_Server"),
 		"AsyncHandler": x.Ref.Append("_AsyncHandler"),
@@ -168,7 +168,7 @@ type {{.Interface}} interface {
 func {{.AsyncHandler}}(s {{.Interface}}) {{.HTTPHandlerFunc}} {
 	return func(writer {{.HTTPResponseWriter}}, request *{{.HTTPRequest}}) {
 		// parse request
-		msg, err := {{.IOUtilReadAll}}(request.Body)
+		msg, err := {{.IOReadAll}}(request.Body)
 		if err != nil {
 			{{.LoggerVar}}.Errorf("reading request body (%v)", err)
 			writer.WriteHeader(400)

diff --git a/codegen/file.go b/codegen/file.go
@@ -3,7 +3,6 @@ package codegen
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 )
@@ -28,7 +27,7 @@ func (f *GoFile) Build() error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(f.FilePath, body, 0644)
+	return os.WriteFile(f.FilePath, body, 0644)
 }
 
 func (f *GoFile) Generate() ([]byte, error) {