diff --git a/middleware/http/oauth2/oauth2_middleware_test.go b/middleware/http/oauth2/oauth2_middleware_test.go index c770a6f3d..e8f67e418 100644 --- a/middleware/http/oauth2/oauth2_middleware_test.go +++ b/middleware/http/oauth2/oauth2_middleware_test.go @@ -75,7 +75,8 @@ func TestOAuth2CreatesAuthorizationHeaderGetNativeMetadata(t *testing.T) { } log := logger.NewLogger("oauth2.test") - oauth2Middleware, _ := NewOAuth2Middleware(log).(*Middleware) + oauth2Middleware, ok := NewOAuth2Middleware(log).(*Middleware) + require.True(t, ok) tc := []struct { name string @@ -90,7 +91,6 @@ func TestOAuth2CreatesAuthorizationHeaderGetNativeMetadata(t *testing.T) { {name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true}, {name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, {name: "unopened parenthesis pathFilter", pathFilter: "invalid)", wantErr: true}, - {name: "duplicate unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, } for _, tt := range tc { diff --git a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go index c50dd420a..32fd03e5c 100644 --- a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go +++ b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go @@ -121,7 +121,7 @@ func (m *Middleware) GetHandler(_ context.Context, metadata middleware.Metadata) return } - m.log.Infof("Cached token not found, try get one") + m.log.Infof("Cached token not found, attempting to retrieve a new one") token, err := m.tokenProvider.GetToken(r.Context(), conf) if err != nil { m.log.Errorf("Error acquiring token: %s", err) @@ -160,7 +160,7 @@ func (m *Middleware) getNativeMetadata(metadata middleware.Metadata) (*oAuth2Cli if middlewareMetadata.PathFilter != "" { rx, err := regexp.Compile(middlewareMetadata.PathFilter) if err != nil { - errorString += fmt.Sprintf("Parameter 'pathFilter' is not a valid regex: %s. ", err) + errorString += "Parameter 'pathFilter' is not a valid regex: " + err.Error() + ". " } middlewareMetadata.pathFilterRegex = rx } diff --git a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_benchmark_test.go b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_benchmark_test.go index 8b075742c..032cbc11d 100644 --- a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_benchmark_test.go +++ b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_benchmark_test.go @@ -56,7 +56,8 @@ func BenchmarkTestOAuth2ClientCredentialsGetHandler(b *testing.B) { } log := logger.NewLogger("oauth2clientcredentials.test") - oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(b, ok) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata) require.NoError(b, err) @@ -97,7 +98,8 @@ func BenchmarkTestOAuth2ClientCredentialsGetHandlerWithPathFilter(b *testing.B) } log := logger.NewLogger("oauth2clientcredentials.test") - oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(b, ok) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata) require.NoError(b, err) diff --git a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go index 75e8d9fda..7fdbc86c6 100644 --- a/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go +++ b/middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go @@ -108,7 +108,8 @@ func TestOAuth2ClientCredentialsToken(t *testing.T) { // Initialize middleware component and inject mocked TokenProvider log := logger.NewLogger("oauth2clientcredentials.test") - oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(t, ok) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) require.NoError(t, err) @@ -168,7 +169,8 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) { // Initialize middleware component and inject mocked TokenProvider log := logger.NewLogger("oauth2clientcredentials.test") - oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(t, ok) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) require.NoError(t, err) @@ -203,7 +205,8 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) { func TestOAuth2ClientCredentialsPathFilterGetNativeMetadata(t *testing.T) { log := logger.NewLogger("oauth2clientcredentials.test") - m, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + m, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(t, ok) baseMiddlewareMetadata := middleware.Metadata{ Base: metadata.Base{ @@ -231,7 +234,6 @@ func TestOAuth2ClientCredentialsPathFilterGetNativeMetadata(t *testing.T) { {name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true}, {name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, {name: "unopened parenthesis pathFilter", pathFilter: "invalid)", wantErr: true}, - {name: "duplicate unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, } for _, tt := range tc { @@ -280,7 +282,8 @@ func TestOAuth2ClientCredentialsPathFilterGetHandler(t *testing.T) { } log := logger.NewLogger("oauth2clientcredentials.test") - oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) + require.True(t, ok) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) require.NoError(t, err)