Skip to content

Commit

Permalink
Update golangci-lint and config
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert committed Jan 24, 2025
1 parent 333b1b8 commit 2536227
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 224 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
with:
version: v1.62
version: v1.63
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ linters:
- errname
- errorlint
- exhaustive
- exptostd
- fatcontext
- forcetypeassert
- gci
Expand Down Expand Up @@ -70,6 +71,7 @@ linters:
- musttag
- nakedret
- nilerr
- nilnesserr
- noctx
- nolintlint
- nosprintfhostport
Expand Down Expand Up @@ -97,6 +99,7 @@ linters:
- unparam
- unused
- usestdlibvars
- usetesting
- wastedassign
- whitespace
- zerologlint
Expand Down
4 changes: 2 additions & 2 deletions cmd/schedule-builder/cmd/markdown_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,11 @@ func TestUpdatePatchSchedule(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
scheduleFile, err := os.CreateTemp("", "schedule-")
scheduleFile, err := os.CreateTemp(t.TempDir(), "schedule-")
require.NoError(t, err)
require.NoError(t, scheduleFile.Close())

eolFile, err := os.CreateTemp("", "eol-")
eolFile, err := os.CreateTemp(t.TempDir(), "eol-")
require.NoError(t, err)
require.NoError(t, eolFile.Close())

Expand Down
6 changes: 2 additions & 4 deletions cmd/schedule-builder/cmd/root_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,11 @@ func TestRun(t *testing.T) {
for tcCount, tc := range testcases {
t.Logf("Test case: %s", tc.name)

tempDir, err := os.MkdirTemp("/tmp", "schedule-test")
require.NoError(t, err)
tempDir := t.TempDir()

tc.options.outputFile = fmt.Sprintf("%s/output-%d.md", tempDir, tcCount)

err = run(tc.options)
err := run(tc.options)
tc.expect(err, tc.options.outputFile)
require.NoError(t, os.RemoveAll(tempDir))
}
}
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ dependencies:

# golangci-lint-version
- name: "golangci-lint"
version: v1.62
version: v1.63
refPaths:
- path: .github/workflows/lint.yml
match: "version: v\\d+.\\d+?\\.?(\\d+)?"
Expand Down
2 changes: 1 addition & 1 deletion pkg/binary/binary_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func GetTestHeaders() []TestHeader {

// writeTestBinary Writes a test binary and returns the path.
func writeTestBinary(t *testing.T, base64Data string) *os.File {
f, err := os.CreateTemp("", "test-binary-")
f, err := os.CreateTemp(t.TempDir(), "test-binary-")
require.NoError(t, err)

binData, err := base64.StdEncoding.DecodeString(base64Data)
Expand Down
2 changes: 1 addition & 1 deletion pkg/binary/binary_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

func TestContainsString(t *testing.T) {
tmpfile, err := os.CreateTemp("", "")
tmpfile, err := os.CreateTemp(t.TempDir(), "")
require.NoError(t, err)
defer os.Remove(tmpfile.Name())

Expand Down
18 changes: 5 additions & 13 deletions pkg/notes/document/document_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ const (

func TestFileMetadata(t *testing.T) {
// Given
dir, err := os.MkdirTemp("", "")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

for _, file := range []string{
"kubernetes-client-darwin-386.tar.gz",
Expand Down Expand Up @@ -146,9 +144,7 @@ func TestDocument_RenderMarkdownTemplateFailure(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
dir, err := os.MkdirTemp("", "")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

if tt.templateExist {
fileName := strings.Split(tt.templateSpec, ":")[1]
Expand All @@ -159,17 +155,15 @@ func TestDocument_RenderMarkdownTemplateFailure(t *testing.T) {
}

doc := Document{}
_, err = doc.RenderMarkdownTemplate("", "", "", tt.templateSpec)
_, err := doc.RenderMarkdownTemplate("", "", "", tt.templateSpec)
require.Error(t, err, "Unexpected success")
})
}
}

func TestCreateDownloadsTable(t *testing.T) {
// Given
dir, err := os.MkdirTemp("", "")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
setupTestDir(t, dir)

// When
Expand Down Expand Up @@ -529,9 +523,7 @@ func TestDocument_RenderMarkdownTemplate(t *testing.T) {
templateSpec := tt.templateSpec
var dir string
if tt.hasDownloads || tt.userTemplate {
dir, err = os.MkdirTemp("", "")
require.NoError(t, err, "Creating tmpDir")
defer os.RemoveAll(dir)
dir = t.TempDir()

setupTestDir(t, dir)

Expand Down
6 changes: 2 additions & 4 deletions pkg/notes/options/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,14 @@ func newTestOptions(t *testing.T) *testOptions {
// First commit
func newTestRepo(t *testing.T) *testRepo {
// Setup the bare repo as base
bareTempDir, err := os.MkdirTemp("", "k8s-test-bare-")
require.NoError(t, err)
bareTempDir := t.TempDir()

bareRepo, err := git.PlainInit(bareTempDir, true)
require.NoError(t, err)
require.NotNil(t, bareRepo)

// Clone from the bare to be able to add our test data
cloneTempDir, err := os.MkdirTemp("", "k8s-test-clone-")
require.NoError(t, err)
cloneTempDir := t.TempDir()
cloneRepo, err := git.PlainInit(cloneTempDir, false)
require.NoError(t, err)

Expand Down
15 changes: 3 additions & 12 deletions pkg/release/images_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,7 @@ func TestPublish(t *testing.T) {
{
name: "failure no images-path",
prepare: func(*releasefakes.FakeImageImpl) (string, func()) {
tempDir, err := os.MkdirTemp("", "publish-test-")
require.NoError(t, err)
return tempDir, func() {
require.NoError(t, os.RemoveAll(tempDir))
}
return t.TempDir(), func() {}
},
shouldError: true,
},
Expand Down Expand Up @@ -339,11 +335,7 @@ func TestValidate(t *testing.T) {
},
{ // failure no images-path
prepare: func(*releasefakes.FakeImageImpl) (string, func()) {
tempDir, err := os.MkdirTemp("", "publish-test-")
require.NoError(t, err)
return tempDir, func() {
require.NoError(t, os.RemoveAll(tempDir))
}
return t.TempDir(), func() {}
},
shouldError: true,
},
Expand Down Expand Up @@ -391,8 +383,7 @@ func TestValidate(t *testing.T) {
}

func newImagesPath(t *testing.T) string {
tempDir, err := os.MkdirTemp("", "publish-test-")
require.NoError(t, err)
tempDir := t.TempDir()

require.NoError(t, os.MkdirAll(
filepath.Join(tempDir, release.ImagesPath),
Expand Down
8 changes: 2 additions & 6 deletions pkg/release/provenance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ import (

func TestGetBuildSubjects(t *testing.T) {
// create a test dir with stuff
dir, err := os.MkdirTemp("", "provenance-test-")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
require.NoError(t, os.Mkdir(filepath.Join(dir, ImagesPath), os.FileMode(0o755)))

testFiles := map[string]struct {
Expand Down Expand Up @@ -80,9 +78,7 @@ func TestGetBuildSubjects(t *testing.T) {

func TestGetStagingSubjects(t *testing.T) {
// create a test dir with stuff
dir, err := os.MkdirTemp("", "provenance-test-")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
require.NoError(t, os.Mkdir(filepath.Join(dir, "second"), os.FileMode(0o755)))

testFiles := map[string]struct {
Expand Down
Loading

0 comments on commit 2536227

Please sign in to comment.