Skip to content

Commit 8a98d12

Browse files
andrewandrew
authored
Merge pull request #2 from git-pkgs/fix-gosec-warnings
Fix gosec warnings
2 parents 717c297 + b6b8312 commit 8a98d12

34 files changed

+193
-139
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
go-version: ['1.25']
15+
16+
steps:
17+
- uses: actions/checkout@v6
18+
19+
- name: Set up Go
20+
uses: actions/setup-go@v6
21+
with:
22+
go-version: ${{ matrix.go-version }}
23+
24+
- name: Build
25+
run: go build -v ./...
26+
27+
- name: Test
28+
run: go test -v -race -coverprofile=coverage.out ./...
29+
30+
- name: Upload coverage
31+
if: matrix.go-version == '1.25'
32+
uses: codecov/codecov-action@v5
33+
with:
34+
files: coverage.out
35+
fail_ci_if_error: false
36+
37+
lint:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v6
41+
42+
- name: Set up Go
43+
uses: actions/setup-go@v6
44+
with:
45+
go-version: '1.25'
46+
47+
- name: golangci-lint
48+
uses: golangci/golangci-lint-action@v9
49+
with:
50+
version: latest

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: "2"
2+
linters:
3+
disable:
4+
- unused

‎benchmark_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func BenchmarkNew(b *testing.B) {
6161
func BenchmarkFetchPackage_Cargo(b *testing.B) {
6262
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
6363
w.Header().Set("Content-Type", "application/json")
64-
json.NewEncoder(w).Encode(cargoResponse)
64+
_ = json.NewEncoder(w).Encode(cargoResponse)
6565
}))
6666
defer server.Close()
6767

@@ -77,7 +77,7 @@ func BenchmarkFetchPackage_Cargo(b *testing.B) {
7777
func BenchmarkFetchPackage_npm(b *testing.B) {
7878
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
7979
w.Header().Set("Content-Type", "application/json")
80-
json.NewEncoder(w).Encode(npmResponse)
80+
_ = json.NewEncoder(w).Encode(npmResponse)
8181
}))
8282
defer server.Close()
8383

@@ -93,7 +93,7 @@ func BenchmarkFetchPackage_npm(b *testing.B) {
9393
func BenchmarkFetchVersions_Cargo(b *testing.B) {
9494
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
9595
w.Header().Set("Content-Type", "application/json")
96-
json.NewEncoder(w).Encode(cargoResponse)
96+
_ = json.NewEncoder(w).Encode(cargoResponse)
9797
}))
9898
defer server.Close()
9999

@@ -173,7 +173,7 @@ func BenchmarkJSONParsing_Large(b *testing.B) {
173173
func BenchmarkFetchPackage_Parallel(b *testing.B) {
174174
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
175175
w.Header().Set("Content-Type", "application/json")
176-
json.NewEncoder(w).Encode(cargoResponse)
176+
_ = json.NewEncoder(w).Encode(cargoResponse)
177177
}))
178178
defer server.Close()
179179

‎internal/cargo/cargo_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestFetchPackage(t *testing.T) {
4242
}
4343

4444
w.Header().Set("Content-Type", "application/json")
45-
json.NewEncoder(w).Encode(resp)
45+
_ = json.NewEncoder(w).Encode(resp)
4646
}))
4747
defer server.Close()
4848

@@ -111,7 +111,7 @@ func TestFetchVersions(t *testing.T) {
111111
}
112112

113113
w.Header().Set("Content-Type", "application/json")
114-
json.NewEncoder(w).Encode(resp)
114+
_ = json.NewEncoder(w).Encode(resp)
115115
}))
116116
defer server.Close()
117117

@@ -163,7 +163,7 @@ func TestFetchDependencies(t *testing.T) {
163163
}
164164

165165
w.Header().Set("Content-Type", "application/json")
166-
json.NewEncoder(w).Encode(resp)
166+
_ = json.NewEncoder(w).Encode(resp)
167167
}))
168168
defer server.Close()
169169

@@ -215,7 +215,7 @@ func TestFetchMaintainers(t *testing.T) {
215215
}
216216

217217
w.Header().Set("Content-Type", "application/json")
218-
json.NewEncoder(w).Encode(resp)
218+
_ = json.NewEncoder(w).Encode(resp)
219219
}))
220220
defer server.Close()
221221

‎internal/clojars/clojars_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestFetchPackage(t *testing.T) {
4343
{Version: "1.11.0", Downloads: 10000},
4444
},
4545
}
46-
json.NewEncoder(w).Encode(resp)
46+
_ = json.NewEncoder(w).Encode(resp)
4747
})
4848

