fix: convert listValues to lists

Signed-off-by: Jesús Fernández <[email protected]>
crossplane · Oct 17, 2024 · f6750cf · f6750cf
1 parent fde5b7e
commit f6750cf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/crossplane/function/proto/v1/run_function_pb2_grpc.py b/crossplane/function/proto/v1/run_function_pb2_grpc.py
@@ -5,7 +5,7 @@
 
 from crossplane.function.proto.v1 import run_function_pb2 as crossplane_dot_function_dot_proto_dot_v1_dot_run__function__pb2
 
-GRPC_GENERATED_VERSION = '1.66.0'
+GRPC_GENERATED_VERSION = '1.66.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

diff --git a/crossplane/function/proto/v1beta1/run_function_pb2_grpc.py b/crossplane/function/proto/v1beta1/run_function_pb2_grpc.py
@@ -5,7 +5,7 @@
 
 from crossplane.function.proto.v1beta1 import run_function_pb2 as crossplane_dot_function_dot_proto_dot_v1beta1_dot_run__function__pb2
 
-GRPC_GENERATED_VERSION = '1.66.0'
+GRPC_GENERATED_VERSION = '1.66.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

diff --git a/crossplane/function/resource.py b/crossplane/function/resource.py
@@ -70,7 +70,11 @@ def struct_to_dict(s: structpb.Struct) -> dict:
     dictionary.
     """
     return {
-        k: (struct_to_dict(v) if isinstance(v, structpb.Struct) else v)
+        k: (
+            struct_to_dict(v)
+            if isinstance(v, structpb.Struct)
+            else (list(v) if isinstance(v, structpb.ListValue) else v)
+        )
         for k, v in s.items()
     }
 

diff --git a/tests/test_resource.py b/tests/test_resource.py
@@ -275,6 +275,28 @@ class TestCase:
                 ),
                 want={"foo": {"bar": "baz"}},
             ),
+            TestCase(
+                reason="Convert a nested struct containing ListValues to a dictionary.",
+                s=structpb.Struct(
+                    fields={
+                        "foo": structpb.Value(
+                            struct_value=structpb.Struct(
+                                fields={
+                                    "bar": structpb.Value(
+                                        list_value=structpb.ListValue(
+                                            values=[
+                                                structpb.Value(string_value="baz"),
+                                                structpb.Value(string_value="qux"),
+                                            ]
+                                        )
+                                    )
+                                }
+                            )
+                        )
+                    }
+                ),
+                want={"foo": {"bar": ["baz", "qux"]}},
+            ),
         ]
 
         for case in cases: