fix linter issues

Author: ndyakov

maintnotifications/e2e/cmd/proxy-fi-server/Dockerfile

@@ -19,11 +19,21 @@ FROM alpine:latest
 
 RUN apk --no-cache add ca-certificates
 
+# Create a non-root user
+RUN addgroup -g 1000 appuser && \
+    adduser -D -u 1000 -G appuser appuser
+
 WORKDIR /app
 
 # Copy the binary from builder
 COPY --from=builder /proxy-fi-server .
 
+# Change ownership of the app directory
+RUN chown -R appuser:appuser /app
+
+# Switch to non-root user
+USER appuser
+
 # Expose the fault injector API port
 EXPOSE 5000
 

maintnotifications/e2e/notiftracker.go

@@ -249,62 +249,6 @@ func (tnh *TrackingNotificationsHook) increaseRelaxedTimeoutCount(notificationTy
 	}
 }
 
-// setupNotificationHook sets up tracking for both regular and cluster clients with notification hooks
-func setupNotificationHook(client redis.UniversalClient, hook maintnotifications.NotificationHook) {
-	if clusterClient, ok := client.(*redis.ClusterClient); ok {
-		setupClusterClientNotificationHook(clusterClient, hook)
-	} else if regularClient, ok := client.(*redis.Client); ok {
-		setupRegularClientNotificationHook(regularClient, hook)
-	}
-}
-
-// setupNotificationHooks sets up tracking for both regular and cluster clients with notification hooks
-func setupNotificationHooks(client redis.UniversalClient, hooks ...maintnotifications.NotificationHook) {
-	for _, hook := range hooks {
-		setupNotificationHook(client, hook)
-	}
-}
-
-// setupRegularClientNotificationHook sets up notification hook for regular clients
-func setupRegularClientNotificationHook(client *redis.Client, hook maintnotifications.NotificationHook) {
-	maintnotificationsManager := client.GetMaintNotificationsManager()
-	if maintnotificationsManager != nil {
-		maintnotificationsManager.AddNotificationHook(hook)
-	} else {
-		fmt.Printf("[TNH] Warning: Maintenance notifications manager not available for tracking\n")
-	}
-}
-
-// setupClusterClientNotificationHook sets up notification hook for cluster clients
-func setupClusterClientNotificationHook(client *redis.ClusterClient, hook maintnotifications.NotificationHook) {
-	ctx := context.Background()
-
-	// Register hook on existing nodes
-	err := client.ForEachShard(ctx, func(ctx context.Context, nodeClient *redis.Client) error {
-		maintnotificationsManager := nodeClient.GetMaintNotificationsManager()
-		if maintnotificationsManager != nil {
-			maintnotificationsManager.AddNotificationHook(hook)
-		} else {
-			fmt.Printf("[TNH] Warning: Maintenance notifications manager not available for tracking on node: %s\n", nodeClient.Options().Addr)
-		}
-		return nil
-	})
-
-	if err != nil {
-		fmt.Printf("[TNH] Warning: Failed to register timeout tracking hooks on existing cluster nodes: %v\n", err)
-	}
-
-	// Register hook on new nodes
-	client.OnNewNode(func(nodeClient *redis.Client) {
-		maintnotificationsManager := nodeClient.GetMaintNotificationsManager()
-		if maintnotificationsManager != nil {
-			maintnotificationsManager.AddNotificationHook(hook)
-		} else {
-			fmt.Printf("[TNH] Warning: Maintenance notifications manager not available for tracking on new node: %s\n", nodeClient.Options().Addr)
-		}
-	})
-}
-
 func (tnh *TrackingNotificationsHook) GetAnalysis() *DiagnosticsAnalysis {
 	return NewDiagnosticsAnalysis(tnh.GetDiagnosticsLog())
 }

maintnotifications/e2e/proxy_fault_injector_server.go

@@ -119,7 +119,9 @@ func (s *ProxyFaultInjectorServer) Start() error {
 
 	targetPort := 6379
 	if portStr := os.Getenv("REDIS_TARGET_PORT"); portStr != "" {
-		fmt.Sscanf(portStr, "%d", &targetPort)
+		if _, err := fmt.Sscanf(portStr, "%d", &targetPort); err != nil {
+			return fmt.Errorf("invalid REDIS_TARGET_PORT: %w", err)
+		}
 	}
 
 	// Parse cluster addresses
@@ -130,7 +132,9 @@ func (s *ProxyFaultInjectorServer) Start() error {
 
 	// Extract first port for initial node
 	var initialPort int
-	fmt.Sscanf(strings.Split(addrs[0], ":")[1], "%d", &initialPort)
+	if _, err := fmt.Sscanf(strings.Split(addrs[0], ":")[1], "%d", &initialPort); err != nil {
+		return fmt.Errorf("invalid port in cluster address %s: %w", addrs[0], err)
+	}
 
 	// Check if proxy is already running (e.g., in Docker)
 	proxyAlreadyRunning := false
@@ -181,7 +185,9 @@ func (s *ProxyFaultInjectorServer) Start() error {
 				if !proxyAlreadyRunning {
 					for i := 1; i < len(addrs); i++ {
 						var port int
-						fmt.Sscanf(strings.Split(addrs[i], ":")[1], "%d", &port)
+						if _, err := fmt.Sscanf(strings.Split(addrs[i], ":")[1], "%d", &port); err != nil {
+							return fmt.Errorf("invalid port in cluster address %s: %w", addrs[i], err)
+						}
 						if err := s.addProxyNode(port, targetPort, targetHost); err != nil {
 							return fmt.Errorf("failed to add node %d: %w", i, err)
 						}