Skip to content

Commit 511af59

Browse files
authored
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
1 parent 756ba6d commit 511af59

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

doc/man_docs_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"bufio"
1919
"bytes"
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"strings"
@@ -168,7 +167,7 @@ func TestManPrintFlagsHidesShortDeprecated(t *testing.T) {
168167
func TestGenManTree(t *testing.T) {
169168
c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"}
170169
header := &GenManHeader{Section: "2"}
171-
tmpdir, err := ioutil.TempDir("", "test-gen-man-tree")
170+
tmpdir, err := os.MkdirTemp("", "test-gen-man-tree")
172171
if err != nil {
173172
t.Fatalf("Failed to create tmpdir: %s", err.Error())
174173
}
@@ -219,7 +218,7 @@ func assertNextLineEquals(scanner *bufio.Scanner, expectedLine string) error {
219218
}
220219

221220
func BenchmarkGenManToFile(b *testing.B) {
222-
file, err := ioutil.TempFile("", "")
221+
file, err := os.CreateTemp("", "")
223222
if err != nil {
224223
b.Fatal(err)
225224
}

doc/md_docs_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package doc
1616

1717
import (
1818
"bytes"
19-
"io/ioutil"
2019
"os"
2120
"path/filepath"
2221
"testing"
@@ -94,7 +93,7 @@ func TestGenMdNoTag(t *testing.T) {
9493

9594
func TestGenMdTree(t *testing.T) {
9695
c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"}
97-
tmpdir, err := ioutil.TempDir("", "test-gen-md-tree")
96+
tmpdir, err := os.MkdirTemp("", "test-gen-md-tree")
9897
if err != nil {
9998
t.Fatalf("Failed to create tmpdir: %v", err)
10099
}
@@ -110,7 +109,7 @@ func TestGenMdTree(t *testing.T) {
110109
}
111110

112111
func BenchmarkGenMarkdownToFile(b *testing.B) {
113-
file, err := ioutil.TempFile("", "")
112+
file, err := os.CreateTemp("", "")
114113
if err != nil {
115114
b.Fatal(err)
116115
}

doc/rest_docs_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package doc
1616

1717
import (
1818
"bytes"
19-
"io/ioutil"
2019
"os"
2120
"path/filepath"
2221
"testing"
@@ -81,7 +80,7 @@ func TestGenRSTNoTag(t *testing.T) {
8180
func TestGenRSTTree(t *testing.T) {
8281
c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"}
8382

84-
tmpdir, err := ioutil.TempDir("", "test-gen-rst-tree")
83+
tmpdir, err := os.MkdirTemp("", "test-gen-rst-tree")
8584
if err != nil {
8685
t.Fatalf("Failed to create tmpdir: %s", err.Error())
8786
}
@@ -97,7 +96,7 @@ func TestGenRSTTree(t *testing.T) {
9796
}
9897

9998
func BenchmarkGenReSTToFile(b *testing.B) {
100-
file, err := ioutil.TempFile("", "")
99+
file, err := os.CreateTemp("", "")
101100
if err != nil {
102101
b.Fatal(err)
103102
}

doc/yaml_docs_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package doc
1717
import (
1818
"bytes"
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"path/filepath"
2322
"testing"
@@ -58,7 +57,7 @@ func TestGenYamlNoTag(t *testing.T) {
5857
func TestGenYamlTree(t *testing.T) {
5958
c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"}
6059

61-
tmpdir, err := ioutil.TempDir("", "test-gen-yaml-tree")
60+
tmpdir, err := os.MkdirTemp("", "test-gen-yaml-tree")
6261
if err != nil {
6362
t.Fatalf("Failed to create tmpdir: %s", err.Error())
6463
}
@@ -85,7 +84,7 @@ func TestGenYamlDocRunnable(t *testing.T) {
8584
}
8685

8786
func BenchmarkGenYamlToFile(b *testing.B) {
88-
file, err := ioutil.TempFile("", "")
87+
file, err := os.CreateTemp("", "")
8988
if err != nil {
9089
b.Fatal(err)
9190
}

site/content/docgen/md.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ package main
3535

3636
import (
3737
"log"
38-
"io/ioutil"
38+
"io"
3939
"os"
4040

4141
"k8s.io/kubernetes/pkg/kubectl/cmd"
@@ -45,7 +45,7 @@ import (
4545
)
4646

4747
func main() {
48-
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard)
48+
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard)
4949
err := doc.GenMarkdownTree(kubectl, "./")
5050
if err != nil {
5151
log.Fatal(err)

site/content/docgen/rest.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ package main
3535

3636
import (
3737
"log"
38-
"io/ioutil"
38+
"io"
3939
"os"
4040

4141
"k8s.io/kubernetes/pkg/kubectl/cmd"
@@ -45,7 +45,7 @@ import (
4545
)
4646

4747
func main() {
48-
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard)
48+
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard)
4949
err := doc.GenReSTTree(kubectl, "./")
5050
if err != nil {
5151
log.Fatal(err)

site/content/docgen/yaml.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This program can actually generate docs for the kubectl command in the kubernete
3434
package main
3535

3636
import (
37-
"io/ioutil"
37+
"io"
3838
"log"
3939
"os"
4040

@@ -45,7 +45,7 @@ import (
4545
)
4646

4747
func main() {
48-
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard)
48+
kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, io.Discard, io.Discard)
4949
err := doc.GenYamlTree(kubectl, "./")
5050
if err != nil {
5151
log.Fatal(err)

0 commit comments

Comments
 (0)