dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: address code review comments 

Signed-off-by: nelson.parente <nelson_parente@live.com.pt>
This commit is contained in:
nelson.parente 2025-07-25 15:21:25 +01:00
parent 73cc8ebe71
commit 8ed806b51a
No known key found for this signature in database
GPG Key ID: A6DF84B8116B7D28
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/http/oauth2/oauth2_middleware_test.go
View File

@ -75,7 +75,8 @@ func TestOAuth2CreatesAuthorizationHeaderGetNativeMetadata(t *testing.T) {
} }
log := logger.NewLogger("oauth2.test") log := logger.NewLogger("oauth2.test")
oauth2Middleware, _ := NewOAuth2Middleware(log).(*Middleware) oauth2Middleware, ok := NewOAuth2Middleware(log).(*Middleware)
require.True(t, ok)
tc := []struct { tc := []struct {
name string name string
@ -90,7 +91,6 @@ func TestOAuth2CreatesAuthorizationHeaderGetNativeMetadata(t *testing.T) {
{name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true}, {name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true},
{name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, {name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true},
{name: "unopened 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 { for _, tt := range tc {

4
middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go
View File

@ -121,7 +121,7 @@ func (m *Middleware) GetHandler(_ context.Context, metadata middleware.Metadata)
return 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) token, err := m.tokenProvider.GetToken(r.Context(), conf)
if err != nil { if err != nil {
m.log.Errorf("Error acquiring token: %s", err) m.log.Errorf("Error acquiring token: %s", err)
@ -160,7 +160,7 @@ func (m *Middleware) getNativeMetadata(metadata middleware.Metadata) (*oAuth2Cli
if middlewareMetadata.PathFilter != "" { if middlewareMetadata.PathFilter != "" {
rx, err := regexp.Compile(middlewareMetadata.PathFilter) rx, err := regexp.Compile(middlewareMetadata.PathFilter)
if err != nil { 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 middlewareMetadata.pathFilterRegex = rx
} }

6
middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_benchmark_test.go
View File

@ -56,7 +56,8 @@ func BenchmarkTestOAuth2ClientCredentialsGetHandler(b *testing.B) {
} }
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(b, ok)
oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider)
handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata) handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata)
require.NoError(b, err) require.NoError(b, err)
@ -97,7 +98,8 @@ func BenchmarkTestOAuth2ClientCredentialsGetHandlerWithPathFilter(b *testing.B)
} }
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(b, ok)
oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider)
handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata) handler, err := oauth2clientcredentialsMiddleware.GetHandler(b.Context(), metadata)
require.NoError(b, err) require.NoError(b, err)

13
middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go
View File

@ -108,7 +108,8 @@ func TestOAuth2ClientCredentialsToken(t *testing.T) {
// Initialize middleware component and inject mocked TokenProvider // Initialize middleware component and inject mocked TokenProvider
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(t, ok)
oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider)
handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata)
require.NoError(t, err) require.NoError(t, err)
@ -168,7 +169,8 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) {
// Initialize middleware component and inject mocked TokenProvider // Initialize middleware component and inject mocked TokenProvider
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(t, ok)
oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider)
handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata)
require.NoError(t, err) require.NoError(t, err)
@ -203,7 +205,8 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) {
func TestOAuth2ClientCredentialsPathFilterGetNativeMetadata(t *testing.T) { func TestOAuth2ClientCredentialsPathFilterGetNativeMetadata(t *testing.T) {
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
m, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) m, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(t, ok)
baseMiddlewareMetadata := middleware.Metadata{ baseMiddlewareMetadata := middleware.Metadata{
Base: metadata.Base{ Base: metadata.Base{
@ -231,7 +234,6 @@ func TestOAuth2ClientCredentialsPathFilterGetNativeMetadata(t *testing.T) {
{name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true}, {name: "invalid wildcard pathFilter", pathFilter: "*invalid", wantErr: true},
{name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true}, {name: "unclosed parenthesis pathFilter", pathFilter: "invalid(", wantErr: true},
{name: "unopened 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 { for _, tt := range tc {
@ -280,7 +282,8 @@ func TestOAuth2ClientCredentialsPathFilterGetHandler(t *testing.T) {
} }
log := logger.NewLogger("oauth2clientcredentials.test") log := logger.NewLogger("oauth2clientcredentials.test")
oauth2clientcredentialsMiddleware, _ := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware) oauth2clientcredentialsMiddleware, ok := NewOAuth2ClientCredentialsMiddleware(log).(*Middleware)
require.True(t, ok)
oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider) oauth2clientcredentialsMiddleware.SetTokenProvider(mockTokenProvider)
handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata) handler, err := oauth2clientcredentialsMiddleware.GetHandler(t.Context(), metadata)
require.NoError(t, err) require.NoError(t, err)