Addressing review comments

Author: cbumb

janitor-provider/pkg/csp/kind/kind.go

@@ -169,8 +169,10 @@ func (c *Client) deleteAndVerifyContainer(
 		return fmt.Errorf("failed to verify container deletion: %w", err)
 	}
 
-	if strings.Contains(string(output), containerName) {
-		return fmt.Errorf("container %s still exists after deletion attempt", containerName)
+	for _, line := range strings.Split(strings.TrimSpace(string(output)), "\n") {
+		if line == containerName {
+			return fmt.Errorf("container %s still exists after deletion attempt", containerName)
+		}
 	}
 
 	return nil

store-client/pkg/client/postgresql_changestream.go

@@ -383,28 +383,43 @@ func (w *PostgreSQLChangeStreamWatcher) matchesPipeline(entry *postgresqlEvent)
 	}
 
 	for _, stage := range w.pipeline {
-		matchFilter, ok := stage["$match"]
-		if !ok {
-			continue
+		if !w.matchesStage(stage, entry) {
+			return false
 		}
+	}
 
-		matchMap, ok := matchFilter.(map[string]interface{})
-		if !ok {
-			continue
-		}
+	return true
+}
 
-		if opType, ok := matchMap["operationType"]; ok {
-			expectedOps := mapOperationTypes(opType)
-			if len(expectedOps) == 0 || !slices.Contains(expectedOps, entry.operation) {
-				return false
-			}
-		}
+func (w *PostgreSQLChangeStreamWatcher) matchesStage(
+	stage map[string]interface{}, entry *postgresqlEvent,
+) bool {
+	matchFilter, ok := stage["$match"]
+	if !ok {
+		return true
+	}
+
+	matchMap, ok := matchFilter.(map[string]interface{})
+	if !ok {
+		return true
+	}
 
-		if entry.newValues != nil && !w.matchesFilters(matchMap, entry.newValues) {
+	if opType, ok := matchMap["operationType"]; ok {
+		expectedOps := mapOperationTypes(opType)
+		if len(expectedOps) == 0 || !slices.Contains(expectedOps, entry.operation) {
 			return false
 		}
 	}
 
+	values := entry.newValues
+	if values == nil {
+		values = entry.oldValues
+	}
+
+	if values == nil || !w.matchesFilters(matchMap, values) {
+		return false
+	}
+
 	return true
 }
 

store-client/pkg/config/env_loader.go

@@ -192,12 +192,12 @@ func NewDatabaseConfigWithCollection(
 	// Load required MongoDB environment variables
 	connectionURI, err := getRequiredEnv(EnvMongoDBURI)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load MONGODB_URI: %w", err)
 	}
 
 	databaseName, err := getRequiredEnv(EnvMongoDBDatabaseName)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load MONGODB_DATABASE_NAME: %w", err)
 	}
 
 	// Determine which collection environment variable to use
@@ -243,17 +243,17 @@ func NewDatabaseConfigWithCollection(
 func newPostgreSQLCompatibleConfig(certMountPath, tableEnvVar, defaultTable string) (DatabaseConfig, error) {
 	host, err := getRequiredEnv("DATASTORE_HOST")
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load DATASTORE_HOST: %w", err)
 	}
 
 	database, err := getRequiredEnv("DATASTORE_DATABASE")
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load DATASTORE_DATABASE: %w", err)
 	}
 
 	username, err := getRequiredEnv("DATASTORE_USERNAME")
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load DATASTORE_USERNAME: %w", err)
 	}
 
 	port := getEnvWithDefault("DATASTORE_PORT", "5432")
@@ -436,12 +436,12 @@ func getPositiveIntEnvVarWithFallback(preferredName, legacyName string, defaultV
 func TokenConfigFromEnv(clientName string) (TokenConfig, error) {
 	tokenDatabase, err := getRequiredEnv(EnvMongoDBDatabaseName)
 	if err != nil {
-		return TokenConfig{}, err
+		return TokenConfig{}, fmt.Errorf("failed to load MONGODB_DATABASE_NAME: %w", err)
 	}
 
 	tokenCollection, err := getRequiredEnv(EnvMongoDBTokenCollectionName)
 	if err != nil {
-		return TokenConfig{}, err
+		return TokenConfig{}, fmt.Errorf("failed to load MONGODB_TOKEN_COLLECTION_NAME: %w", err)
 	}
 
 	return TokenConfig{

store-client/pkg/datastore/providers/postgresql/database_client.go

@@ -872,7 +872,7 @@ func (c *PostgreSQLDatabaseClient) FindOne(
 
 		whereClause, args, err = c.resolveFilterMapForFind(filter)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("resolving filter for FindOne: %w", err)
 		}
 	}
 
@@ -921,7 +921,7 @@ func (c *PostgreSQLDatabaseClient) Find(
 
 		whereClause, args, err = c.resolveFilterMapForFind(filter)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("resolving filter for Find: %w", err)
 		}
 	}