Refactor, remove old code (#679)

p53 · web-flow · commit cfdb0e607aa7 · 2026-02-17T14:45:29.000+01:00
diff --git a/pkg/authorization/external_opa.go b/pkg/authorization/external_opa.go
@@ -180,6 +180,7 @@ func StartOpaServer(
 	}
 
 	errc := make(chan error)
+
 	for _, loop := range loops {
 		go func(serverLoop func() error) {
 			errc <- serverLoop()
diff --git a/pkg/authorization/resource_test.go b/pkg/authorization/resource_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/encryption/rotation_test.go b/pkg/encryption/rotation_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/encryption/self_signed_test.go b/pkg/encryption/self_signed_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2018 All rights reserved.
diff --git a/pkg/keycloak/client/client.go b/pkg/keycloak/client/client.go
@@ -147,8 +147,7 @@ func (client *Client) CreatePermissionTicket(
 	params := &keycloak_models.CreatePermissionTicketParams{}
 	params.ResourceID = resourceID
 	params.ResourceScopes = resourceScopes
-	permissions := make([]*keycloak_models.CreatePermissionTicketParams, 0)
-	permissions = append(permissions, params)
+	permissions := []*keycloak_models.CreatePermissionTicketParams{params}
 
 	errorResponse := &ResponseError{}
 	ticket := &keycloak_models.PermissionTicketRepresentation{}
diff --git a/pkg/keycloak/config/config_test.go b/pkg/keycloak/config/config_test.go
@@ -1135,6 +1135,7 @@ func TestIsAdminTLSFilesValid(t *testing.T) {
 					if err != nil {
 						t.Fatalf("Problem writing certificate %s", err)
 					}
+
 					defer os.Remove(certFile)
 				}
 
diff --git a/pkg/proxy/cli_test.go b/pkg/proxy/cli_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/proxy/cookie/cookies.go b/pkg/proxy/cookie/cookies.go
@@ -315,10 +315,7 @@ func (cm *Manager) dropCookieWithChunks(
 		cm.DropCookie(wrt, name, value[0:maxCookieChunkLength], duration)
 
 		for idx := maxCookieChunkLength; idx < len(value); idx += maxCookieChunkLength {
-			end := idx + maxCookieChunkLength
-			if end > len(value) {
-				end = len(value)
-			}
+			end := min(idx+maxCookieChunkLength, len(value))
 
 			cm.DropCookie(
 				wrt,
diff --git a/pkg/proxy/handlers/handlers.go b/pkg/proxy/handlers/handlers.go
@@ -321,7 +321,7 @@ func TokenHandler(
 			return
 		}
 
-		jsonMap := make(map[string]interface{})
+		jsonMap := make(map[string]any)
 
 		err = token.UnsafeClaimsWithoutVerification(&jsonMap)
 		if err != nil {
diff --git a/pkg/proxy/middleware/route_headers.go b/pkg/proxy/middleware/route_headers.go
@@ -114,7 +114,7 @@ func (hr *HeaderRouter) RouteAny(
 		hr.routes[header] = []HeaderRoute{}
 	}
 
-	patterns := []Pattern{}
+	patterns := make([]Pattern, 0, len(match))
 	for _, m := range match {
 		patterns = append(patterns, NewPattern(m, hr.matchingType))
 	}
diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go
@@ -26,7 +26,7 @@ import (
 
 func ProduceProxy(cfg configcore.Configs) (proxycore.OauthProxies, error) {
 	switch reflect.TypeOf(cfg) {
-	case reflect.TypeOf(&(keycloakconfig.Config{})):
+	case reflect.TypeFor[*keycloakconfig.Config]():
 		c, ok := cfg.(*keycloakconfig.Config)
 		if !ok {
 			panic("unexpected assertion problem")
diff --git a/pkg/storage/store_redis.go b/pkg/storage/store_redis.go
@@ -27,7 +27,7 @@ import (
 )
 
 type BasicRedis interface {
-	Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd
+	Set(ctx context.Context, key string, value any, expiration time.Duration) *redis.StatusCmd
 	Exists(ctx context.Context, key ...string) *redis.IntCmd
 	Get(ctx context.Context, key string) *redis.StringCmd
 	Del(ctx context.Context, key ...string) *redis.IntCmd
diff --git a/pkg/storage/stores_test.go b/pkg/storage/stores_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/testsuite/handlers_test.go b/pkg/testsuite/handlers_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/testsuite/misc_test.go b/pkg/testsuite/misc_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/testsuite/oauth_test.go b/pkg/testsuite/oauth_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.
diff --git a/pkg/testsuite/session_test.go b/pkg/testsuite/session_test.go
@@ -305,6 +305,7 @@ func TestIsExpired(t *testing.T) {
 	user := &models.UserContext{
 		ExpiresAt: time.Now(),
 	}
+
 	time.Sleep(1 * time.Millisecond)
 
 	if !user.IsExpired() {
@@ -330,7 +331,8 @@ func TestGetUserContext(t *testing.T) {
 }
 
 func TestGetUserRealmRoleContext(t *testing.T) {
-	roles := []string{"dsp-dev-vpn", "vpn-user", "dsp-prod-vpn", "openvpn:dev-vpn"}
+	roles := make([]string, 0, 5)
+	roles = append(roles, "dsp-dev-vpn", "vpn-user", "dsp-prod-vpn", "openvpn:dev-vpn")
 	token := NewTestToken("test")
 	token.addRealmRoles(roles)
 	jwtToken, err := token.GetToken()
diff --git a/pkg/testsuite/websocket_test.go b/pkg/testsuite/websocket_test.go
@@ -1,5 +1,4 @@
 //go:build !e2e
-// +build !e2e
 
 /*
 Copyright 2015 All rights reserved.

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,7 @@ func StartOpaServer(`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`errc := make(chan error)`
	`183`	`+`
`183`	`184`	`for _, loop := range loops {`
`184`	`185`	`go func(serverLoop func() error) {`
`185`	`186`	`errc <- serverLoop()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !e2e`
`2`		`-// +build !e2e`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2015 All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1135,6 +1135,7 @@ func TestIsAdminTLSFilesValid(t *testing.T) {`
`1135`	`1135`	`if err != nil {`
`1136`	`1136`	`t.Fatalf("Problem writing certificate %s", err)`
`1137`	`1137`	`}`
	`1138`	`+`
`1138`	`1139`	`defer os.Remove(certFile)`
`1139`	`1140`	`}`
`1140`	`1141`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func TokenHandler(`
`321`	`321`	`return`
`322`	`322`	`}`
`323`	`323`
`324`		`- jsonMap := make(map[string]interface{})`
	`324`	`+ jsonMap := make(map[string]any)`
`325`	`325`
`326`	`326`	`err = token.UnsafeClaimsWithoutVerification(&jsonMap)`
`327`	`327`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (hr *HeaderRouter) RouteAny(`
`114`	`114`	`hr.routes[header] = []HeaderRoute{}`
`115`	`115`	`}`
`116`	`116`
`117`		`- patterns := []Pattern{}`
	`117`	`+ patterns := make([]Pattern, 0, len(match))`
`118`	`118`	`for _, m := range match {`
`119`	`119`	`patterns = append(patterns, NewPattern(m, hr.matchingType))`
`120`	`120`	`}`