Skip to content

Commit 6c5177f

Browse files
committed
refactor(middleware): remove deprecated CreateMiddlewares function
• Simplifies middleware creation by using CreateAuthMiddleware directly • Cleans up test cases by removing references to deprecated function
1 parent a54717a commit 6c5177f

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

middleware/authzMiddlewares.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ import (
66
"github.com/platform-mesh/golang-commons/policy_services"
77
)
88

9-
// Deprecated: CreateMiddlewares use CreateAuthMiddleware instead.
10-
func CreateMiddlewares(retriever policy_services.TenantRetriever) []func(http.Handler) http.Handler {
11-
return CreateAuthMiddleware(retriever)
12-
}
13-
149
func CreateAuthMiddleware(retriever policy_services.TenantRetriever) []func(http.Handler) http.Handler {
1510
mws := make([]func(http.Handler) http.Handler, 0, 5)
1611

middleware/authzMiddlewares_test.go

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/platform-mesh/golang-commons/policy_services"
87
"github.com/stretchr/testify/assert"
98
"github.com/stretchr/testify/mock"
9+
10+
"github.com/platform-mesh/golang-commons/policy_services"
1011
)
1112

1213
// MockTenantRetriever is a mock implementation of TenantRetriever
@@ -19,20 +20,6 @@ func (m *MockTenantRetriever) RetrieveTenant(ctx context.Context) (string, error
1920
return args.String(0), args.Error(1)
2021
}
2122

22-
func TestCreateMiddlewares_Deprecated(t *testing.T) {
23-
mockRetriever := &MockTenantRetriever{}
24-
25-
middlewares := CreateMiddlewares(mockRetriever)
26-
27-
// Should return 3 middlewares (same as CreateAuthMiddleware)
28-
assert.Len(t, middlewares, 3)
29-
30-
// Each middleware should be a valid function
31-
for _, mw := range middlewares {
32-
assert.NotNil(t, mw)
33-
}
34-
}
35-
3623
func TestCreateAuthMiddleware(t *testing.T) {
3724
mockRetriever := &MockTenantRetriever{}
3825

@@ -76,20 +63,6 @@ func TestCreateAuthMiddleware_ReturnsCorrectMiddlewares(t *testing.T) {
7663
}
7764
}
7865

79-
func TestCreateMiddlewares_Equivalence(t *testing.T) {
80-
mockRetriever := &MockTenantRetriever{}
81-
82-
deprecatedMiddlewares := CreateMiddlewares(mockRetriever)
83-
newMiddlewares := CreateAuthMiddleware(mockRetriever)
84-
85-
// Both functions should return the same number of middlewares
86-
assert.Equal(t, len(deprecatedMiddlewares), len(newMiddlewares))
87-
88-
// Both should return 3 middlewares
89-
assert.Len(t, deprecatedMiddlewares, 3)
90-
assert.Len(t, newMiddlewares, 3)
91-
}
92-
9366
// Test that implements policy_services.TenantRetriever interface
9467
func TestTenantRetrieverInterface(t *testing.T) {
9568
mockRetriever := &MockTenantRetriever{}

0 commit comments

Comments
 (0)