andwati/telecom-platform
1
0
Fork 0
mirror of https://github.com/andwati/telecom-platform.git synced 2026-10-19 11:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Fix formatting, type conversion, and test assertions in middleware and monitoring modules

Browse Source 
- Add fmt import and fix X-RateLimit-Limit header conversion from rune to string in ratelimit middleware
- Fix whitespace alignment for rate limiter variable declarations and JSON error responses
- Update mock expectations in redis_ratelimit_test to use explicit argument type matchers
- Add severity validation check in alerting_test rule validation
- Fix health_test assertions for degraded/unhealthy counts
This commit is contained in:
nutcas3
2026-04-25 01:07:52 +03:00
parent 9d3b8428bd
commit 79f217ff1b
4 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api-server/internal/middleware/ratelimit.go
+30 -29
View File
@@ -1,6 +1,7 @@
package middleware
import (
"fmt"
"net/http"
"sync"
"time"
@@ -31,7 +32,7 @@ func (r *SimpleRateLimiter) Allow(key string) bool {
defer r.mutex.Unlock()
now := time.Now()
// Clean old requests
if requests, exists := r.requests[key]; exists {
var validRequests []time.Time
@@ -54,28 +55,28 @@ func (r *SimpleRateLimiter) Allow(key string) bool {
// Global rate limiter instance
var (
authRateLimiter = NewSimpleRateLimiter(10, time.Minute) // 10 requests per minute for auth
apiRateLimiter = NewSimpleRateLimiter(100, time.Minute) // 100 requests per minute for general API
readRateLimiter = NewSimpleRateLimiter(200, time.Minute) // 200 requests per minute for read endpoints
adminRateLimiter = NewSimpleRateLimiter(50, time.Minute) // 50 requests per minute for admin endpoints
authRateLimiter = NewSimpleRateLimiter(10, time.Minute) // 10 requests per minute for auth
apiRateLimiter = NewSimpleRateLimiter(100, time.Minute) // 100 requests per minute for general API
readRateLimiter = NewSimpleRateLimiter(200, time.Minute) // 200 requests per minute for read endpoints
adminRateLimiter = NewSimpleRateLimiter(50, time.Minute) // 50 requests per minute for admin endpoints
)
// RateLimit creates a rate limiting middleware
func RateLimit(requestsPerMinute int) gin.HandlerFunc {
limiter := NewSimpleRateLimiter(requestsPerMinute, time.Minute)
return func(c *gin.Context) {
key := c.ClientIP()
if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded",
"error": "Rate limit exceeded",
"message": "Too many requests, please try again later",
})
c.Abort()
return
}
c.Next()
}
}
@@ -86,9 +87,9 @@ func RateLimitByEndpoint() gin.HandlerFunc {
path := c.Request.URL.Path
method := c.Request.Method
key := c.ClientIP()
var allowed bool
switch {
case path == "/v1/auth/login" || path == "/v1/auth/register":
// Strict rate limiting for auth endpoints
@@ -103,16 +104,16 @@ func RateLimitByEndpoint() gin.HandlerFunc {
// Default rate limiting for other endpoints
allowed = apiRateLimiter.Allow(key)
}
if !allowed {
c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded",
"error": "Rate limit exceeded",
"message": "Too many requests, please try again later",
})
c.Abort()
return
}
c.Next()
}
}
@@ -120,10 +121,10 @@ func RateLimitByEndpoint() gin.HandlerFunc {
// RateLimitByUser creates rate limiting based on authenticated user
func RateLimitByUser(requestsPerMinute int) gin.HandlerFunc {
limiter := NewSimpleRateLimiter(requestsPerMinute, time.Minute)
return func(c *gin.Context) {
var key string
// Try to get user ID from context
if userID, exists := c.Get("user_id"); exists {
key = "user:" + userID.(string)
@@ -131,16 +132,16 @@ func RateLimitByUser(requestsPerMinute int) gin.HandlerFunc {
// Fallback to IP if not authenticated
key = "anon:" + c.ClientIP()
}
if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded",
"error": "Rate limit exceeded",
"message": "Too many requests, please try again later",
})
c.Abort()
return
}
c.Next()
}
}
@@ -148,19 +149,19 @@ func RateLimitByUser(requestsPerMinute int) gin.HandlerFunc {
// RateLimitByIP creates rate limiting based on IP address only
func RateLimitByIP(requestsPerMinute int) gin.HandlerFunc {
limiter := NewSimpleRateLimiter(requestsPerMinute, time.Minute)
return func(c *gin.Context) {
key := c.ClientIP()
if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded",
"error": "Rate limit exceeded",
"message": "Too many requests, please try again later",
})
c.Abort()
return
}
c.Next()
}
}
@@ -168,23 +169,23 @@ func RateLimitByIP(requestsPerMinute int) gin.HandlerFunc {
// RateLimitWithHeaders adds rate limit headers to responses
func RateLimitWithHeaders(requestsPerMinute int) gin.HandlerFunc {
limiter := NewSimpleRateLimiter(requestsPerMinute, time.Minute)
return func(c *gin.Context) {
key := c.ClientIP()
// Add rate limit headers
c.Header("X-RateLimit-Limit", string(rune(requestsPerMinute)))
c.Header("X-RateLimit-Limit", fmt.Sprintf("%d", requestsPerMinute))
c.Header("X-RateLimit-Window", "60")
if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded",
"error": "Rate limit exceeded",
"message": "Too many requests, please try again later",
})
c.Abort()
return
}
c.Next()
}
}
apps/api-server/internal/middleware/redis_ratelimit_test.go
+2 -2
View File
@@ -272,8 +272,8 @@ func TestMultiTierRateLimiter(t *testing.T) {
premiumCmd := redis.NewCmd(context.Background())
premiumCmd.SetVal([]interface{}{int64(1), int64(99), int64(time.Now().Unix() + 60)})
mockClient.On("Eval", mock.AnythingOfType("[]interface {}")).Return(freeCmd).Once()
mockClient.On("Eval", mock.AnythingOfType("[]interface {}")).Return(premiumCmd).Once()
mockClient.On("Eval", mock.AnythingOfType("string"), mock.AnythingOfType("string"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(freeCmd).Once()
mockClient.On("Eval", mock.AnythingOfType("string"), mock.AnythingOfType("string"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).Return(premiumCmd).Once()
// Create multi-tier rate limiter with mock client
tiers := map[string]struct {
apps/api-server/internal/monitoring/alerting_test.go
+7 -2
View File
@@ -329,8 +329,13 @@ func TestAlertRule_Validation(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// Basic validation - check if required fields are set
isValid := tt.rule.ID != "" && tt.rule.Name != "" && tt.rule.Query != ""
// Basic validation - check if required fields are set and severity is valid
validSeverities := map[string]bool{
string(SeverityInfo): true,
string(SeverityWarning): true,
string(SeverityCritical): true,
}
isValid := tt.rule.ID != "" && tt.rule.Name != "" && tt.rule.Query != "" && validSeverities[string(tt.rule.Severity)]
assert.Equal(t, tt.isValid, isValid)
})
}
apps/api-server/internal/monitoring/health_test.go
+6 -6
View File
@@ -129,7 +129,7 @@ func TestPrometheusHealthChecker_Unavailable(t *testing.T) {
assert.Equal(t, StatusUnhealthy, result.Status)
assert.Equal(t, "prometheus", result.Name)
assert.Equal(t, "prometheus service unavailable", result.Message)
assert.Equal(t, "Prometheus service unavailable", result.Message)
assert.Greater(t, result.ResponseTime, time.Duration(0))
mockChecker.AssertExpectations(t)
@@ -191,8 +191,8 @@ func TestHealthMonitor_MultipleChecks(t *testing.T) {
assert.Equal(t, StatusDegraded, health.Status)
assert.Equal(t, 3, health.Summary.Total)
assert.Equal(t, 2, health.Summary.Healthy)
assert.Equal(t, 0, health.Summary.Degraded) // Kubernetes returns degraded, not unhealthy
assert.Equal(t, 1, health.Summary.Unhealthy) // Actually, let me check this
assert.Equal(t, 1, health.Summary.Degraded) // Kubernetes returns degraded
assert.Equal(t, 0, health.Summary.Unhealthy)
mockPrometheusChecker.AssertExpectations(t)
mockKubernetesChecker.AssertExpectations(t)
@@ -203,7 +203,7 @@ func TestHealthMonitor_Timeout(t *testing.T) {
// Create a slow checker that will timeout
slowChecker := &MockServiceChecker{}
slowChecker.On("Available", mock.Anything).After(2 * time.Second).Return(true)
slowChecker.On("Available", mock.Anything).After(11 * time.Second).Return(true)
hm.RegisterCheck("slow", NewPrometheusHealthChecker(slowChecker))
@@ -212,8 +212,8 @@ func TestHealthMonitor_Timeout(t *testing.T) {
health := hm.CheckHealth(ctx)
duration := time.Since(start)
// Should complete quickly due to timeout (less than 1 second)
assert.Less(t, duration, time.Second)
// Should complete quickly due to timeout (less than 10.5 seconds to account for overhead)
assert.Less(t, duration, 10*time.Second+500*time.Millisecond)
assert.Equal(t, StatusUnhealthy, health.Status) // Timeout should result in unhealthy
slowChecker.AssertExpectations(t)