chore: address CR reviews

Author: lalitadithya

store-client/pkg/client/mongodb_client.go

@@ -1100,6 +1100,8 @@ func normalizeMongoTypes(doc map[string]interface{}) {
 }
 
 // normalizeValue converts a single value, handling MongoDB-specific types and nested structures
+//
+//nolint:cyclop // flat type switch: one independent branch per BSON type
 func normalizeValue(value interface{}) interface{} {
 	switch v := value.(type) {
 	case bson.DateTime:

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

@@ -474,6 +474,12 @@ func normalizeValue(v interface{}) interface{} {
 		return normalizeD(val)
 	case bson.A:
 		return normalizeArray(val)
+	case bson.M:
+		// bson.M is a defined type, not an alias for map[string]interface{}, so it
+		// does not match the case below. The collection client sets
+		// DefaultDocumentM, which makes this the shape documents actually decode
+		// into -- without this case the whole value is returned un-normalized.
+		return normalizeMap(val)
 	case map[string]interface{}:
 		return normalizeMap(val)
 	case []interface{}:

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

@@ -475,6 +475,34 @@ func TestNormalizeValue(t *testing.T) {
 				map[string]interface{}{"already": "normalized"},
 			},
 		},
+		{
+			// The collection client sets DefaultDocumentM, so documents decode
+			// into bson.M rather than bson.D. bson.M is a defined type, so it
+			// does not match the map[string]interface{} case.
+			name: "top-level bson.M with nested values",
+			input: bson.M{
+				"nodename": "test-node",
+				"metadata": bson.M{
+					"region": "us-west",
+				},
+				"nested_d": bson.D{{Key: "zone", Value: "a"}},
+				"items": bson.A{
+					bson.M{"name": "item1"},
+					bson.D{{Key: "name", Value: "item2"}},
+				},
+			},
+			expected: map[string]interface{}{
+				"nodename": "test-node",
+				"metadata": map[string]interface{}{
+					"region": "us-west",
+				},
+				"nested_d": map[string]interface{}{"zone": "a"},
+				"items": []interface{}{
+					map[string]interface{}{"name": "item1"},
+					map[string]interface{}{"name": "item2"},
+				},
+			},
+		},
 		{
 			name:     "primitive string",
 			input:    "test-string",

store-client/pkg/datastore/providers/mongodb/watcher/watch_store_test.go

@@ -37,7 +37,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 )
 
-func TestNewChangeStreamWatcher(t *testing.T) {
+func TestNewChangeStreamWatcher_InvalidTLSPaths_ReturnsClientOptsError(t *testing.T) {
 	t.Run("error in constructing client options", func(t *testing.T) {
 		mongoConfig := MongoDBConfig{
 			URI:        "mongodb://localhost:27017",
@@ -952,7 +952,7 @@ func TestCopyStructFields(t *testing.T) {
 	})
 }
 
-func TestGetCollectionClient(t *testing.T) {
+func TestGetCollectionClient_InvalidConfig_ReturnsError(t *testing.T) {
 	t.Run("error in constructing client options", func(t *testing.T) {
 		mongoConfig := MongoDBConfig{
 			URI:        "mongodb://localhost:27017",