Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#111 from shiftstack/merge-bot-master
Browse files Browse the repository at this point in the history
  • Loading branch information
openshift-merge-robot authored Mar 9, 2023
2 parents a1f1089 + 7edc1b9 commit 984dbc9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ jobs:
name: Go Lint
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@master
- name: Set up Go 1.x
uses: actions/setup-go@v3
with:
go-version: ^1.19
- uses: actions/checkout@master
- name: Run linter
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.45
version: v1.51
args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,contextcheck --timeout=30m0s
verify-helm:
name: Verify Helm
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubernetes-csi/csi-driver-nfs

go 1.18
go 1.19

require (
github.com/container-storage-interface/spec v1.5.0
Expand Down
3 changes: 1 addition & 2 deletions pkg/nfs/nfs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package nfs

import (
"io/ioutil"
"os"
"path/filepath"
"testing"
Expand Down Expand Up @@ -65,7 +64,7 @@ func TestNewFakeDriver(t *testing.T) {
}

func TestIsCorruptedDir(t *testing.T) {
existingMountPath, err := ioutil.TempDir(os.TempDir(), "csi-mount-test")
existingMountPath, err := os.MkdirTemp(os.TempDir(), "csi-mount-test")
if err != nil {
t.Fatalf("failed to create tmp dir: %v", err)
}
Expand Down
5 changes: 2 additions & 3 deletions release-tools/filter-junit.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ package main
import (
"encoding/xml"
"flag"
"io/ioutil"
"os"
"regexp"
)
Expand Down Expand Up @@ -96,7 +95,7 @@ func main() {
}
} else {
var err error
data, err = ioutil.ReadFile(input)
data, err = os.ReadFile(input)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -143,7 +142,7 @@ func main() {
panic(err)
}
} else {
if err := ioutil.WriteFile(*output, data, 0644); err != nil {
if err := os.WriteFile(*output, data, 0644); err != nil {
panic(err)
}
}
Expand Down

0 comments on commit 984dbc9

Please sign in to comment.