fix issues found from review

Signed-off-by: Davanum Srinivas <[email protected]>

Author: dims

health-monitors/syslog-health-monitor/pkg/xid/parser/sidecar_test.go

@@ -118,9 +118,13 @@ func TestSidecarParser_Parse(t *testing.T) {
 
 				if tc.mockStatusCode == 200 && tc.mockResponse != nil {
 					w.Header().Set("Content-Type", "application/json")
-					_ = json.NewEncoder(w).Encode(tc.mockResponse)
+					if err := json.NewEncoder(w).Encode(tc.mockResponse); err != nil {
+						t.Fatalf("encode response: %v", err)
+					}
 				} else if tc.mockStatusCode != 200 {
-					_, _ = w.Write([]byte("Server error"))
+					if _, err := w.Write([]byte("Server error")); err != nil {
+						t.Fatalf("write error response: %v", err)
+					}
 				}
 			}))
 			defer server.Close()

node-drainer/pkg/config/config.go

@@ -167,10 +167,16 @@ func NewDatabaseConfig(databaseClientCertMountPath string) (config.DatabaseConfi
 	return config.NewDatabaseConfigFromEnv()
 }
 
-// NewTokenConfig creates a token configuration from environment config
+// NewTokenConfig is DEPRECATED and should not be used.
+// This function hardcoded ClientName="node-draining-module", which caused resume token
+// lookup failures because LoadEnvConfig uses ClientName="node-drainer".
+// Instead, use config.TokenConfigFromEnv("node-drainer") directly like other modules.
+//
+// Deprecated: Use config.TokenConfigFromEnv("node-drainer") instead.
 func NewTokenConfig(envConfig *EnvConfig) client.TokenConfig {
+	// Return config with the CORRECT ClientName to match what's used for token storage
 	return client.TokenConfig{
-		ClientName:      "node-draining-module",
+		ClientName:      "node-drainer", // Fixed: was "node-draining-module"
 		TokenDatabase:   envConfig.TokenDatabase,
 		TokenCollection: envConfig.TokenCollection,
 	}

node-drainer/pkg/initializer/init.go

@@ -55,10 +55,10 @@ type Components struct {
 func InitializeAll(ctx context.Context, params InitializationParams) (*Components, error) {
 	slog.Info("Starting node drainer initialization")
 
-	// Load environment configuration using the new unified system
-	envConfig, err := config.LoadEnvConfig()
+	// Load token configuration - preserves ClientName="node-drainer" for resume token lookups
+	tokenConfig, err := sdkconfig.TokenConfigFromEnv("node-drainer")
 	if err != nil {
-		return nil, fmt.Errorf("failed to load environment config: %w", err)
+		return nil, fmt.Errorf("failed to load token configuration: %w", err)
 	}
 
 	// Load datastore configuration using the new unified system
@@ -70,7 +70,6 @@ func InitializeAll(ctx context.Context, params InitializationParams) (*Component
 	// Convert to legacy DatabaseConfig interface for compatibility with existing factory
 	// Pass the certificate mount path to the adapter to handle path resolution at runtime
 	databaseConfig := adapter.ConvertDataStoreConfigToLegacyWithCertPath(dsConfig, params.DatabaseClientCertMountPath)
-	tokenConfig := config.NewTokenConfig(envConfig)
 	pipeline := config.NewQuarantinePipeline()
 
 	tomlCfg, err := config.LoadTomlConfig(params.TomlConfigPath)
@@ -95,7 +94,16 @@ func InitializeAll(ctx context.Context, params InitializationParams) (*Component
 	}
 
 	stateManager := initializeStateManager(clientSet)
-	reconcilerCfg := createReconcilerConfig(*tomlCfg, databaseConfig, tokenConfig, pipeline, stateManager)
+
+	// Convert store-client TokenConfig to client.TokenConfig type
+	// IMPORTANT: Preserves ClientName="node-drainer" for resume token lookups
+	clientTokenConfig := client.TokenConfig{
+		ClientName:      tokenConfig.ClientName,
+		TokenDatabase:   tokenConfig.TokenDatabase,
+		TokenCollection: tokenConfig.TokenCollection,
+	}
+
+	reconcilerCfg := createReconcilerConfig(*tomlCfg, databaseConfig, clientTokenConfig, pipeline, stateManager)
 
 	// Create client factory and database client
 	clientFactory := factory.NewClientFactory(databaseConfig)

scripts/validate-gomod.sh

@@ -191,11 +191,8 @@ check_mongodb_imports() {
 
     # Check for direct (non-indirect) MongoDB driver dependencies
     local mongodb_deps
-    if ! mongodb_deps=$(cd "$gomod_dir" && go list -m -f '{{if not .Indirect}}{{.Path}}{{end}}' all 2>/dev/null | grep "^go.mongodb.org/mongo-driver" || true); then
-        # go list failed, skip this check
-        return 0
-    fi
-    
+    mongodb_deps=$(cd "$gomod_dir" && go list -m -f '{{if not .Indirect}}{{.Path}}{{end}}' all 2>/dev/null | grep "^go.mongodb.org/mongo-driver" || true)
+
     if [[ -n "$mongodb_deps" ]]; then
         print_error "  ✗ Direct MongoDB driver dependency detected in go.mod:"
         print_error "    $mongodb_deps"

store-client/README.md

@@ -200,7 +200,7 @@ err := dbClient.WithTransaction(ctx, func(sessCtx client.SessionContext) error {
 
 ## Architecture
 
-```
+```text
 ┌─────────────────┐
 │  Your Module    │
 └────────┬────────┘

store-client/pkg/datastore/providers/mongodb/adapter.go

@@ -142,16 +142,9 @@ func (a *AdaptedMongoStore) Provider() datastore.DataStoreProvider {
 func (a *AdaptedMongoStore) CreateChangeStreamWatcher(ctx context.Context, clientName string,
 	pipeline interface{}) (datastore.ChangeStreamWatcher, error) {
 	// Use our existing factory to create a change stream watcher
-	tokenConfig := client.TokenConfig{
-		ClientName:      clientName,
-		TokenDatabase:   a.config.Connection.Database,
-		TokenCollection: "ResumeTokens", // Default token collection
-	}
-
-	// Check if token collection is specified in config
-	if tokenColl := a.config.Options["tokenCollection"]; tokenColl != "" {
-		tokenConfig.TokenCollection = tokenColl
-	}
+	// Note: Token configuration is loaded from environment variables by the factory
+	// via config.TokenConfigFromEnv(clientName). To customize token collection,
+	// set the MONGODB_TOKEN_COLLECTION_NAME environment variable.
 
 	// CRITICAL: Pass the existing databaseClient to avoid creating duplicate clients
 	watcher, err := a.factory.CreateChangeStreamWatcher(ctx, a.databaseClient, clientName, pipeline)