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

- 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
@@ -1,6 +1,7 @@
package middleware package middleware
import ( import (
"fmt"
"net/http" "net/http"
"sync" "sync"
"time" "time"
@@ -54,10 +55,10 @@ func (r *SimpleRateLimiter) Allow(key string) bool {
// Global rate limiter instance // Global rate limiter instance
var ( var (
authRateLimiter = NewSimpleRateLimiter(10, time.Minute) // 10 requests per minute for auth authRateLimiter = NewSimpleRateLimiter(10, time.Minute) // 10 requests per minute for auth
apiRateLimiter = NewSimpleRateLimiter(100, time.Minute) // 100 requests per minute for general API apiRateLimiter = NewSimpleRateLimiter(100, time.Minute) // 100 requests per minute for general API
readRateLimiter = NewSimpleRateLimiter(200, time.Minute) // 200 requests per minute for read endpoints readRateLimiter = NewSimpleRateLimiter(200, time.Minute) // 200 requests per minute for read endpoints
adminRateLimiter = NewSimpleRateLimiter(50, time.Minute) // 50 requests per minute for admin endpoints adminRateLimiter = NewSimpleRateLimiter(50, time.Minute) // 50 requests per minute for admin endpoints
) )
// RateLimit creates a rate limiting middleware // RateLimit creates a rate limiting middleware
@@ -69,7 +70,7 @@ func RateLimit(requestsPerMinute int) gin.HandlerFunc {
if !limiter.Allow(key) { if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{ c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded", "error": "Rate limit exceeded",
"message": "Too many requests, please try again later", "message": "Too many requests, please try again later",
}) })
c.Abort() c.Abort()
@@ -106,7 +107,7 @@ func RateLimitByEndpoint() gin.HandlerFunc {
if !allowed { if !allowed {
c.JSON(http.StatusTooManyRequests, gin.H{ c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded", "error": "Rate limit exceeded",
"message": "Too many requests, please try again later", "message": "Too many requests, please try again later",
}) })
c.Abort() c.Abort()
@@ -134,7 +135,7 @@ func RateLimitByUser(requestsPerMinute int) gin.HandlerFunc {
if !limiter.Allow(key) { if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{ c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded", "error": "Rate limit exceeded",
"message": "Too many requests, please try again later", "message": "Too many requests, please try again later",
}) })
c.Abort() c.Abort()
@@ -154,7 +155,7 @@ func RateLimitByIP(requestsPerMinute int) gin.HandlerFunc {
if !limiter.Allow(key) { if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{ c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded", "error": "Rate limit exceeded",
"message": "Too many requests, please try again later", "message": "Too many requests, please try again later",
}) })
c.Abort() c.Abort()
@@ -173,12 +174,12 @@ func RateLimitWithHeaders(requestsPerMinute int) gin.HandlerFunc {
key := c.ClientIP() key := c.ClientIP()
// Add rate limit headers // 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") c.Header("X-RateLimit-Window", "60")
if !limiter.Allow(key) { if !limiter.Allow(key) {
c.JSON(http.StatusTooManyRequests, gin.H{ c.JSON(http.StatusTooManyRequests, gin.H{
"error": "Rate limit exceeded", "error": "Rate limit exceeded",
"message": "Too many requests, please try again later", "message": "Too many requests, please try again later",
}) })
c.Abort() c.Abort()
@@ -272,8 +272,8 @@ func TestMultiTierRateLimiter(t *testing.T) {
premiumCmd := redis.NewCmd(context.Background()) premiumCmd := redis.NewCmd(context.Background())
premiumCmd.SetVal([]interface{}{int64(1), int64(99), int64(time.Now().Unix() + 60)}) 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("string"), mock.AnythingOfType("string"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64"), mock.AnythingOfType("int64")).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(premiumCmd).Once()
// Create multi-tier rate limiter with mock client // Create multi-tier rate limiter with mock client
tiers := map[string]struct { tiers := map[string]struct {
@@ -329,8 +329,13 @@ func TestAlertRule_Validation(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// Basic validation - check if required fields are set // Basic validation - check if required fields are set and severity is valid
isValid := tt.rule.ID != "" && tt.rule.Name != "" && tt.rule.Query != "" 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) assert.Equal(t, tt.isValid, isValid)
}) })
} }
@@ -129,7 +129,7 @@ func TestPrometheusHealthChecker_Unavailable(t *testing.T) {
assert.Equal(t, StatusUnhealthy, result.Status) assert.Equal(t, StatusUnhealthy, result.Status)
assert.Equal(t, "prometheus", result.Name) 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)) assert.Greater(t, result.ResponseTime, time.Duration(0))
mockChecker.AssertExpectations(t) mockChecker.AssertExpectations(t)
@@ -191,8 +191,8 @@ func TestHealthMonitor_MultipleChecks(t *testing.T) {
assert.Equal(t, StatusDegraded, health.Status) assert.Equal(t, StatusDegraded, health.Status)
assert.Equal(t, 3, health.Summary.Total) assert.Equal(t, 3, health.Summary.Total)
assert.Equal(t, 2, health.Summary.Healthy) 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.Degraded) // Kubernetes returns degraded
assert.Equal(t, 1, health.Summary.Unhealthy) // Actually, let me check this assert.Equal(t, 0, health.Summary.Unhealthy)
mockPrometheusChecker.AssertExpectations(t) mockPrometheusChecker.AssertExpectations(t)
mockKubernetesChecker.AssertExpectations(t) mockKubernetesChecker.AssertExpectations(t)
@@ -203,7 +203,7 @@ func TestHealthMonitor_Timeout(t *testing.T) {
// Create a slow checker that will timeout // Create a slow checker that will timeout
slowChecker := &MockServiceChecker{} 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)) hm.RegisterCheck("slow", NewPrometheusHealthChecker(slowChecker))
@@ -212,8 +212,8 @@ func TestHealthMonitor_Timeout(t *testing.T) {
health := hm.CheckHealth(ctx) health := hm.CheckHealth(ctx)
duration := time.Since(start) duration := time.Since(start)
// Should complete quickly due to timeout (less than 1 second) // Should complete quickly due to timeout (less than 10.5 seconds to account for overhead)
assert.Less(t, duration, time.Second) assert.Less(t, duration, 10*time.Second+500*time.Millisecond)
assert.Equal(t, StatusUnhealthy, health.Status) // Timeout should result in unhealthy assert.Equal(t, StatusUnhealthy, health.Status) // Timeout should result in unhealthy
slowChecker.AssertExpectations(t) slowChecker.AssertExpectations(t)