From 511af59cb3602540a636d8f5ed52f09e60804ce1 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Sat, 24 Aug 2024 14:05:26 +0300 Subject: [PATCH] Replace deprecated ioutil usage (#2181) Fixing golangci-lint errors[1]: Error: SA1019: "io/ioutil" has been deprecated since Go 1.19: As of Go 1.16, the same functionality is now provided by package [io] or package [os], and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck) [1] https://github.com/spf13/cobra/actions/runs/10535452454/job/29194442289?pr=2180 --- doc/man_docs_test.go | 5 ++--- doc/md_docs_test.go | 5 ++--- doc/rest_docs_test.go | 5 ++--- doc/yaml_docs_test.go | 5 ++--- site/content/docgen/md.md | 4 ++-- site/content/docgen/rest.md | 4 ++-- site/content/docgen/yaml.md | 4 ++-- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/doc/man_docs_test.go b/doc/man_docs_test.go index a4435e6e..dfa5e16f 100644 --- a/doc/man_docs_test.go +++ b/doc/man_docs_test.go @@ -18,7 +18,6 @@ import ( "bufio" "bytes" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -168,7 +167,7 @@ func TestManPrintFlagsHidesShortDeprecated(t *testing.T) { func TestGenManTree(t *testing.T) { c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"} header := &GenManHeader{Section: "2"} - tmpdir, err := ioutil.TempDir("", "test-gen-man-tree") + tmpdir, err := os.MkdirTemp("", "test-gen-man-tree") if err != nil { t.Fatalf("Failed to create tmpdir: %s", err.Error()) } @@ -219,7 +218,7 @@ func assertNextLineEquals(scanner *bufio.Scanner, expectedLine string) error { } func BenchmarkGenManToFile(b *testing.B) { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { b.Fatal(err) } diff --git a/doc/md_docs_test.go b/doc/md_docs_test.go index e70cad82..1bf13aba 100644 --- a/doc/md_docs_test.go +++ b/doc/md_docs_test.go @@ -16,7 +16,6 @@ package doc import ( "bytes" - "io/ioutil" "os" "path/filepath" "testing" @@ -94,7 +93,7 @@ func TestGenMdNoTag(t *testing.T) { func TestGenMdTree(t *testing.T) { c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"} - tmpdir, err := ioutil.TempDir("", "test-gen-md-tree") + tmpdir, err := os.MkdirTemp("", "test-gen-md-tree") if err != nil { t.Fatalf("Failed to create tmpdir: %v", err) } @@ -110,7 +109,7 @@ func TestGenMdTree(t *testing.T) { } func BenchmarkGenMarkdownToFile(b *testing.B) { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { b.Fatal(err) } diff --git a/doc/rest_docs_test.go b/doc/rest_docs_test.go index 1a3ea9dd..c0b10cc9 100644 --- a/doc/rest_docs_test.go +++ b/doc/rest_docs_test.go @@ -16,7 +16,6 @@ package doc import ( "bytes" - "io/ioutil" "os" "path/filepath" "testing" @@ -81,7 +80,7 @@ func TestGenRSTNoTag(t *testing.T) { func TestGenRSTTree(t *testing.T) { c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"} - tmpdir, err := ioutil.TempDir("", "test-gen-rst-tree") + tmpdir, err := os.MkdirTemp("", "test-gen-rst-tree") if err != nil { t.Fatalf("Failed to create tmpdir: %s", err.Error()) } @@ -97,7 +96,7 @@ func TestGenRSTTree(t *testing.T) { } func BenchmarkGenReSTToFile(b *testing.B) { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { b.Fatal(err) } diff --git a/doc/yaml_docs_test.go b/doc/yaml_docs_test.go index 1a6fa7c3..ddd4e24e 100644 --- a/doc/yaml_docs_test.go +++ b/doc/yaml_docs_test.go @@ -17,7 +17,6 @@ package doc import ( "bytes" "fmt" - "io/ioutil" "os" "path/filepath" "testing" @@ -58,7 +57,7 @@ func TestGenYamlNoTag(t *testing.T) { func TestGenYamlTree(t *testing.T) { c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"} - tmpdir, err := ioutil.TempDir("", "test-gen-yaml-tree") + tmpdir, err := os.MkdirTemp("", "test-gen-yaml-tree") if err != nil { t.Fatalf("Failed to create tmpdir: %s", err.Error()) } @@ -85,7 +84,7 @@ func TestGenYamlDocRunnable(t *testing.T) { } func BenchmarkGenYamlToFile(b *testing.B) { - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { b.Fatal(err) } diff --git a/site/content/docgen/md.md b/site/content/docgen/md.md index 1659175c..16af9164 100644 --- a/site/content/docgen/md.md +++ b/site/content/docgen/md.md @@ -35,7 +35,7 @@ package main import ( "log" - "io/ioutil" + "io" "os" "k8s.io/kubernetes/pkg/kubectl/cmd" @@ -45,7 +45,7 @@ import ( ) func main() { - kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard) + kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard) err := doc.GenMarkdownTree(kubectl, "./") if err != nil { log.Fatal(err) diff --git a/site/content/docgen/rest.md b/site/content/docgen/rest.md index 3041c573..c17f2b06 100644 --- a/site/content/docgen/rest.md +++ b/site/content/docgen/rest.md @@ -35,7 +35,7 @@ package main import ( "log" - "io/ioutil" + "io" "os" "k8s.io/kubernetes/pkg/kubectl/cmd" @@ -45,7 +45,7 @@ import ( ) func main() { - kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard) + kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard) err := doc.GenReSTTree(kubectl, "./") if err != nil { log.Fatal(err) diff --git a/site/content/docgen/yaml.md b/site/content/docgen/yaml.md index 172e61d1..d1912fe4 100644 --- a/site/content/docgen/yaml.md +++ b/site/content/docgen/yaml.md @@ -34,7 +34,7 @@ This program can actually generate docs for the kubectl command in the kubernete package main import ( - "io/ioutil" + "io" "log" "os" @@ -45,7 +45,7 @@ import ( ) func main() { - kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard) + kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard) err := doc.GenYamlTree(kubectl, "./") if err != nil { log.Fatal(err)