From f0d1af5ec5b9792e606d9a880994674e113977e0 Mon Sep 17 00:00:00 2001 From: Bastian Date: Thu, 25 Aug 2022 15:12:45 +0200 Subject: [PATCH 1/2] fix(command): remove ioutil --- command.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/command.go b/command.go index 40edf16..87bf46b 100644 --- a/command.go +++ b/command.go @@ -4,7 +4,7 @@ import ( // enable go:embed _ "embed" "fmt" - "io/ioutil" + "io" "log" "os" "path" @@ -68,15 +68,15 @@ func Generate(services []Service, basePath string, schemaBasePath string) error return fmt.Errorf("mkdir %q failed: %w", schemaBasePath, err) } - if err := ioutil.WriteFile(schemaPath, schema, 0644); err != nil { + if err := io.WriteFile(schemaPath, schema, 0644); err != nil { return fmt.Errorf("writefile %q failed: %w", schemaPath, err) } - if err := ioutil.WriteFile(path.Join(basePath, "module.go"), module, 0644); err != nil { + if err := io.WriteFile(path.Join(basePath, "module.go"), module, 0644); err != nil { return fmt.Errorf("writefile %q/module.go failed: %w", basePath, err) } - if err := ioutil.WriteFile(path.Join(basePath, "emptymodule.go"), emptyModule, 0644); err != nil { + if err := io.WriteFile(path.Join(basePath, "emptymodule.go"), emptyModule, 0644); err != nil { return fmt.Errorf("writefile %q/emptymodule.go failed: %w", basePath, err) } @@ -91,7 +91,7 @@ func Generate(services []Service, basePath string, schemaBasePath string) error fpath := path.Join(schemaBasePath, fname) log.Printf("Writing %s", fname) - if err := ioutil.WriteFile(fpath, service.Schema(), 0644); err != nil { + if err := io.WriteFile(fpath, service.Schema(), 0644); err != nil { return fmt.Errorf("writefile %q failed: %w", fpath, err) } cfg.SchemaFilename = append(cfg.SchemaFilename, fpath) @@ -139,7 +139,7 @@ func Generate(services []Service, basePath string, schemaBasePath string) error cfg.SkipModTidy = skipGoModTidy for _, filename := range cfg.SchemaFilename { - schemaRaw, err := ioutil.ReadFile(filename) + schemaRaw, err := io.ReadFile(filename) if err != nil { return fmt.Errorf("unable to open schema: %w", err) } From 2b4f132d5564c3489c4d314b8508916fecc15a72 Mon Sep 17 00:00:00 2001 From: Bastian Date: Thu, 25 Aug 2022 15:15:39 +0200 Subject: [PATCH 2/2] Update command.go --- command.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/command.go b/command.go index 87bf46b..3ce7da2 100644 --- a/command.go +++ b/command.go @@ -4,7 +4,6 @@ import ( // enable go:embed _ "embed" "fmt" - "io" "log" "os" "path" @@ -68,15 +67,15 @@ func Generate(services []Service, basePath string, schemaBasePath string) error return fmt.Errorf("mkdir %q failed: %w", schemaBasePath, err) } - if err := io.WriteFile(schemaPath, schema, 0644); err != nil { + if err := os.WriteFile(schemaPath, schema, 0644); err != nil { return fmt.Errorf("writefile %q failed: %w", schemaPath, err) } - if err := io.WriteFile(path.Join(basePath, "module.go"), module, 0644); err != nil { + if err := os.WriteFile(path.Join(basePath, "module.go"), module, 0644); err != nil { return fmt.Errorf("writefile %q/module.go failed: %w", basePath, err) } - if err := io.WriteFile(path.Join(basePath, "emptymodule.go"), emptyModule, 0644); err != nil { + if err := os.WriteFile(path.Join(basePath, "emptymodule.go"), emptyModule, 0644); err != nil { return fmt.Errorf("writefile %q/emptymodule.go failed: %w", basePath, err) } @@ -91,7 +90,7 @@ func Generate(services []Service, basePath string, schemaBasePath string) error fpath := path.Join(schemaBasePath, fname) log.Printf("Writing %s", fname) - if err := io.WriteFile(fpath, service.Schema(), 0644); err != nil { + if err := os.WriteFile(fpath, service.Schema(), 0644); err != nil { return fmt.Errorf("writefile %q failed: %w", fpath, err) } cfg.SchemaFilename = append(cfg.SchemaFilename, fpath) @@ -139,7 +138,7 @@ func Generate(services []Service, basePath string, schemaBasePath string) error cfg.SkipModTidy = skipGoModTidy for _, filename := range cfg.SchemaFilename { - schemaRaw, err := io.ReadFile(filename) + schemaRaw, err := os.ReadFile(filename) if err != nil { return fmt.Errorf("unable to open schema: %w", err) }