From d0a18ed9676e5f7e3047f6c50ca3a7e1ae55200a Mon Sep 17 00:00:00 2001
From: Jiri Kuncar <jiri.kuncar@gmail.com>
Date: Tue, 29 Mar 2022 16:29:40 -0400
Subject: [PATCH 1/2] Fix oneOf object names

---
 .generator/src/generator/cli.py                   | 1 +
 .generator/src/generator/templates/model_oneof.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.generator/src/generator/cli.py b/.generator/src/generator/cli.py
index cd2ae388fc3a..ae3c6f9ce2af 100644
--- a/.generator/src/generator/cli.py
+++ b/.generator/src/generator/cli.py
@@ -54,6 +54,7 @@ def cli(input, output):
     env.globals["version"] = version
     env.globals["openapi"] = spec
     env.globals["get_name"] = openapi.get_name
+    env.globals["type_to_ruby"] = openapi.type_to_ruby
     env.globals["get_type_for_attribute"] = openapi.get_type_for_attribute
     env.globals["get_type_for_parameter"] = openapi.get_type_for_parameter
 
diff --git a/.generator/src/generator/templates/model_oneof.j2 b/.generator/src/generator/templates/model_oneof.j2
index 5f4c05982119..94a90f1eeedc 100644
--- a/.generator/src/generator/templates/model_oneof.j2
+++ b/.generator/src/generator/templates/model_oneof.j2
@@ -9,7 +9,7 @@
       def openapi_one_of
         [
       {%- for schema in model.oneOf %}
-          :'{{ get_name(schema) }}'{% if not loop.last %},{% endif %}
+          :'{{ type_to_ruby(schema) }}'{% if not loop.last %},{% endif %}
       {%- endfor %}
         ]
       end

From 900227e4674c2d38cf5b949356a818f3bfc5d99b Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Tue, 29 Mar 2022 20:35:36 +0000
Subject: [PATCH 2/2] pre-commit fixes

---
 .../v2/models/logs_aggregate_bucket_value.rb                | 6 +++---
 lib/datadog_api_client/v2/models/logs_group_by_missing.rb   | 4 ++--
 lib/datadog_api_client/v2/models/logs_group_by_total.rb     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb b/lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb
index aeb4c8bca00e..e71f222c7170 100644
--- a/lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb
+++ b/lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb
@@ -26,9 +26,9 @@ class << self
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'LogsAggregateBucketValueSingleString',
-          :'LogsAggregateBucketValueSingleNumber',
-          :'LogsAggregateBucketValueTimeseries'
+          :'String',
+          :'Float',
+          :'Array<LogsAggregateBucketValueTimeseriesPoint>'
         ]
       end
       # Builds the object
diff --git a/lib/datadog_api_client/v2/models/logs_group_by_missing.rb b/lib/datadog_api_client/v2/models/logs_group_by_missing.rb
index 87e850685b3a..3c2b661b30c8 100644
--- a/lib/datadog_api_client/v2/models/logs_group_by_missing.rb
+++ b/lib/datadog_api_client/v2/models/logs_group_by_missing.rb
@@ -26,8 +26,8 @@ class << self
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'LogsGroupByMissingString',
-          :'LogsGroupByMissingNumber'
+          :'String',
+          :'Float'
         ]
       end
       # Builds the object
diff --git a/lib/datadog_api_client/v2/models/logs_group_by_total.rb b/lib/datadog_api_client/v2/models/logs_group_by_total.rb
index 51cbe07cc5f8..e081713bdbad 100644
--- a/lib/datadog_api_client/v2/models/logs_group_by_total.rb
+++ b/lib/datadog_api_client/v2/models/logs_group_by_total.rb
@@ -26,9 +26,9 @@ class << self
       # List of class defined in oneOf (OpenAPI v3)
       def openapi_one_of
         [
-          :'LogsGroupByTotalBoolean',
-          :'LogsGroupByTotalString',
-          :'LogsGroupByTotalNumber'
+          :'Boolean',
+          :'String',
+          :'Float'
         ]
       end
       # Builds the object