fix: convert listValues to lists in nested structs

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
 

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
 

crossplane/function/resource.py

@@ -16,6 +16,7 @@
 
 import dataclasses
 import datetime
+from typing import Any
 
 import pydantic
 from google.protobuf import struct_pb2 as structpb
@@ -62,17 +63,28 @@ def dict_to_struct(d: dict) -> structpb.Struct:
  return s
 
 
+def __to_python_native(v: structpb.Value) -> Any:
+ """Convert a protobuf Value to a Python native type."""
+ if isinstance(v, structpb.ListValue):
+ return __listvalue_to_list(v)
+ elif isinstance(v, structpb.Struct):
+ return struct_to_dict(v)
+ return v
+
+
+def __listvalue_to_list(lv: structpb.ListValue) -> list:
+ """Convert a protobuf ListValue to a list."""
+ return [__to_python_native(v) for v in lv]
+
+
 def struct_to_dict(s: structpb.Struct) -> dict:
  """Create a dict from the supplied Struct well-known type.
 
  Crossplane sends observed and desired resources to a function encoded as a
  protobuf struct. This function makes it possible to convert resources to a
  dictionary.
  """
- return {
- k: (struct_to_dict(v) if isinstance(v, structpb.Struct) else v)
- for k, v in s.items()
- }
+ return {k: __to_python_native(v) for k, v in s.items()}
 
 
 @dataclasses.dataclass

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: