Fix code-gen for enums with aliases. (#7253) (#7254)

github-actions[bot] · stevejgordon · web-flow · commit 1fdccf6a86c6 · 2023-02-27T17:05:58.000Z
* Update integration jobs version matrix

* Add GetDataStream serialization test

* Enum codegen now supports aliases for converters

Co-authored-by: Steve Gordon &lt;sgordon@hotmail.co.uk&gt;
diff --git a/.github/workflows/integration-jobs.yml b/.github/workflows/integration-jobs.yml
@@ -27,7 +27,7 @@ jobs:
           '8.3.3',
           '8.4.3',
           '8.5.3',
-          '8.6.1',
+          '8.6.2',
           '8.7.0-SNAPSHOT',
           'latest-8'
         ]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs
@@ -53,20 +53,28 @@ public override CalendarInterval Read(ref Utf8JsonReader reader, Type typeToConv
 		switch (enumString)
 		{
 			case "year":
+			case "1Y":
 				return CalendarInterval.Year;
 			case "week":
+			case "1w":
 				return CalendarInterval.Week;
 			case "second":
+			case "1s":
 				return CalendarInterval.Second;
 			case "quarter":
+			case "1q":
 				return CalendarInterval.Quarter;
 			case "month":
+			case "1M":
 				return CalendarInterval.Month;
 			case "minute":
+			case "1m":
 				return CalendarInterval.Minute;
 			case "hour":
+			case "1h":
 				return CalendarInterval.Hour;
 			case "day":
+			case "1d":
 				return CalendarInterval.Day;
 		}
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs
@@ -377,8 +377,10 @@ public override SegmentSortMode Read(ref Utf8JsonReader reader, Type typeToConve
 		switch (enumString)
 		{
 			case "min":
+			case "MIN":
 				return SegmentSortMode.Min;
 			case "max":
+			case "MAX":
 				return SegmentSortMode.Max;
 		}
 
@@ -419,8 +421,10 @@ public override SegmentSortOrder Read(ref Utf8JsonReader reader, Type typeToConv
 		switch (enumString)
 		{
 			case "desc":
+			case "DESC":
 				return SegmentSortOrder.Desc;
 			case "asc":
+			case "ASC":
 				return SegmentSortOrder.Asc;
 		}
 
@@ -537,8 +541,10 @@ public override TranslogDurability Read(ref Utf8JsonReader reader, Type typeToCo
 		switch (enumString)
 		{
 			case "request":
+			case "REQUEST":
 				return TranslogDurability.Request;
 			case "async":
+			case "ASYNC":
 				return TranslogDurability.Async;
 		}
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs
@@ -419,8 +419,14 @@ public override GeoOrientation Read(ref Utf8JsonReader reader, Type typeToConver
 		switch (enumString)
 		{
 			case "right":
+			case "RIGHT":
+			case "counterclockwise":
+			case "ccw":
 				return GeoOrientation.Right;
 			case "left":
+			case "LEFT":
+			case "clockwise":
+			case "cw":
 				return GeoOrientation.Left;
 		}
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs
@@ -470,10 +470,13 @@ public override HealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert,
 		switch (enumString)
 		{
 			case "yellow":
+			case "YELLOW":
 				return HealthStatus.Yellow;
 			case "red":
+			case "RED":
 				return HealthStatus.Red;
 			case "green":
+			case "GREEN":
 				return HealthStatus.Green;
 		}
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs
@@ -426,8 +426,10 @@ public override Operator Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 		switch (enumString)
 		{
 			case "or":
+			case "OR":
 				return Operator.Or;
 			case "and":
+			case "AND":
 				return Operator.And;
 		}
 
diff --git a/tests/Tests/IndexManagement/DataStreamManagement/GetDataStreamSerializationTests.cs b/tests/Tests/IndexManagement/DataStreamManagement/GetDataStreamSerializationTests.cs
@@ -0,0 +1,71 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Linq;
+using Elastic.Clients.Elasticsearch.IndexManagement;
+using Tests.Serialization;
+
+namespace Tests.IndexManagement.DataStreamManagement;
+
+public class GetDataStreamSerializationTests : SerializerTestBase
+{
+	[U]
+	public void GetIndexResponse_IsDeserializedCorrectly()
+	{
+		const string json = @"{
+  ""data_streams"": [
+    {
+      ""name"": ""logs-dev"",
+      ""timestamp_field"": {
+        ""name"": ""@timestamp""
+      },
+      ""indices"": [
+        {
+          ""index_name"": "".ds-logs-dev-2023.02.16-000001"",
+          ""index_uuid"": ""xyWXN5T1Rm6_sOCayv7GDA""
+        }
+      ],
+      ""generation"": 1,
+      ""_meta"": {
+        ""description"": ""default logs template installed by x-pack"",
+        ""managed"": true
+      },
+      ""status"": ""GREEN"",
+      ""template"": ""logs"",
+      ""ilm_policy"": ""logs"",
+      ""hidden"": false,
+      ""system"": false,
+      ""allow_custom_routing"": false,
+      ""replicated"": false
+    }
+  ]
+}";
+
+		var response = DeserializeJsonString<GetDataStreamResponse>(json);
+
+		response.DataStreams.Count.Should().Be(1);
+
+		var dataStream = response.DataStreams.First();
+
+		dataStream.Name.Should().Be("logs-dev");
+		dataStream.TimestampField.Name.Should().Be("@timestamp");
+
+		dataStream.Indices.Count.Should().Be(1);
+		var indices = dataStream.Indices.First();
+		indices.IndexName.Should().Be(".ds-logs-dev-2023.02.16-000001");
+		indices.IndexUuid.Should().Be("xyWXN5T1Rm6_sOCayv7GDA");
+
+		dataStream.Generation.Should().Be(1);
+		dataStream.Meta["description"].Should().Be("default logs template installed by x-pack");
+		dataStream.Meta["managed"].Should().Be(true);
+		dataStream.Status.Should().Be(HealthStatus.Green);
+		dataStream.Template.Should().Be("logs");
+		dataStream.IlmPolicy.Should().Be("logs");
+		dataStream.Hidden.Should().Be(false);
+		dataStream.System.Should().Be(false);
+		dataStream.AllowCustomRouting.Should().Be(false);
+		dataStream.Replicated.Should().Be(false);
+	}
+}
+

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ jobs:`
`27`	`27`	`'8.3.3',`
`28`	`28`	`'8.4.3',`
`29`	`29`	`'8.5.3',`
`30`		`- '8.6.1',`
	`30`	`+ '8.6.2',`
`31`	`31`	`'8.7.0-SNAPSHOT',`
`32`	`32`	`'latest-8'`
`33`	`33`	`]`
Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,10 @@ public override SegmentSortMode Read(ref Utf8JsonReader reader, Type typeToConve`
`377`	`377`	`switch (enumString)`
`378`	`378`	`{`
`379`	`379`	`case "min":`
	`380`	`+ case "MIN":`
`380`	`381`	`return SegmentSortMode.Min;`
`381`	`382`	`case "max":`
	`383`	`+ case "MAX":`
`382`	`384`	`return SegmentSortMode.Max;`
`383`	`385`	`}`
`384`	`386`
`@@ -419,8 +421,10 @@ public override SegmentSortOrder Read(ref Utf8JsonReader reader, Type typeToConv`
`419`	`421`	`switch (enumString)`
`420`	`422`	`{`
`421`	`423`	`case "desc":`
	`424`	`+ case "DESC":`
`422`	`425`	`return SegmentSortOrder.Desc;`
`423`	`426`	`case "asc":`
	`427`	`+ case "ASC":`
`424`	`428`	`return SegmentSortOrder.Asc;`
`425`	`429`	`}`
`426`	`430`
`@@ -537,8 +541,10 @@ public override TranslogDurability Read(ref Utf8JsonReader reader, Type typeToCo`
`537`	`541`	`switch (enumString)`
`538`	`542`	`{`
`539`	`543`	`case "request":`
	`544`	`+ case "REQUEST":`
`540`	`545`	`return TranslogDurability.Request;`
`541`	`546`	`case "async":`
	`547`	`+ case "ASYNC":`
`542`	`548`	`return TranslogDurability.Async;`
`543`	`549`	`}`
`544`	`550`
Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,14 @@ public override GeoOrientation Read(ref Utf8JsonReader reader, Type typeToConver`
`419`	`419`	`switch (enumString)`
`420`	`420`	`{`
`421`	`421`	`case "right":`
	`422`	`+ case "RIGHT":`
	`423`	`+ case "counterclockwise":`
	`424`	`+ case "ccw":`
`422`	`425`	`return GeoOrientation.Right;`
`423`	`426`	`case "left":`
	`427`	`+ case "LEFT":`
	`428`	`+ case "clockwise":`
	`429`	`+ case "cw":`
`424`	`430`	`return GeoOrientation.Left;`
`425`	`431`	`}`
`426`	`432`
Original file line number	Diff line number	Diff line change
`@@ -470,10 +470,13 @@ public override HealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert,`
`470`	`470`	`switch (enumString)`
`471`	`471`	`{`
`472`	`472`	`case "yellow":`
	`473`	`+ case "YELLOW":`
`473`	`474`	`return HealthStatus.Yellow;`
`474`	`475`	`case "red":`
	`476`	`+ case "RED":`
`475`	`477`	`return HealthStatus.Red;`
`476`	`478`	`case "green":`
	`479`	`+ case "GREEN":`
`477`	`480`	`return HealthStatus.Green;`
`478`	`481`	`}`
`479`	`482`
Original file line number	Diff line number	Diff line change
`@@ -426,8 +426,10 @@ public override Operator Read(ref Utf8JsonReader reader, Type typeToConvert, Jso`
`426`	`426`	`switch (enumString)`
`427`	`427`	`{`
`428`	`428`	`case "or":`
	`429`	`+ case "OR":`
`429`	`430`	`return Operator.Or;`
`430`	`431`	`case "and":`
	`432`	`+ case "AND":`
`431`	`433`	`return Operator.And;`
`432`	`434`	`}`
`433`	`435`