Merge pull request kubernetes#87245 from 928234269/fix_staticcheck

k8s-ci-robot · web-flow · commit f88f58cb7938 · 2020-01-17T12:15:18.000-08:00
fix staticcheck errors in pkg/volume/hostpath.
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -30,7 +30,6 @@ pkg/volume/csi
 pkg/volume/fc
 pkg/volume/flexvolume
 pkg/volume/flocker
-pkg/volume/hostpath
 pkg/volume/iscsi
 pkg/volume/local
 pkg/volume/portworx
diff --git a/pkg/volume/hostpath/host_path.go b/pkg/volume/hostpath/host_path.go
@@ -357,9 +357,8 @@ type hostPathTypeChecker interface {
 }
 
 type fileTypeChecker struct {
-	path   string
-	exists bool
-	hu     hostutil.HostUtils
+	path string
+	hu   hostutil.HostUtils
 }
 
 func (ftc *fileTypeChecker) Exists() bool {
diff --git a/pkg/volume/hostpath/host_path_test.go b/pkg/volume/hostpath/host_path_test.go
@@ -327,10 +327,10 @@ func setUp() error {
 	}
 
 	f, err := os.OpenFile("/tmp/ExistingFolder/foo", os.O_CREATE, os.FileMode(0644))
-	defer f.Close()
 	if err != nil {
 		return err
 	}
+	defer f.Close()
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -357,9 +357,8 @@ type hostPathTypeChecker interface {`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`type fileTypeChecker struct {`
`360`		`- path string`
`361`		`- exists bool`
`362`		`- hu hostutil.HostUtils`
	`360`	`+ path string`
	`361`	`+ hu hostutil.HostUtils`
`363`	`362`	`}`
`364`	`363`
`365`	`364`	`func (ftc *fileTypeChecker) Exists() bool {`
Original file line number	Diff line number	Diff line change
`@@ -327,10 +327,10 @@ func setUp() error {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`f, err := os.OpenFile("/tmp/ExistingFolder/foo", os.O_CREATE, os.FileMode(0644))`
`330`		`- defer f.Close()`
`331`	`330`	`if err != nil {`
`332`	`331`	`return err`
`333`	`332`	`}`
	`333`	`+ defer f.Close()`
`334`	`334`
`335`	`335`	`return nil`
`336`	`336`	`}`