Skip to content

Commit dd518e7

Browse files
EduardGomezEscandellEduardGomezEscandell
authored
Enable usestdlibvars linter (#3299)
* Enable usestdlibvars linter This linter recommends using standard library variables rather than magic constants, so for example 200 is replaced by http.StatusOK. Signed-off-by: Edu Gómez Escandell <[email protected]> * Replace magic values with standard library constants Signed-off-by: Edu Gómez Escandell <[email protected]> --------- Signed-off-by: Edu Gómez Escandell <[email protected]>
1 parent 71493fe commit dd518e7

18 files changed

+50
-49
lines changed

‎.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ linters:
1414
- nakedret
1515
- revive
1616
- unconvert
17+
- usestdlibvars
1718
- whitespace
1819

1920
run:

‎cmd/cdi-cloner/clone-source.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func main() {
252252

253253
client := createHTTPClient(clientKey, clientCert, serverCert)
254254

255-
req, _ := http.NewRequest("POST", url, reader)
255+
req, _ := http.NewRequest(http.MethodPost, url, reader)
256256

257257
if contentType != "" {
258258
req.Header.Set("x-cdi-content-type", contentType)

‎pkg/apiserver/apiserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func doGetRequest(url string) *httptest.ResponseRecorder {
130130
app := &cdiAPIApp{}
131131
app.composeUploadTokenAPI()
132132

133-
req, err := http.NewRequest("GET", url, nil)
133+
req, err := http.NewRequest(http.MethodGet, url, nil)
134134
Expect(err).ToNot(HaveOccurred())
135135
rr := httptest.NewRecorder()
136136

@@ -351,7 +351,7 @@ var _ = Describe("API server tests", func() {
351351
tokenGenerator: newUploadTokenGenerator(signingKey)}
352352
app.composeUploadTokenAPI()
353353

354-
req, err := http.NewRequest("POST",
354+
req, err := http.NewRequest(http.MethodPost,
355355
"/apis/upload.cdi.kubevirt.io/v1beta1/namespaces/default/uploadtokenrequests",
356356
bytes.NewReader(serializedRequest))
357357
Expect(err).ToNot(HaveOccurred())

‎pkg/apiserver/auth-config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ var _ = Describe("Auth config tests", func() {
143143
Expect(secret.Labels[common.AppKubernetesComponentLabel]).To(Equal("storage"))
144144
Expect(secret.Labels[common.AppKubernetesVersionLabel]).To(Equal(installerLabels[common.AppKubernetesVersionLabel]))
145145

146-
req, err := http.NewRequest("GET", "/apis", nil)
146+
req, err := http.NewRequest(http.MethodGet, "/apis", nil)
147147
Expect(err).ToNot(HaveOccurred())
148148
rr := httptest.NewRecorder()
149149

‎pkg/apiserver/webhooks/datavolume-validate_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ func validateAdmissionReview(ar *admissionv1.AdmissionReview, objects ...runtime
12591259

12601260
func serve(ar *admissionv1.AdmissionReview, handler http.Handler) *admissionv1.AdmissionResponse {
12611261
reqBytes, _ := json.Marshal(ar)
1262-
req, err := http.NewRequest("POST", "/foobar", bytes.NewReader(reqBytes))
1262+
req, err := http.NewRequest(http.MethodPost, "/foobar", bytes.NewReader(reqBytes))
12631263
Expect(err).ToNot(HaveOccurred())
12641264

12651265
req.Header.Set("Content-Type", "application/json")

‎pkg/controller/datavolume/import-controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@ var _ = Describe("All DataVolume Tests", func() {
16601660
dv.SetUID("b856691e-1038-11e9-a5ab-525500d15501")
16611661
ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
16621662
_, _ = fmt.Fprintf(w, "import_progress{ownerUID=\"%v\"} 13.45", dv.GetUID()) // ignore error here
1663-
w.WriteHeader(200)
1663+
w.WriteHeader(http.StatusOK)
16641664
}))
16651665
defer ts.Close()
16661666
ep, err := url.Parse(ts.URL)
@@ -1679,7 +1679,7 @@ var _ = Describe("All DataVolume Tests", func() {
16791679
dv.Status.Progress = cdiv1.DataVolumeProgress("2.3%")
16801680
ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
16811681
_, _ = w.Write([]byte(fmt.Sprintf("import_progress{ownerUID=\"%v\"} 13.45", "b856691e-1038-11e9-a5ab-55500d15501")))
1682-
w.WriteHeader(200)
1682+
w.WriteHeader(http.StatusOK)
16831683
}))
16841684
defer ts.Close()
16851685
ep, err := url.Parse(ts.URL)

‎pkg/controller/populators/forklift-populator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ var _ = Describe("Forklift populator tests", func() {
392392

393393
ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
394394
_, _ = w.Write([]byte(fmt.Sprintf("kubevirt_cdi_openstack_populator_progress_total{ownerUID=\"%v\"} 13.45", targetPvc.GetUID())))
395-
w.WriteHeader(200)
395+
w.WriteHeader(http.StatusOK)
396396
}))
397397
defer ts.Close()
398398
ep, err := url.Parse(ts.URL)

‎pkg/controller/populators/import-populator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ var _ = Describe("Import populator tests", func() {
571571

572572
ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
573573
_, _ = w.Write([]byte(fmt.Sprintf("import_progress{ownerUID=\"%v\"} 13.45", targetPvc.GetUID())))
574-
w.WriteHeader(200)
574+
w.WriteHeader(http.StatusOK)
575575
}))
576576
defer ts.Close()
577577
ep, err := url.Parse(ts.URL)

‎pkg/importer/http-datasource.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func createHTTPReader(ctx context.Context, ep *url.URL, accessKey, secKey, certD
331331
brokenForQemuImg = true
332332
}
333333
// http.NewRequest can only return error on invalid METHOD, or invalid url. Here the METHOD is always GET, and the url is always valid, thus error cannot happen.
334-
req, _ := http.NewRequest("GET", ep.String(), nil)
334+
req, _ := http.NewRequest(http.MethodGet, ep.String(), nil)
335335

336336
addExtraheaders(req, allExtraHeaders)
337337

@@ -344,9 +344,9 @@ func createHTTPReader(ctx context.Context, ep *url.URL, accessKey, secKey, certD
344344
if err != nil {
345345
return nil, uint64(0), true, errors.Wrap(err, "HTTP request errored")
346346
}
347-
if resp.StatusCode != 200 {
348-
klog.Errorf("http: expected status code 200, got %d", resp.StatusCode)
349-
return nil, uint64(0), true, errors.Errorf("expected status code 200, got %d. Status: %s", resp.StatusCode, resp.Status)
347+
if want := http.StatusOK; resp.StatusCode != want {
348+
klog.Errorf("http: expected status code %d, got %d", want, resp.StatusCode)
349+
return nil, uint64(0), true, errors.Errorf("expected status code %d, got %d. Status: %s", want, resp.StatusCode, resp.Status)
350350
}
351351

352352
if contentType == cdiv1.DataVolumeKubeVirt {
@@ -404,7 +404,7 @@ func (hs *HTTPDataSource) pollProgress(reader *util.CountingReader, idleTime, po
404404
}
405405

406406
func getContentLength(client *http.Client, ep *url.URL, accessKey, secKey string, extraHeaders []string) (uint64, error) {
407-
req, err := http.NewRequest("HEAD", ep.String(), nil)
407+
req, err := http.NewRequest(http.MethodHead, ep.String(), nil)
408408
if err != nil {
409409
return uint64(0), errors.Wrap(err, "could not create HTTP request")
410410
}
@@ -420,9 +420,9 @@ func getContentLength(client *http.Client, ep *url.URL, accessKey, secKey string
420420
return uint64(0), errors.Wrap(err, "HTTP request errored")
421421
}
422422

423-
if resp.StatusCode != 200 {
424-
klog.Errorf("http: expected status code 200, got %d", resp.StatusCode)
425-
return uint64(0), errors.Errorf("expected status code 200, got %d. Status: %s", resp.StatusCode, resp.Status)
423+
if want := http.StatusOK; resp.StatusCode != want {
424+
klog.Errorf("http: expected status code %d, got %d", want, resp.StatusCode)
425+
return uint64(0), errors.Errorf("expected status code %d, got %d. Status: %s", want, resp.StatusCode, resp.Status)
426426
}
427427

428428
for k, v := range resp.Header {
@@ -512,7 +512,7 @@ func getExtraHeadersFromSecrets() ([]string, error) {
512512
}
513513

514514
func getServerInfo(ctx context.Context, infoURL string) (*common.ServerInfo, error) {
515-
req, err := http.NewRequestWithContext(ctx, "GET", infoURL, nil)
515+
req, err := http.NewRequestWithContext(ctx, http.MethodGet, infoURL, nil)
516516
if err != nil {
517517
return nil, errors.Wrap(err, "failed to construct request for containerimage-server info")
518518
}

‎pkg/importer/http-datasource_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ var _ = Describe("Http data source", func() {
179179
Expect(err).NotTo(HaveOccurred())
180180
_, _ = w.Write(body)
181181
} else {
182-
w.WriteHeader(500)
182+
w.WriteHeader(http.StatusInternalServerError)
183183
}
184184
}))
185185
dp, err = NewHTTPDataSource(ts2.URL+"/"+tinyCoreGz, "", "", "", cdiv1.DataVolumeKubeVirt)
@@ -294,7 +294,7 @@ var _ = Describe("Http reader", func() {
294294
It("should pass auth info in request if set", func() {
295295
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
296296
user, pass, ok := r.BasicAuth()
297-
defer w.WriteHeader(200)
297+
defer w.WriteHeader(http.StatusOK)
298298
Expect(ok).To(BeTrue())
299299
Expect("user").To(Equal(user))
300300
Expect("password").To(Equal(pass))
@@ -378,7 +378,7 @@ var _ = Describe("Http reader", func() {
378378

379379
It("should continue even if HEAD is rejected, but mark broken for qemu-img", func() {
380380
redirTs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
381-
if r.Method == "HEAD" {
381+
if r.Method == http.MethodHead {
382382
w.WriteHeader(http.StatusForbidden)
383383
} else {
384384
defer w.WriteHeader(http.StatusOK)
@@ -423,7 +423,7 @@ var _ = Describe("Http reader", func() {
423423

424424
It("should fail if server returns error code", func() {
425425
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
426-
w.WriteHeader(500)
426+
w.WriteHeader(http.StatusInternalServerError)
427427
}))
428428
defer ts.Close()
429429
ep, err := url.Parse(ts.URL)
@@ -437,9 +437,9 @@ var _ = Describe("Http reader", func() {
437437
It("should pass through extra headers", func() {
438438
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
439439
if _, exists := r.Header["Extra-Header"]; exists {
440-
w.WriteHeader(200)
440+
w.WriteHeader(http.StatusOK)
441441
} else {
442-
w.WriteHeader(500)
442+
w.WriteHeader(http.StatusInternalServerError)
443443
}
444444
}))
445445
defer ts.Close()

‎pkg/importer/imageio-datasource.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ func (reader *extentReader) GetRange(start, end int64) (io.ReadCloser, error) {
465465
klog.Infof("Range request extends past end of image, trimming to %d", end)
466466
}
467467

468-
request, err := http.NewRequest("GET", reader.transferURL, nil)
468+
request, err := http.NewRequest(http.MethodGet, reader.transferURL, nil)
469469
if err != nil {
470470
return nil, errors.Wrap(err, "failed to create range request")
471471
}
@@ -562,7 +562,7 @@ func createImageioReader(ctx context.Context, ep string, accessKey string, secKe
562562

563563
var reader io.ReadCloser
564564
if extentsFeature {
565-
req, err := http.NewRequest("GET", transferURL+"/extents", nil)
565+
req, err := http.NewRequest(http.MethodGet, transferURL+"/extents", nil)
566566
if err != nil {
567567
return nil, uint64(0), it, conn, err
568568
}
@@ -598,7 +598,7 @@ func createImageioReader(ctx context.Context, ep string, accessKey string, secKe
598598
size: int64(total),
599599
}
600600
} else {
601-
req, err := http.NewRequest("GET", transferURL, nil)
601+
req, err := http.NewRequest(http.MethodGet, transferURL, nil)
602602
if err != nil {
603603
return nil, uint64(0), it, conn, errors.Wrap(err, "Sending request failed")
604604
}

‎pkg/uploadproxy/uploadproxy_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func getHTTPClientConfig() *httpClientConfig {
7575
}
7676

7777
func newProxyRequest(path, authHeaderValue string) *http.Request {
78-
req, err := http.NewRequest("POST", path, strings.NewReader("data"))
78+
req, err := http.NewRequest(http.MethodPost, path, strings.NewReader("data"))
7979
Expect(err).ToNot(HaveOccurred())
8080

8181
if authHeaderValue != "" {
@@ -85,7 +85,7 @@ func newProxyRequest(path, authHeaderValue string) *http.Request {
8585
}
8686

8787
func newProxyHeadRequest(authHeaderValue string) *http.Request {
88-
req, err := http.NewRequest("HEAD", common.UploadPathSync, nil)
88+
req, err := http.NewRequest(http.MethodHead, common.UploadPathSync, nil)
8989
Expect(err).ToNot(HaveOccurred())
9090

9191
if authHeaderValue != "" {
@@ -245,7 +245,7 @@ var _ = Describe("submit request and check status", func() {
245245
Entry("Malformed auth header: invalid prefix", "Beereer valid", http.StatusBadRequest),
246246
)
247247
It("Test healthz", func() {
248-
req, err := http.NewRequest("GET", healthzPath, nil)
248+
req, err := http.NewRequest(http.MethodGet, healthzPath, nil)
249249
Expect(err).ToNot(HaveOccurred())
250250
submitRequestAndCheckStatus(req, http.StatusOK, nil)
251251
})
@@ -264,7 +264,7 @@ var _ = Describe("submit request and check status", func() {
264264
)
265265

266266
It("Test healthz", func() {
267-
req, err := http.NewRequest("GET", healthzPath, nil)
267+
req, err := http.NewRequest(http.MethodGet, healthzPath, nil)
268268
Expect(err).ToNot(HaveOccurred())
269269
submitRequestAndCheckStatus(req, http.StatusOK, nil)
270270
})

‎pkg/uploadserver/uploadserver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func (app *uploadServerApp) healthzHandler(w http.ResponseWriter, r *http.Reques
278278
}
279279

280280
func (app *uploadServerApp) validateShouldHandleRequest(w http.ResponseWriter, r *http.Request) bool {
281-
if r.Method != "POST" {
281+
if r.Method != http.MethodPost {
282282
w.WriteHeader(http.StatusNotFound)
283283
return false
284284
}
@@ -323,7 +323,7 @@ func (app *uploadServerApp) validateShouldHandleRequest(w http.ResponseWriter, r
323323

324324
func (app *uploadServerApp) uploadHandlerAsync(irc imageReadCloser) http.HandlerFunc {
325325
return func(w http.ResponseWriter, r *http.Request) {
326-
if r.Method == "HEAD" {
326+
if r.Method == http.MethodHead {
327327
w.WriteHeader(http.StatusOK)
328328
return
329329
}

‎pkg/uploadserver/uploadserver_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func replaceAsyncProcessorFunc(replacement func(io.ReadCloser, string, string, f
186186
var _ = Describe("Upload server tests", func() {
187187
It("GET fails", func() {
188188
withProcessorSuccess(func() {
189-
req, err := http.NewRequest("GET", common.UploadPathSync, nil)
189+
req, err := http.NewRequest(http.MethodGet, common.UploadPathSync, nil)
190190
Expect(err).ToNot(HaveOccurred())
191191

192192
rr := httptest.NewRecorder()
@@ -200,7 +200,7 @@ var _ = Describe("Upload server tests", func() {
200200
})
201201

202202
It("healthz", func() {
203-
req, err := http.NewRequest("GET", healthzPath, nil)
203+
req, err := http.NewRequest(http.MethodGet, healthzPath, nil)
204204
Expect(err).ToNot(HaveOccurred())
205205

206206
rr := httptest.NewRecorder()
@@ -216,7 +216,7 @@ var _ = Describe("Upload server tests", func() {
216216

217217
DescribeTable("Process unavailable", func(uploadPath string) {
218218
withProcessorSuccess(func() {
219-
req, err := http.NewRequest("POST", uploadPath, strings.NewReader("data"))
219+
req, err := http.NewRequest(http.MethodPost, uploadPath, strings.NewReader("data"))
220220
Expect(err).ToNot(HaveOccurred())
221221

222222
rr := httptest.NewRecorder()
@@ -238,7 +238,7 @@ var _ = Describe("Upload server tests", func() {
238238

239239
DescribeTable("Completion conflict", func(uploadPath string) {
240240
withAsyncProcessorSuccess(func() {
241-
req, err := http.NewRequest("POST", uploadPath, strings.NewReader("data"))
241+
req, err := http.NewRequest(http.MethodPost, uploadPath, strings.NewReader("data"))
242242
Expect(err).ToNot(HaveOccurred())
243243

244244
rr := httptest.NewRecorder()
@@ -260,7 +260,7 @@ var _ = Describe("Upload server tests", func() {
260260

261261
It("Success", func() {
262262
withProcessorSuccess(func() {
263-
req, err := http.NewRequest("POST", common.UploadPathSync, strings.NewReader("data"))
263+
req, err := http.NewRequest(http.MethodPost, common.UploadPathSync, strings.NewReader("data"))
264264
Expect(err).ToNot(HaveOccurred())
265265

266266
rr := httptest.NewRecorder()
@@ -309,7 +309,7 @@ var _ = Describe("Upload server tests", func() {
309309

310310
DescribeTable("Stream fail", func(processorFunc func(func()), uploadPath string) {
311311
processorFunc(func() {
312-
req, err := http.NewRequest("POST", uploadPath, strings.NewReader("data"))
312+
req, err := http.NewRequest(http.MethodPost, uploadPath, strings.NewReader("data"))
313313
Expect(err).ToNot(HaveOccurred())
314314

315315
rr := httptest.NewRecorder()
@@ -396,7 +396,7 @@ func newFormRequest(path string) *http.Request {
396396
err = w.Close()
397397
Expect(err).ToNot(HaveOccurred())
398398

399-
req, err := http.NewRequest("POST", path, &b)
399+
req, err := http.NewRequest(http.MethodPost, path, &b)
400400
Expect(err).ToNot(HaveOccurred())
401401

402402
req.Header.Set("Content-Type", w.FormDataContentType())

‎tests/apiserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var _ = Describe("cdi-apiserver tests", Serial, func() {
5656
}
5757

5858
Eventually(func() error {
59-
req, err := http.NewRequest("GET", url, nil)
59+
req, err := http.NewRequest(http.MethodGet, url, nil)
6060
Expect(err).ToNot(HaveOccurred())
6161

6262
resp, err := client.Do(req)
@@ -130,7 +130,7 @@ var _ = Describe("cdi-apiserver tests", Serial, func() {
130130
},
131131
}
132132
requestFunc := func() string {
133-
req, err := http.NewRequest("GET", url, nil)
133+
req, err := http.NewRequest(http.MethodGet, url, nil)
134134
if err != nil {
135135
return err.Error()
136136
}

‎tests/framework/prometheus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (f *Framework) MakePrometheusHTTPRequest(endpoint string) *http.Response {
8787
},
8888
}
8989
gomega.Eventually(func() bool {
90-
req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/%s", url, endpoint), nil)
90+
req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/api/v1/%s", url, endpoint), nil)
9191
if err != nil {
9292
return false
9393
}

‎tests/upload_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ func formRequestFunc(url, fileName string) (*http.Request, error) {
791791
pipeReader, pipeWriter := io.Pipe()
792792
multipartWriter := multipart.NewWriter(pipeWriter)
793793

794-
req, err := http.NewRequest("POST", url, pipeReader)
794+
req, err := http.NewRequest(http.MethodPost, url, pipeReader)
795795
if err != nil {
796796
return nil, err
797797
}
@@ -830,7 +830,7 @@ func binaryRequestFunc(url, fileName string) (*http.Request, error) {
830830
return nil, err
831831
}
832832

833-
req, err := http.NewRequest("POST", url, f)
833+
req, err := http.NewRequest(http.MethodPost, url, f)
834834
if err != nil {
835835
return nil, err
836836
}
@@ -846,7 +846,7 @@ func testBadRequestFunc(url, fileName string) (*http.Request, error) {
846846
return nil, err
847847
}
848848
lr := LimitThenErrorReader(f, 2048)
849-
req, err := http.NewRequest("POST", url, lr)
849+
req, err := http.NewRequest(http.MethodPost, url, lr)
850850
if err != nil {
851851
return nil, err
852852
}

0 commit comments

Comments
 (0)