4949
mux.HandleFunc("/api/artifacts/ring/ring-core/versions/1.11.0", func(w http.ResponseWriter, r *http.Request) {
@@ -54,7 +54,7 @@ func TestFetchPackage(t *testing.T) {
5454
URL: "https://github.com/ring-clojure/ring.git",
5555
},
5656
}
57-
json.NewEncoder(w).Encode(resp)
57+
_ = json.NewEncoder(w).Encode(resp)
5858
})
5959

6060
server := httptest.NewServer(mux)
@@ -92,12 +92,12 @@ func TestFetchPackageSingleName(t *testing.T) {
9292
{Version: "1.7.0"},
9393
},
9494
}
95-
json.NewEncoder(w).Encode(resp)
95+
_ = json.NewEncoder(w).Encode(resp)
9696
})
9797

9898
mux.HandleFunc("/api/artifacts/compojure/compojure/versions/1.7.0", func(w http.ResponseWriter, r *http.Request) {
9999
resp := versionDetailResponse{Version: "1.7.0"}
100-
json.NewEncoder(w).Encode(resp)
100+
_ = json.NewEncoder(w).Encode(resp)
101101
})
102102

103103
server := httptest.NewServer(mux)
@@ -127,7 +127,7 @@ func TestFetchVersions(t *testing.T) {
127127
{Version: "1.0.5", Downloads: 50000},
128128
},
129129
}
130-
json.NewEncoder(w).Encode(resp)
130+
_ = json.NewEncoder(w).Encode(resp)
131131
})
132132

133133
mux.HandleFunc("/api/artifacts/hiccup/hiccup/versions/2.0.0", func(w http.ResponseWriter, r *http.Request) {
@@ -136,7 +136,7 @@ func TestFetchVersions(t *testing.T) {
136136
CreatedEpoch: 1699900000000,
137137
Licenses: []string{"EPL-1.0"},
138138
}
139-
json.NewEncoder(w).Encode(resp)
139+
_ = json.NewEncoder(w).Encode(resp)
140140
})
141141

142142
mux.HandleFunc("/api/artifacts/hiccup/hiccup/versions/1.0.5", func(w http.ResponseWriter, r *http.Request) {
@@ -145,7 +145,7 @@ func TestFetchVersions(t *testing.T) {
145145
CreatedEpoch: 1600000000000,
146146
Licenses: []string{"EPL-1.0"},
147147
}
148-
json.NewEncoder(w).Encode(resp)
148+
_ = json.NewEncoder(w).Encode(resp)
149149
})
150150

151151
server := httptest.NewServer(mux)
@@ -187,7 +187,7 @@ func TestFetchDependencies(t *testing.T) {
187187
{GroupName: "clj-time", JarName: "clj-time", Version: "0.15.2", Scope: "test"},
188188
},
189189
}
190-
json.NewEncoder(w).Encode(resp)
190+
_ = json.NewEncoder(w).Encode(resp)
191191
}))
192192
defer server.Close()
193193

‎internal/cocoapods/cocoapods_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestFetchPackage(t *testing.T) {
3838
}
3939

4040
w.Header().Set("Content-Type", "application/json")
41-
json.NewEncoder(w).Encode(resp)
41+
_ = json.NewEncoder(w).Encode(resp)
4242
}))
4343
defer server.Close()
4444

@@ -80,7 +80,7 @@ func TestFetchPackageWithMapLicense(t *testing.T) {
8080
},
8181
},
8282
}
83-
json.NewEncoder(w).Encode(resp)
83+
_ = json.NewEncoder(w).Encode(resp)
8484
}))
8585
defer server.Close()
8686

@@ -105,7 +105,7 @@ func TestFetchVersions(t *testing.T) {
105105
{Name: "5.16.0", CreatedAt: time.Date(2023, 7, 1, 0, 0, 0, 0, time.UTC)},
106106
},
107107
}
108-
json.NewEncoder(w).Encode(resp)
108+
_ = json.NewEncoder(w).Encode(resp)
109109
}))
110110
defer server.Close()
111111

@@ -145,7 +145,7 @@ func TestFetchDependencies(t *testing.T) {
145145
},
146146
},
147147
}
148-
json.NewEncoder(w).Encode(resp)
148+
_ = json.NewEncoder(w).Encode(resp)
149149
}))
150150
defer server.Close()
151151

@@ -181,7 +181,7 @@ func TestFetchMaintainers(t *testing.T) {
181181
{Name: "SnapKit", Email: "info@snapkit.io"},
182182
},
183183
}
184-
json.NewEncoder(w).Encode(resp)
184+
_ = json.NewEncoder(w).Encode(resp)
185185
}))
186186
defer server.Close()
187187

‎internal/conda/conda_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestFetchPackage(t *testing.T) {
5050
}
5151

