DGS-19711 Support Protobuf oneof fields in Data Contract rules (#1921)

Author: rayokota

src/confluent_kafka/schema_registry/protobuf.py

@@ -993,6 +993,8 @@ def _transform_field(
             get_type(fd),
             get_inline_tags(fd)
         )
+        if fd.containing_oneof is not None and not message.HasField(fd.name):
+            return
         value = getattr(message, fd.name)
         if is_map_field(fd):
             value = {key: value[key] for key in value}
@@ -1051,6 +1053,7 @@ def get_type(fd: FieldDescriptor) -> FieldType:
 
 def is_map_field(fd: FieldDescriptor):
     return (fd.type == FieldDescriptor.TYPE_MESSAGE
+            and hasattr(fd.message_type, 'options')
             and fd.message_type.options.map_entry)
 
 

tests/schema_registry/data/proto/dep_pb2.py

@@ -14,6 +14,10 @@ message Author {
     (confluent.field_meta).tags = "PII"
   ];
   repeated string works = 4;
+  oneof pii_oneof {
+    Pizza oneof_message = 5;
+    string oneof_string = 6 [(.confluent.field_meta).tags = "PII"];
+  }
 }
 
 message Pizza {

tests/schema_registry/data/proto/example.proto

@@ -105,7 +105,8 @@ def test_proto_basic_serialization():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -130,7 +131,8 @@ def test_proto_basic_deserialization_no_client():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -289,7 +291,8 @@ def test_proto_cel_condition():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -335,7 +338,8 @@ def test_proto_cel_condition_fail():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -361,7 +365,7 @@ def test_proto_cel_field_transform():
         "CEL_FIELD",
         None,
         None,
-        "name == 'name' ; value + '-suffix'",
+        "typeName == 'STRING' ; value + '-suffix'",
         None,
         None,
         False
@@ -377,7 +381,8 @@ def test_proto_cel_field_transform():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -387,7 +392,8 @@ def test_proto_cel_field_transform():
         name='Kafka-suffix',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle-suffix', 'TheTrial-suffix'],
+        oneof_string='oneof-suffix'
     )
     deser_conf = {
         'use.deprecated.format': False
@@ -429,7 +435,8 @@ def test_proto_cel_field_condition():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -475,7 +482,8 @@ def test_proto_cel_field_condition_fail():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf)
     ser_ctx = SerializationContext(_TOPIC, MessageField.VALUE)
@@ -524,7 +532,8 @@ def test_proto_encryption():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
     ser = ProtobufSerializer(example_pb2.Author, client, conf=ser_conf, rule_conf=rule_conf)
     dek_client = executor.client
@@ -537,7 +546,8 @@ def test_proto_encryption():
         name='Kafka',
         id=123,
         picture=b'foobar',
-        works=['The Castle ', 'TheTrial']
+        works=['The Castle', 'TheTrial'],
+        oneof_string='oneof'
     )
 
     deser_conf = {