From 6e32805729f5ce3cf1e13594ba789d90fd81dc80 Mon Sep 17 00:00:00 2001 From: inosato Date: Sat, 30 Jul 2022 21:03:36 +0900 Subject: [PATCH] Remove ioutil from code-generator Signed-off-by: inosato --- .../cmd/applyconfiguration-gen/generators/openapi.go | 4 ++-- .../code-generator/cmd/go-to-protobuf/protobuf/parser.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go index 8ad14fe3c1d..940926f3456 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go @@ -19,7 +19,7 @@ package generators import ( "encoding/json" "fmt" - "io/ioutil" + "os" "strings" openapiv2 "github.com/google/gnostic/openapiv2" @@ -42,7 +42,7 @@ func newTypeModels(openAPISchemaFilePath string, pkgTypes map[string]*types.Pack return emptyModels, nil // No Extract() functions will be generated. } - rawOpenAPISchema, err := ioutil.ReadFile(openAPISchemaFilePath) + rawOpenAPISchema, err := os.ReadFile(openAPISchemaFilePath) if err != nil { return nil, fmt.Errorf("failed to read openapi-schema file: %w", err) } diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go index c0238be8c28..1d27f958068 100644 --- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go +++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/parser.go @@ -25,7 +25,6 @@ import ( "go/parser" "go/printer" "go/token" - "io/ioutil" "os" "reflect" "strings" @@ -35,7 +34,7 @@ import ( func rewriteFile(name string, header []byte, rewriteFn func(*token.FileSet, *ast.File) error) error { fset := token.NewFileSet() - src, err := ioutil.ReadFile(name) + src, err := os.ReadFile(name) if err != nil { return err }