ソースを参照

Merge pull request #43104 from kzys/no-ioutil

Remove io/ioutil again
Sebastiaan van Stijn 3 年 前
コミット
10aecb0e65
2 ファイル変更9 行追加3 行削除
  1. 1 2
      daemon/logger/local/read_test.go
  2. 8 1
      hack/validate/golangci-lint.yml

+ 1 - 2
daemon/logger/local/read_test.go

@@ -2,7 +2,6 @@ package local
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -23,7 +22,7 @@ func TestDecode(t *testing.T) {
 }
 
 func testDecode(t *testing.T, buf []byte, split int) {
-	fw, err := ioutil.TempFile("", t.Name())
+	fw, err := os.CreateTemp("", t.Name())
 	assert.NilError(t, err)
 	defer os.Remove(fw.Name())
 

+ 8 - 1
hack/validate/golangci-lint.yml

@@ -1,6 +1,7 @@
 linters:
   enable:
     - deadcode
+    - depguard
     - goimports
     - golint
     - gosec
@@ -31,7 +32,13 @@ linters:
 linters-settings:
   govet:
     check-shadowing: false
-
+  depguard:
+    list-type: blacklist
+    include-go-root: true
+    packages:
+      # The io/ioutil package has been deprecated.
+      # https://go.dev/doc/go1.16#ioutil
+      - io/ioutil
 issues:
   # The default exclusion rules are a bit too permissive, so copying the relevant ones below
   exclude-use-default: false