Skip to content

Commit d77f346

Browse files
all: remove unused parameters (zalando#2647)
Found via https://github.com/mvdan/unparam/tree/master Signed-off-by: Alexander Yastrebov <[email protected]>
1 parent ca0973c commit d77f346

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

dataclients/kubernetes/kubernetestest/fixtures.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func baseNoExt(n string) string {
6161

6262
// iterate over file names, looking for the ones with '.yaml' and '.eskip' extensions
6363
// and same name, tolerating other files among the fixtures.
64-
func rangeOverFixtures(t *testing.T, dir string, fs []os.FileInfo, test func(fixtureSet)) {
64+
func rangeOverFixtures(dir string, fs []os.FileInfo, test func(fixtureSet)) {
6565
// sort to ensure that the files belonging together by name are next to each other,
6666
// without extension
6767
sort.Slice(fs, func(i, j int) bool {
@@ -352,7 +352,7 @@ func FixturesToTest(t *testing.T, dirs ...string) {
352352
t.Fatal(err)
353353
}
354354

355-
rangeOverFixtures(t, dir, fs, func(f fixtureSet) {
355+
rangeOverFixtures(dir, fs, func(f fixtureSet) {
356356
t.Run(f.name, func(t *testing.T) {
357357
testFixture(t, f)
358358
})

filters/auth/oidc.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ func (f *tokenOidcFilter) callbackEndpoint(ctx filters.FilterContext) {
631631

632632
return
633633
}
634-
oidcIDToken, err = f.getidtoken(ctx, oauth2Token)
634+
oidcIDToken, err = f.getidtoken(oauth2Token)
635635
if err != nil {
636636
if _, ok := err.(*requestError); !ok {
637637
ctx.Logger().Errorf("Error while getting id token: %v", err)
@@ -660,7 +660,7 @@ func (f *tokenOidcFilter) callbackEndpoint(ctx filters.FilterContext) {
660660
return
661661
}
662662
case checkOIDCAnyClaims, checkOIDCAllClaims:
663-
oidcIDToken, err = f.getidtoken(ctx, oauth2Token)
663+
oidcIDToken, err = f.getidtoken(oauth2Token)
664664
if err != nil {
665665
if _, ok := err.(*requestError); !ok {
666666
ctx.Logger().Errorf("Error while getting id token: %v", err)
@@ -880,14 +880,14 @@ func (f *tokenOidcFilter) tokenClaims(ctx filters.FilterContext, oauth2Token *oa
880880
return nil, "", requestErrorf("claims do not contain sub")
881881
}
882882

883-
if err = f.handleDistributedClaims(r.Context(), idToken, oauth2Token, tokenMap); err != nil {
883+
if err = f.handleDistributedClaims(idToken, oauth2Token, tokenMap); err != nil {
884884
return nil, "", requestErrorf("failed to handle distributed claims: %v", err)
885885
}
886886

887887
return tokenMap, sub, nil
888888
}
889889

890-
func (f *tokenOidcFilter) getidtoken(ctx filters.FilterContext, oauth2Token *oauth2.Token) (string, error) {
890+
func (f *tokenOidcFilter) getidtoken(oauth2Token *oauth2.Token) (string, error) {
891891
rawIDToken, ok := oauth2Token.Extra("id_token").(string)
892892
if !ok {
893893
return "", requestErrorf("invalid token, no id_token field in oauth2 token")
@@ -966,7 +966,7 @@ func (f *tokenOidcFilter) getTokenWithExchange(state *OauthState, ctx filters.Fi
966966
// }
967967
// }
968968
// }
969-
func (f *tokenOidcFilter) handleDistributedClaims(ctx context.Context, idToken *oidc.IDToken, oauth2Token *oauth2.Token, claimsMap map[string]interface{}) error {
969+
func (f *tokenOidcFilter) handleDistributedClaims(idToken *oidc.IDToken, oauth2Token *oauth2.Token, claimsMap map[string]interface{}) error {
970970
// https://github.com/coreos/go-oidc/issues/171#issuecomment-1044286153
971971
var distClaims distributedClaims
972972
err := idToken.Claims(&distClaims)

filters/openpolicyagent/openpolicyagent.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func (registry *OpenPolicyAgentRegistry) NewOpenPolicyAgentInstance(bundleName s
261261
return instance, nil
262262
}
263263

264-
func (registry *OpenPolicyAgentRegistry) markUnused(inUse map[*OpenPolicyAgentInstance]struct{}) error {
264+
func (registry *OpenPolicyAgentRegistry) markUnused(inUse map[*OpenPolicyAgentInstance]struct{}) {
265265
registry.mu.Lock()
266266
defer registry.mu.Unlock()
267267

@@ -270,8 +270,6 @@ func (registry *OpenPolicyAgentRegistry) markUnused(inUse map[*OpenPolicyAgentIn
270270
registry.lastused[instance] = time.Now()
271271
}
272272
}
273-
274-
return nil
275273
}
276274

277275
func (registry *OpenPolicyAgentRegistry) newOpenPolicyAgentInstance(bundleName string, config OpenPolicyAgentInstanceConfig, filterName string) (*OpenPolicyAgentInstance, error) {

proxy/proxy.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ func (p *Proxy) lookupRoute(ctx *context) (rt *routing.Route, params map[string]
805805
return ctx.routeLookup.Do(ctx.request)
806806
}
807807

808-
func (p *Proxy) makeUpgradeRequest(ctx *context, req *http.Request) error {
808+
func (p *Proxy) makeUpgradeRequest(ctx *context, req *http.Request) {
809809
backendURL := req.URL
810810

811811
reverseProxy := httputil.NewSingleHostReverseProxy(backendURL)
@@ -824,7 +824,6 @@ func (p *Proxy) makeUpgradeRequest(ctx *context, req *http.Request) error {
824824
upgradeProxy.serveHTTP(ctx.responseWriter, req)
825825
ctx.successfulUpgrade = true
826826
ctx.Logger().Debugf("finished upgraded protocol %s session", getUpgradeRequest(ctx.request))
827-
return nil
828827
}
829828

830829
func (p *Proxy) makeBackendRequest(ctx *context, requestContext stdlibcontext.Context) (*http.Response, *proxyError) {
@@ -846,9 +845,7 @@ func (p *Proxy) makeBackendRequest(ctx *context, requestContext stdlibcontext.Co
846845
}
847846

848847
if p.experimentalUpgrade && isUpgradeRequest(req) {
849-
if err = p.makeUpgradeRequest(ctx, req); err != nil {
850-
return nil, &proxyError{err: err}
851-
}
848+
p.makeUpgradeRequest(ctx, req)
852849

853850
// We are not owner of the connection anymore.
854851
return nil, &proxyError{handled: true}

script/script.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,13 @@ func serveRequest(f filters.FilterContext) func(*lua.LState) int {
340340
return 1
341341
}
342342
res := &http.Response{}
343-
r.ForEach(serveTableWalk(s, res))
343+
r.ForEach(serveTableWalk(res))
344344
f.Serve(res)
345345
return 0
346346
}
347347
}
348348

349-
func serveTableWalk(s *lua.LState, res *http.Response) func(lua.LValue, lua.LValue) {
349+
func serveTableWalk(res *http.Response) func(lua.LValue, lua.LValue) {
350350
return func(k, v lua.LValue) {
351351
sk, ok := k.(lua.LString)
352352
if !ok {

0 commit comments

Comments
 (0)