5252
w.Header().Set("Content-Type", "application/json")
53-
json.NewEncoder(w).Encode(resp)
53+
_ = json.NewEncoder(w).Encode(resp)
5454
}))
5555
defer server.Close()
5656

@@ -90,7 +90,7 @@ func TestFetchPackageWithChannel(t *testing.T) {
9090
Summary: "Tools for manipulating next-gen sequencing data",
9191
Owner: "bioconda",
9292
}
93-
json.NewEncoder(w).Encode(resp)
93+
_ = json.NewEncoder(w).Encode(resp)
9494
}))
9595
defer server.Close()
9696

@@ -119,7 +119,7 @@ func TestFetchVersions(t *testing.T) {
119119
{Version: "1.5.3", UploadTime: 1678300000, MD5: "ghi789"},
120120
},
121121
}
122-
json.NewEncoder(w).Encode(resp)
122+
_ = json.NewEncoder(w).Encode(resp)
123123
}))
124124
defer server.Close()
125125

@@ -167,7 +167,7 @@ func TestFetchDependencies(t *testing.T) {
167167
},
168168
},
169169
}
170-
json.NewEncoder(w).Encode(resp)
170+
_ = json.NewEncoder(w).Encode(resp)
171171
}))
172172
defer server.Close()
173173

@@ -200,7 +200,7 @@ func TestFetchMaintainers(t *testing.T) {
200200
Name: "scipy",
201201
Owner: "conda-forge",
202202
}
203-
json.NewEncoder(w).Encode(resp)
203+
_ = json.NewEncoder(w).Encode(resp)
204204
}))
205205
defer server.Close()
206206

‎internal/core/benchmark_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func BenchmarkClient_GetJSON(b *testing.B) {
2121

2222
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2323
w.Header().Set("Content-Type", "application/json")
24-
json.NewEncoder(w).Encode(response)
24+
_ = json.NewEncoder(w).Encode(response)
2525
}))
2626
defer server.Close()
2727

@@ -44,7 +44,7 @@ Depends: R (>= 4.0)
4444
`
4545

4646
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
47-
w.Write([]byte(body))
47+
_, _ = w.Write([]byte(body))
4848
}))
4949
defer server.Close()
5050

‎internal/core/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (c *Client) doRequest(ctx context.Context, url string) ([]byte, error) {
101101
if err != nil {
102102
return nil, err
103103
}
104-
defer resp.Body.Close()
104+
defer func() { _ = resp.Body.Close() }()
105105

106106
body, err := io.ReadAll(resp.Body)
107107
if err != nil {
@@ -157,7 +157,7 @@ func (c *Client) Head(ctx context.Context, url string) (int, error) {
157157
if err != nil {
158158
return 0, err
159159
}
160-
resp.Body.Close()
160+
_ = resp.Body.Close()
161161

162162
return resp.StatusCode, nil
163163
}

‎internal/cpan/cpan_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestFetchPackage(t *testing.T) {
4747
}
4848

4949
w.Header().Set("Content-Type", "application/json")
50-
json.NewEncoder(w).Encode(resp)
50+
_ = json.NewEncoder(w).Encode(resp)
5151
}))
5252
defer server.Close()
5353

@@ -87,7 +87,7 @@ func TestFetchVersions(t *testing.T) {
8787
},
8888
},
8989
}
90-
json.NewEncoder(w).Encode(resp)
90+
_ = json.NewEncoder(w).Encode(resp)
9191
}))
9292
defer server.Close()
9393

@@ -134,7 +134,7 @@ func TestFetchDependencies(t *testing.T) {
134134
{Module: "Test::Fatal", Version: "0.001", Phase: "test", Relationship: "recommends"},
135135
},
136136
}
137-
json.NewEncoder(w).Encode(resp)
137+
_ = json.NewEncoder(w).Encode(resp)
138138
}))
139139
defer server.Close()
140140

@@ -178,7 +178,7 @@ func TestFetchMaintainers(t *testing.T) {
178178
Name: "Moose",
179179
Author: "ETHER",
180180
}
181-
json.NewEncoder(w).Encode(resp)
181+
_ = json.NewEncoder(w).Encode(resp)
182182
})
183183

184184
mux.HandleFunc("/v1/author/ETHER", func(w http.ResponseWriter, r *http.Request) {
@@ -188,7 +188,7 @@ func TestFetchMaintainers(t *testing.T) {
188188
Email: []string{"ether@cpan.org"},
189189
Website: []string{"https://metacpan.org/author/ETHER"},
190190
}
191-
json.NewEncoder(w).Encode(resp)
191+
_ = json.NewEncoder(w).Encode(resp)
192192
})
193193

194194
server := httptest.NewServer(mux)

0 commit comments

Comments
 (0)