From 17b81f19d0a26e414e2e22ad1e127d636a6bc1b1 Mon Sep 17 00:00:00 2001 From: "david.leonard" Date: Tue, 2 Feb 2021 19:05:22 -0500 Subject: [PATCH 1/3] Remove test that cannot pass anymore --- ...ent_query_definition_group_by_sort_spec.rb | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 spec/v1/models/time_series_formula_and_function_event_query_definition_group_by_sort_spec.rb diff --git a/spec/v1/models/time_series_formula_and_function_event_query_definition_group_by_sort_spec.rb b/spec/v1/models/time_series_formula_and_function_event_query_definition_group_by_sort_spec.rb deleted file mode 100644 index f4c5132ece0a..000000000000 --- a/spec/v1/models/time_series_formula_and_function_event_query_definition_group_by_sort_spec.rb +++ /dev/null @@ -1,55 +0,0 @@ -=begin -#Datadog API V1 Collection - -#Collection of all Datadog Public endpoints. - -The version of the OpenAPI document: 1.0 -Contact: support@datadoghq.com -Generated by: https://openapi-generator.tech - - Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - This product includes software developed at Datadog (https://www.datadoghq.com/). - Copyright 2020-Present Datadog, Inc. - -=end - -require 'spec_helper' -require 'json' -require 'date' - -# Unit tests for DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort -# Automatically generated by openapi-generator (https://openapi-generator.tech) -# Please update as you see appropriate -describe DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort do - let(:instance) { DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort.new } - - describe 'test an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort' do - it 'should create an instance of TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort' do - expect(instance).to be_instance_of(DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionGroupBySort) - end - end - describe 'test attribute "aggregation"' do - it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers - end - end - - describe 'test attribute "metric"' do - it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers - end - end - - describe 'test attribute "order"' do - it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers - end - end - - describe 'test attribute "type"' do - it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers - end - end - -end From 14d0e72bbbd88415340cefa1028f783b78d8925d Mon Sep 17 00:00:00 2001 From: "david.leonard" Date: Thu, 4 Feb 2021 15:29:30 -0500 Subject: [PATCH 2/3] Remove test hitting non-existent module --- ...mula_and_function_events_sort_type_spec.rb | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 spec/v1/models/formula_and_function_events_sort_type_spec.rb diff --git a/spec/v1/models/formula_and_function_events_sort_type_spec.rb b/spec/v1/models/formula_and_function_events_sort_type_spec.rb deleted file mode 100644 index 86454f136f1c..000000000000 --- a/spec/v1/models/formula_and_function_events_sort_type_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -=begin -#Datadog API V1 Collection - -#Collection of all Datadog Public endpoints. - -The version of the OpenAPI document: 1.0 -Contact: support@datadoghq.com -Generated by: https://openapi-generator.tech - - Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - This product includes software developed at Datadog (https://www.datadoghq.com/). - Copyright 2020-Present Datadog, Inc. - -=end - -require 'spec_helper' -require 'json' -require 'date' - -# Unit tests for DatadogAPIClient::V1::FormulaAndFunctionEventsSortType -# Automatically generated by openapi-generator (https://openapi-generator.tech) -# Please update as you see appropriate -describe DatadogAPIClient::V1::FormulaAndFunctionEventsSortType do - let(:instance) { DatadogAPIClient::V1::FormulaAndFunctionEventsSortType.new } - - describe 'test an instance of FormulaAndFunctionEventsSortType' do - it 'should create an instance of FormulaAndFunctionEventsSortType' do - expect(instance).to be_instance_of(DatadogAPIClient::V1::FormulaAndFunctionEventsSortType) - end - end -end From 872950b4935e7af51e78995d7b3fac646eb08b82 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Fri, 5 Feb 2021 08:15:20 +0000 Subject: [PATCH 3/3] Regenerate client from commit 7973735 of spec repo --- .apigentools-info | 8 ++-- data/v1/openapi.yaml | 11 ----- docs/v1/FormulaAndFunctionEventsSortType.md | 15 ------- docs/v1/README.md | 1 - ...mulaAndFunctionEventQueryDefinitionSort.md | 4 +- lib/datadog_api_client/v1.rb | 1 - .../formula_and_function_events_sort_type.rb | 40 ------------------- ...nd_function_event_query_definition_sort.rb | 17 ++------ 8 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 docs/v1/FormulaAndFunctionEventsSortType.md delete mode 100644 lib/datadog_api_client/v1/models/formula_and_function_events_sort_type.rb diff --git a/.apigentools-info b/.apigentools-info index 98ddcfcd9d9f..834b6e310050 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-02-04 09:37:42.213760", - "spec_repo_commit": "0e53363" + "regenerated": "2021-02-05 08:15:05.457880", + "spec_repo_commit": "7973735" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-02-04 09:37:54.800888", - "spec_repo_commit": "0e53363" + "regenerated": "2021-02-05 08:15:17.974135", + "spec_repo_commit": "7973735" } } } \ No newline at end of file diff --git a/data/v1/openapi.yaml b/data/v1/openapi.yaml index 0e7dbeb8f46d..6d93d2f6fbeb 100644 --- a/data/v1/openapi.yaml +++ b/data/v1/openapi.yaml @@ -1589,15 +1589,6 @@ components: - RUM - SECURITY_SIGNALS - PROFILES - FormulaAndFunctionEventsSortType: - description: Method for sorting event platform results. - enum: - - alphabetical - - measure - type: string - x-enum-varnames: - - ALPHABETICAL - - MEASURE FormulaAndFunctionMetricAggregation: description: The aggregation methods available for metrics queries. enum: @@ -7666,8 +7657,6 @@ components: type: string order: $ref: '#/components/schemas/QuerySortOrder' - type: - $ref: '#/components/schemas/FormulaAndFunctionEventsSortType' required: - aggregation type: object diff --git a/docs/v1/FormulaAndFunctionEventsSortType.md b/docs/v1/FormulaAndFunctionEventsSortType.md deleted file mode 100644 index 3eddb96264bd..000000000000 --- a/docs/v1/FormulaAndFunctionEventsSortType.md +++ /dev/null @@ -1,15 +0,0 @@ -# DatadogAPIClient::V1::FormulaAndFunctionEventsSortType - -## Properties - -| Name | Type | Description | Notes | -| ---- | ---- | ----------- | ----- | - -## Example - -```ruby -require 'datadog_api_client/v1' - -instance = DatadogAPIClient::V1::FormulaAndFunctionEventsSortType.new() -``` - diff --git a/docs/v1/README.md b/docs/v1/README.md index fe5bc9c4ed92..89b63702ffd2 100644 --- a/docs/v1/README.md +++ b/docs/v1/README.md @@ -330,7 +330,6 @@ Class | Method | HTTP request | Description - [DatadogAPIClient::V1::EventTimelineWidgetDefinitionType](EventTimelineWidgetDefinitionType.md) - [DatadogAPIClient::V1::FormulaAndFunctionEventAggregation](FormulaAndFunctionEventAggregation.md) - [DatadogAPIClient::V1::FormulaAndFunctionEventsDataSource](FormulaAndFunctionEventsDataSource.md) - - [DatadogAPIClient::V1::FormulaAndFunctionEventsSortType](FormulaAndFunctionEventsSortType.md) - [DatadogAPIClient::V1::FormulaAndFunctionMetricAggregation](FormulaAndFunctionMetricAggregation.md) - [DatadogAPIClient::V1::FormulaAndFunctionMetricDataSource](FormulaAndFunctionMetricDataSource.md) - [DatadogAPIClient::V1::FormulaAndFunctionProcessQueryDataSource](FormulaAndFunctionProcessQueryDataSource.md) diff --git a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.md b/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.md index 607cab74a832..d0b36e56cd44 100644 --- a/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.md +++ b/docs/v1/TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.md @@ -7,7 +7,6 @@ | **aggregation** | [**FormulaAndFunctionEventAggregation**](FormulaAndFunctionEventAggregation.md) | | | | **metric** | **String** | Metric used for sorting group by results. | [optional] | | **order** | [**QuerySortOrder**](QuerySortOrder.md) | | [optional][default to 'desc'] | -| **type** | [**FormulaAndFunctionEventsSortType**](FormulaAndFunctionEventsSortType.md) | | [optional] | ## Example @@ -17,8 +16,7 @@ require 'datadog_api_client/v1' instance = DatadogAPIClient::V1::TimeSeriesFormulaAndFunctionEventQueryDefinitionSort.new( aggregation: null, metric: null, - order: null, - type: null + order: null ) ``` diff --git a/lib/datadog_api_client/v1.rb b/lib/datadog_api_client/v1.rb index 0e635daa8ea6..d48a8b030005 100644 --- a/lib/datadog_api_client/v1.rb +++ b/lib/datadog_api_client/v1.rb @@ -93,7 +93,6 @@ require 'datadog_api_client/v1/models/event_timeline_widget_definition_type' require 'datadog_api_client/v1/models/formula_and_function_event_aggregation' require 'datadog_api_client/v1/models/formula_and_function_events_data_source' -require 'datadog_api_client/v1/models/formula_and_function_events_sort_type' require 'datadog_api_client/v1/models/formula_and_function_metric_aggregation' require 'datadog_api_client/v1/models/formula_and_function_metric_data_source' require 'datadog_api_client/v1/models/formula_and_function_process_query_data_source' diff --git a/lib/datadog_api_client/v1/models/formula_and_function_events_sort_type.rb b/lib/datadog_api_client/v1/models/formula_and_function_events_sort_type.rb deleted file mode 100644 index a9a4c44cd94f..000000000000 --- a/lib/datadog_api_client/v1/models/formula_and_function_events_sort_type.rb +++ /dev/null @@ -1,40 +0,0 @@ -=begin -#Datadog API V1 Collection - -#Collection of all Datadog Public endpoints. - -The version of the OpenAPI document: 1.0 -Contact: support@datadoghq.com -Generated by: https://openapi-generator.tech - - Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - This product includes software developed at Datadog (https://www.datadoghq.com/). - Copyright 2020-Present Datadog, Inc. - -=end - -require 'date' -require 'time' - -module DatadogAPIClient::V1 - class FormulaAndFunctionEventsSortType - ALPHABETICAL = "alphabetical".freeze - MEASURE = "measure".freeze - - # Builds the enum from string - # @param [String] The enum value in the form of the string - # @return [String] The enum value - def self.build_from_hash(value) - new.build_from_hash(value) - end - - # Builds the enum from string - # @param [String] The enum value in the form of the string - # @return [String] The enum value - def build_from_hash(value) - constantValues = FormulaAndFunctionEventsSortType.constants.select { |c| FormulaAndFunctionEventsSortType::const_get(c) == value } - raise "Invalid ENUM value #{value} for class #FormulaAndFunctionEventsSortType" if constantValues.empty? - value - end - end -end diff --git a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_sort.rb b/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_sort.rb index af681c224340..0d8b417fce0c 100644 --- a/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_sort.rb +++ b/lib/datadog_api_client/v1/models/time_series_formula_and_function_event_query_definition_sort.rb @@ -26,15 +26,12 @@ class TimeSeriesFormulaAndFunctionEventQueryDefinitionSort attr_accessor :order - attr_accessor :type - # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { :'aggregation' => :'aggregation', :'metric' => :'metric', - :'order' => :'order', - :'type' => :'type' + :'order' => :'order' } end @@ -48,8 +45,7 @@ def self.openapi_types { :'aggregation' => :'FormulaAndFunctionEventAggregation', :'metric' => :'String', - :'order' => :'QuerySortOrder', - :'type' => :'FormulaAndFunctionEventsSortType' + :'order' => :'QuerySortOrder' } end @@ -87,10 +83,6 @@ def initialize(attributes = {}) else self.order = 'desc' end - - if attributes.key?(:'type') - self.type = attributes[:'type'] - end end # Show invalid properties with the reasons. Usually used together with valid? @@ -118,8 +110,7 @@ def ==(o) self.class == o.class && aggregation == o.aggregation && metric == o.metric && - order == o.order && - type == o.type + order == o.order end # @see the `==` method @@ -131,7 +122,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [aggregation, metric, order, type].hash + [aggregation, metric, order].hash end # Builds the object from hash