Skip to content

Commit 3d9441c

Browse files
chore(deps): update dependency golangci/golangci-lint to v2.2.2 (#789)
* chore(deps): update dependency golangci/golangci-lint to v2.2.2 * chore(deps): update dependency golangci/golangci-lint to v2.2.2 Signed-off-by: Hristo Hristov <me@hhristov.info> --------- Signed-off-by: Hristo Hristov <me@hhristov.info> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Hristo Hristov <me@hhristov.info>
1 parent cf3d764 commit 3d9441c

10 files changed

Lines changed: 14 additions & 3 deletions

File tree

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ run:
55
linters:
66
default: all
77
disable:
8+
- revive
9+
- noinlineerr
810
- depguard
911
- err113
1012
- exhaustruct

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ nwa:
352352
$(call go-install-tool,$(NWA),github.com/$(NWA_LOOKUP)@$(NWA_VERSION))
353353

354354
GOLANGCI_LINT := $(LOCALBIN)/golangci-lint
355-
GOLANGCI_LINT_VERSION := v2.1.6
355+
GOLANGCI_LINT_VERSION := v2.2.2
356356
GOLANGCI_LINT_LOOKUP := golangci/golangci-lint
357357
golangci-lint: ## Download golangci-lint locally if necessary.
358358
@test -s $(GOLANGCI_LINT) && $(GOLANGCI_LINT) -h | grep -q $(GOLANGCI_LINT_VERSION) || \

api/v1beta1/globalproxysettings_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ type GlobalProxySettings struct {
5151
type GlobalProxySettingsList struct {
5252
metav1.TypeMeta `json:",inline"`
5353
metav1.ListMeta `json:"metadata,omitempty"`
54-
Items []GlobalProxySettings `json:"items"`
54+
55+
Items []GlobalProxySettings `json:"items"`
5556
}
5657

5758
//nolint:gochecknoinits

api/v1beta1/proxysettings_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ type ProxySetting struct {
4343
type ProxySettingList struct {
4444
metav1.TypeMeta `json:",inline"`
4545
metav1.ListMeta `json:"metadata,omitempty"`
46-
Items []ProxySetting `json:"items"`
46+
47+
Items []ProxySetting `json:"items"`
4748
}
4849

4950
//nolint:gochecknoinits

internal/modules/priorityclass/get.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (g get) Handle(proxyTenants []*tenant.ProxyTenant, proxyRequest request.Req
7474
}
7575

7676
var r *labels.Requirement
77+
7778
r, err = getPriorityClassSelector(sc, exactMatch, regexMatch)
7879

7980
switch {

internal/modules/storageclass/get.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (g get) Handle(proxyTenants []*tenant.ProxyTenant, proxyRequest request.Req
7474
}
7575

7676
var r *labels.Requirement
77+
7778
r, err = getStorageClassSelector(sc, exactMatch, regexMatch)
7879

7980
switch {

internal/request/http.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
type http struct {
2121
*h.Request
22+
2223
authTypes []AuthType
2324
usernameClaimField string
2425
ignoredImpersonationGroups []string

internal/utils/gvk.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
type ProxyGroupVersionKind struct {
1414
schema.GroupVersionKind
15+
1516
// This must be used for path-based routing by the webserver filter.
1617
URLName string
1718
}

internal/webserver/middleware/metrics.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func init() {
2323

2424
type httpResponseWriter struct {
2525
http.ResponseWriter
26+
2627
statusCode int
2728
}
2829

internal/webserver/webserver.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ func (n *kubeFilter) registerModules(ctx context.Context, root *mux.Router) {
415415
}
416416

417417
var selector labels.Selector
418+
418419
selector, err = mod.Handle(proxyTenants, proxyRequest)
419420

420421
switch {
@@ -578,6 +579,7 @@ func bearerExpirationTime(tokenString string) time.Time {
578579
claims, _ := token.Claims.(jwt.MapClaims)
579580

580581
var mil int64
582+
581583
switch iat := claims["exp"].(type) {
582584
case float64:
583585
mil = int64(iat)

0 commit comments

Comments
 (0)