Skip to content

Commit 15f96b0

Browse files
mfridmanoxisto
andauthored
Add golangci-lint (#279)
* Add golangci-lint-action * Upgrading CodeQL to v2 * Fixed linting errors --------- Co-authored-by: Christian Banse <[email protected]>
1 parent 843e9bf commit 15f96b0

File tree

7 files changed

+85
-51
lines changed

7 files changed

+85
-51
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,12 @@ on:
88
types: [opened, synchronize, reopened]
99

1010
jobs:
11-
check:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v3
16-
- uses: reviewdog/action-staticcheck@v1
17-
with:
18-
github_token: ${{ secrets.github_token }}
19-
reporter: github-pr-review
20-
filter_mode: nofilter
21-
fail_on_error: true
22-
2311
build:
2412
runs-on: ubuntu-latest
2513
strategy:
2614
fail-fast: false
2715
matrix:
28-
go: ["1.18", "1.19", "1.20"]
16+
go: ["1.18.x", "1.19.x", "1.20.x"]
2917
steps:
3018
- name: Checkout
3119
uses: actions/checkout@v3

.github/workflows/codeql-analysis.yml

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ main ]
17-
# pull_request:
18-
# The branches below must be a subset of the branches above
19-
# branches: [ main ]
16+
branches: [main]
17+
pull_request:
2018
schedule:
21-
- cron: '31 10 * * 5'
19+
- cron: "31 10 * * 5"
2220

2321
jobs:
2422
analyze:
@@ -32,40 +30,40 @@ jobs:
3230
strategy:
3331
fail-fast: false
3432
matrix:
35-
language: [ 'go' ]
33+
language: ["go"]
3634
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3735
# Learn more:
3836
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3937

4038
steps:
41-
- name: Checkout repository
42-
uses: actions/checkout@v2
39+
- name: Checkout repository
40+
uses: actions/checkout@v2
4341

44-
# Initializes the CodeQL tools for scanning.
45-
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
47-
with:
48-
languages: ${{ matrix.language }}
49-
# If you wish to specify custom queries, you can do so here or in a config file.
50-
# By default, queries listed here will override any specified in a config file.
51-
# Prefix the list here with "+" to use these queries and those in the config file.
52-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
42+
# Initializes the CodeQL tools for scanning.
43+
- name: Initialize CodeQL
44+
uses: github/codeql-action/init@v2
45+
with:
46+
languages: ${{ matrix.language }}
47+
# If you wish to specify custom queries, you can do so here or in a config file.
48+
# By default, queries listed here will override any specified in a config file.
49+
# Prefix the list here with "+" to use these queries and those in the config file.
50+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5351

54-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
56-
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
52+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
53+
# If this step fails, then you should remove it and run the build manually (see below)
54+
- name: Autobuild
55+
uses: github/codeql-action/autobuild@v2
5856

59-
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
57+
# ℹ️ Command-line programs to run using the OS shell.
58+
# 📚 https://git.io/JvXDl
6159

62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
60+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
61+
# and modify them (or add more) to build your code if your project
62+
# uses a compiled language
6563

66-
#- run: |
67-
# make bootstrap
68-
# make release
64+
#- run: |
65+
# make bootstrap
66+
# make release
6967

70-
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
68+
- name: Perform CodeQL Analysis
69+
uses: github/codeql-action/analyze@v2

.github/workflows/lint.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: golangci
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
jobs:
8+
golangci:
9+
name: lint
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v3
14+
- name: Setup Go
15+
uses: actions/setup-go@v3
16+
with:
17+
go-version: "1.20.x"
18+
check-latest: true
19+
cache: true
20+
- name: golangci-lint
21+
uses: golangci/golangci-lint-action@v3
22+
with:
23+
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
24+
version: latest
25+
26+
# Optional: working directory, useful for monorepos
27+
# working-directory: somedir
28+
29+
# Optional: golangci-lint command line arguments.
30+
# args: --issues-exit-code=0
31+
32+
# Optional: show only new issues if it's a pull request. The default value is `false`.
33+
# only-new-issues: true
34+
35+
# Optional: if set to true then the all caching functionality will be complete disabled,
36+
# takes precedence over all other caching options.
37+
# skip-cache: true
38+
39+
# Optional: if set to true then the action don't cache or restore ~/go/pkg.
40+
# skip-pkg-cache: true
41+
42+
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
43+
# skip-build-cache: true

example_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func ExampleNewWithClaims_customClaimsType() {
3838
jwt.RegisteredClaims
3939
}
4040

41-
// Create the claims
41+
// Create claims with multiple fields populated
4242
claims := MyCustomClaims{
4343
"bar",
4444
jwt.RegisteredClaims{
@@ -53,6 +53,8 @@ func ExampleNewWithClaims_customClaimsType() {
5353
},
5454
}
5555

56+
fmt.Printf("foo: %v\n", claims.Foo)
57+
5658
// Create claims while leaving out some of the optional fields
5759
claims = MyCustomClaims{
5860
"bar",
@@ -67,7 +69,8 @@ func ExampleNewWithClaims_customClaimsType() {
6769
ss, err := token.SignedString(mySigningKey)
6870
fmt.Printf("%v %v", ss, err)
6971

70-
//Output: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIiLCJpc3MiOiJ0ZXN0IiwiZXhwIjoxNTE2MjM5MDIyfQ.xVuY2FZ_MRXMIEgVQ7J-TFtaucVFRXUzHm9LmV41goM <nil>
72+
//Output: foo: bar
73+
//eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIiLCJpc3MiOiJ0ZXN0IiwiZXhwIjoxNTE2MjM5MDIyfQ.xVuY2FZ_MRXMIEgVQ7J-TFtaucVFRXUzHm9LmV41goM <nil>
7174
}
7275

7376
// Example creating a token using a custom claims type. The RegisteredClaims is embedded

http_example_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ func Example_getTokenViaHTTP() {
9494

9595
// Read the token out of the response body
9696
buf := new(bytes.Buffer)
97-
io.Copy(buf, res.Body)
97+
_, err = io.Copy(buf, res.Body)
98+
fatal(err)
9899
res.Body.Close()
99100
tokenString := strings.TrimSpace(buf.String())
100101

@@ -129,7 +130,8 @@ func Example_useTokenViaHTTP() {
129130

130131
// Read the response body
131132
buf := new(bytes.Buffer)
132-
io.Copy(buf, res.Body)
133+
_, err = io.Copy(buf, res.Body)
134+
fatal(err)
133135
res.Body.Close()
134136
fmt.Println(buf.String())
135137

request/extractor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func (e HeaderExtractor) ExtractToken(req *http.Request) (string, error) {
3838
type ArgumentExtractor []string
3939

4040
func (e ArgumentExtractor) ExtractToken(req *http.Request) (string, error) {
41-
// Make sure form is parsed
42-
req.ParseMultipartForm(10e6)
41+
// Make sure form is parsed. We are explicitly ignoring errors at this point
42+
_ = req.ParseMultipartForm(10e6)
4343

4444
// loop over arg names and return the first one that contains data
4545
for _, arg := range e {

token_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func BenchmarkToken_SigningString(b *testing.B) {
7272
b.ResetTimer()
7373
b.ReportAllocs()
7474
for i := 0; i < b.N; i++ {
75-
t.SigningString()
75+
_, _ = t.SigningString()
7676
}
7777
})
7878
}

0 commit comments

Comments
 (0)