Add support for Avro logical types in rules (#35) (#2310)

confluentinc · Sep 10, 2024 · 8502af0 · 8502af0
1 parent 96e8d54
commit 8502af0
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
diff --git a/src/Confluent.SchemaRegistry.Rules/CelExecutor.cs b/src/Confluent.SchemaRegistry.Rules/CelExecutor.cs
@@ -246,6 +246,8 @@ private static Google.Api.Expr.V1Alpha1.Type FindTypeForAvroType(Avro.Schema sch
                     }
 
                     throw new ArgumentException("Unsupported union type");
+                case Avro.Schema.Type.Logical:
+                    return FindTypeForAvroType((schema as LogicalSchema).BaseSchema);
                 default:
                     throw new ArgumentException("Unsupported type " + type);
             }

diff --git a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj
@@ -34,7 +34,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-      <PackageReference Include="Cel.NET" Version="0.3.1" />
+      <PackageReference Include="Cel.NET" Version="0.3.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Confluent.SchemaRegistry.Serdes.Avro/AvroUtils.cs b/src/Confluent.SchemaRegistry.Serdes.Avro/AvroUtils.cs
@@ -165,6 +165,9 @@ private static RuleContext.Type GetType(Avro.Schema schema)
                 case Avro.Schema.Type.Boolean:
                     return RuleContext.Type.Boolean;
                 case Avro.Schema.Type.Null:
+                    return RuleContext.Type.Null;
+                case Avro.Schema.Type.Logical:
+                    return GetType((schema as LogicalSchema).BaseSchema);
                 default:
                     return RuleContext.Type.Null;
             }

diff --git a/test/Confluent.SchemaRegistry.Serdes.UnitTests/SerializeDeserialize.cs b/test/Confluent.SchemaRegistry.Serdes.UnitTests/SerializeDeserialize.cs
@@ -696,12 +696,12 @@ public void GenericRecordCELCondition()
             schema.RuleSet = new RuleSet(new List<Rule>(),
                 new List<Rule>
                 {
-                    new Rule("testCEL", RuleKind.Condition, RuleMode.Write, "CEL", null, null, 
+                    new Rule("testCEL", RuleKind.Condition, RuleMode.Write, "CEL", null, null,
                         "message.name == 'awesome'", null, null, false)
                 }
             );
             store[schemaStr] = 1;
-            subjectStore["topic-value"] = new List<RegisteredSchema> { schema }; 
+            subjectStore["topic-value"] = new List<RegisteredSchema> { schema };
             var config = new AvroSerializerConfig
             {
                 AutoRegisterSchemas = false,
@@ -724,6 +724,47 @@ public void GenericRecordCELCondition()
             Assert.Equal(user["favorite_number"], result["favorite_number"]);
         }
 
+        [Fact]
+        public void GenericRecordCELConditionLogicalType()
+        {
+            var uuid = "550e8400-e29b-41d4-a716-446655440000";
+            var schemaStr = "{\"type\":\"record\",\"name\":\"UserWithPic\",\"namespace\":\"Confluent.Kafka.Examples.AvroSpecific" +
+                    "\",\"fields\":[{\"name\":\"name\",\"type\":{\"type\":\"string\",\"logicalType\":\"uuid\"}},{\"name\":\"favorite_number\"," +
+                    "\"type\":[\"int\",\"null\"]},{\"name\":\"favorite_color\",\"type\":[\"string\",\"null\"]}," +
+                    "{\"name\":\"picture\",\"type\":[\"null\",\"bytes\"],\"default\":null}]}";
+
+            var schema = new RegisteredSchema("topic-value", 1, 1, schemaStr, SchemaType.Avro, null);
+            schema.RuleSet = new RuleSet(new List<Rule>(),
+                new List<Rule>
+                {
+                    new Rule("testCEL", RuleKind.Condition, RuleMode.Write, "CEL", null, null, 
+                        "message.name == '" + uuid + "'", null, null, false)
+                }
+            );
+            store[schemaStr] = 1;
+            subjectStore["topic-value"] = new List<RegisteredSchema> { schema }; 
+            var config = new AvroSerializerConfig
+            {
+                AutoRegisterSchemas = false,
+                UseLatestVersion = true
+            };
+            var serializer = new AvroSerializer<GenericRecord>(schemaRegistryClient, config);
+            var deserializer = new AvroDeserializer<GenericRecord>(schemaRegistryClient, null);
+
+            var user = new GenericRecord((RecordSchema) Avro.Schema.Parse(schemaStr));
+            user.Add("name", uuid);
+            user.Add("favorite_number", 100);
+            user.Add("favorite_color", "blue");
+
+            Headers headers = new Headers();
+            var bytes = serializer.SerializeAsync(user, new SerializationContext(MessageComponentType.Value, testTopic, headers)).Result;
+            var result = deserializer.DeserializeAsync(bytes, false, new SerializationContext(MessageComponentType.Value, testTopic, headers)).Result;
+
+            Assert.Equal(new Guid(uuid), result["name"]);
+            Assert.Equal(user["favorite_color"], result["favorite_color"]);
+            Assert.Equal(user["favorite_number"], result["favorite_number"]);
+        }
+
         [Fact]
         public void GenericRecordCELConditionFail()
         {