Skip to content

Commit

Permalink
chore(deps): update dependency golangci/golangci-lint to v1.59.1 (#2947)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency golangci/golangci-lint to v1.59.1

* chore(aqua): update aqua/aqua-checksums.json

* refactor: fix a lint error

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: aquaproj-aqua-releaser[bot] <95135029+aquaproj-aqua-releaser[bot]@users.noreply.github.com>
Co-authored-by: Shunsuke Suzuki <[email protected]>
Co-authored-by: Shunsuke Suzuki <[email protected]>
  • Loading branch information
4 people authored Jun 16, 2024
1 parent 3e51c0d commit 833d8dd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
run:
skip-files:
issues:
exclude-files:
- "mock\\.go$"
- "mock_[^/]*\\.go$"
linters:
Expand Down
24 changes: 12 additions & 12 deletions aqua/aqua-checksums.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"checksums": [
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-darwin-amd64.tar.gz",
"checksum": "418ACF7E255DDC0783E97129C9B03D9311B77826A5311D425A01C708A86417E7",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-darwin-amd64.tar.gz",
"checksum": "2F945063394A489C0037F0369C0CE21BC007565C08F90B924A35F4C04721CBC0",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-darwin-arm64.tar.gz",
"checksum": "5F6A1D95A6DD69F6E328EB56DD311A38E04CFAB79A1305FBF4957F4E203F47B6",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-darwin-arm64.tar.gz",
"checksum": "16EC8A86974DDEBD466A5CC071BB9F44D06D2A1F4BF93D13FBCB59E1704EDB39",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-linux-amd64.tar.gz",
"checksum": "3B14A439F33C4FFF83DBE0349950D984042B9A1FEB6C62F82787B598FC3AB5F4",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz",
"checksum": "C30696F1292CFF8778A495400745F0F9C0406A3F38D8BB12CEF48D599F6C7791",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-linux-arm64.tar.gz",
"checksum": "C57E6C0B0FA03089A2611DCEDDD5BC5D206716CCCDFF8B149DA8BAAC598719A1",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-linux-arm64.tar.gz",
"checksum": "8264507B560AE89DD080D5A0C7198CA5198E2B45F937A1F7FD873A8BAA8E0B8F",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-windows-amd64.zip",
"checksum": "3317D8A87A99A49A0A1321D295C010790E6DBF43EE96B318F4B8BB23EAE7A565",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-windows-amd64.zip",
"checksum": "82EB91E8E3CBBC987D8BB5684CAAAA12AEB39479135BEA90D2805512233F4741",
"algorithm": "sha256"
},
{
"id": "github_release/github.com/golangci/golangci-lint/v1.59.0/golangci-lint-1.59.0-windows-arm64.zip",
"checksum": "B3AF955C7FCEAC8220A36FC799E1B3F19D3B247D32F422CAAC5F9845DF8F7316",
"id": "github_release/github.com/golangci/golangci-lint/v1.59.1/golangci-lint-1.59.1-windows-arm64.zip",
"checksum": "5DEAAF959E415DF9F610059923B0AE40413FE3A5602C493BB84EC57581594901",
"algorithm": "sha256"
},
{
Expand Down
2 changes: 1 addition & 1 deletion aqua/imports/golangci-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packages:
- name: golangci/[email protected].0
- name: golangci/[email protected].1
7 changes: 2 additions & 5 deletions pkg/config-reader/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@ func (r *ConfigReader) Read(logE *logrus.Entry, configFilePath string, cfg *aqua
rgst.Path = osfile.Abs(configFileDir, rgst.Path)
}
}
if err := r.readImports(logE, configFilePath, cfg); err != nil {
return err
}
r.readImports(logE, configFilePath, cfg)
return nil
}

func (r *ConfigReader) readImports(logE *logrus.Entry, configFilePath string, cfg *aqua.Config) error {
func (r *ConfigReader) readImports(logE *logrus.Entry, configFilePath string, cfg *aqua.Config) {
pkgs := []*aqua.Package{}
for _, pkg := range cfg.Packages {
if pkg == nil {
Expand Down Expand Up @@ -104,5 +102,4 @@ func (r *ConfigReader) readImports(logE *logrus.Entry, configFilePath string, cf
}
}
cfg.Packages = pkgs
return nil
}

0 comments on commit 833d8dd

Please sign in to comment.