From 965b34ba2c813e286780c28aa9659191ec2e0750 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 10:22:22 +0100 Subject: [PATCH 1/8] [logs][v2][aggregate] fix aggregate paging name --- .apigentools-info | 8 ++-- .openapi-generator/FILES | 6 +-- data/v2/openapi.yaml | 4 +- docs/v2/LogsAggregateRequest.md | 4 +- docs/v2/LogsAggregateRequestPage.md | 18 +++++++++ docs/v2/LogsAggregateRequestPaging.md | 18 --------- docs/v2/README.md | 2 +- lib/datadog_api_client/v2.rb | 2 +- .../v2/models/logs_aggregate_request.rb | 14 +++---- ...ging.rb => logs_aggregate_request_page.rb} | 20 +++++----- .../logs_aggregate_request_page_spec.rb | 37 +++++++++++++++++++ 11 files changed, 85 insertions(+), 48 deletions(-) create mode 100644 docs/v2/LogsAggregateRequestPage.md delete mode 100644 docs/v2/LogsAggregateRequestPaging.md rename lib/datadog_api_client/v2/models/{logs_aggregate_request_paging.rb => logs_aggregate_request_page.rb} (92%) create mode 100644 spec/v2/models/logs_aggregate_request_page_spec.rb diff --git a/.apigentools-info b/.apigentools-info index 7b2b75bd966f..31c300f19afb 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-26 17:15:04.320994", - "spec_repo_commit": "db8c9ba" + "regenerated": "2021-01-27 17:33:33.083667", + "spec_repo_commit": "9af4c1c" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-26 17:15:16.348572", - "spec_repo_commit": "db8c9ba" + "regenerated": "2021-01-27 17:34:08.337826", + "spec_repo_commit": "9af4c1c" } } } \ No newline at end of file diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index cc0901b862f2..954cea074ac5 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -109,7 +109,7 @@ docs/LogsAggregateBucket.md docs/LogsAggregateBucketValue.md docs/LogsAggregateBucketValueTimeseriesPoint.md docs/LogsAggregateRequest.md -docs/LogsAggregateRequestPaging.md +docs/LogsAggregateRequestPage.md docs/LogsAggregateResponse.md docs/LogsAggregateResponseData.md docs/LogsAggregateResponseStatus.md @@ -405,7 +405,7 @@ lib/datadog_api_client/v2/models/logs_aggregate_bucket.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point.rb lib/datadog_api_client/v2/models/logs_aggregate_request.rb -lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb +lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb lib/datadog_api_client/v2/models/logs_aggregate_response.rb lib/datadog_api_client/v2/models/logs_aggregate_response_data.rb lib/datadog_api_client/v2/models/logs_aggregate_response_status.rb @@ -691,7 +691,7 @@ spec/models/log_type_spec.rb spec/models/logs_aggregate_bucket_spec.rb spec/models/logs_aggregate_bucket_value_spec.rb spec/models/logs_aggregate_bucket_value_timeseries_point_spec.rb -spec/models/logs_aggregate_request_paging_spec.rb +spec/models/logs_aggregate_request_page_spec.rb spec/models/logs_aggregate_request_spec.rb spec/models/logs_aggregate_response_data_spec.rb spec/models/logs_aggregate_response_spec.rb diff --git a/data/v2/openapi.yaml b/data/v2/openapi.yaml index 9130418d84e3..54313b225748 100644 --- a/data/v2/openapi.yaml +++ b/data/v2/openapi.yaml @@ -1917,10 +1917,10 @@ components: type: array options: $ref: '#/components/schemas/LogsQueryOptions' - paging: + page: description: Paging settings properties: - after: + cursor: description: The returned paging point to use to get the next results example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== type: string diff --git a/docs/v2/LogsAggregateRequest.md b/docs/v2/LogsAggregateRequest.md index 47a9aa84c011..1a9e7626ddba 100644 --- a/docs/v2/LogsAggregateRequest.md +++ b/docs/v2/LogsAggregateRequest.md @@ -8,7 +8,7 @@ | **filter** | [**LogsQueryFilter**](LogsQueryFilter.md) | | [optional] | | **group_by** | [**Array<LogsGroupBy>**](LogsGroupBy.md) | The rules for the group by | [optional] | | **options** | [**LogsQueryOptions**](LogsQueryOptions.md) | | [optional] | -| **paging** | [**LogsAggregateRequestPaging**](LogsAggregateRequestPaging.md) | | [optional] | +| **page** | [**LogsAggregateRequestPage**](LogsAggregateRequestPage.md) | | [optional] | ## Example @@ -20,7 +20,7 @@ instance = DatadogAPIClient::V2::LogsAggregateRequest.new( filter: null, group_by: null, options: null, - paging: null + page: null ) ``` diff --git a/docs/v2/LogsAggregateRequestPage.md b/docs/v2/LogsAggregateRequestPage.md new file mode 100644 index 000000000000..4cb00fde9cba --- /dev/null +++ b/docs/v2/LogsAggregateRequestPage.md @@ -0,0 +1,18 @@ +# DatadogAPIClient::V2::LogsAggregateRequestPage + +## Properties + +| Name | Type | Description | Notes | +| ---- | ---- | ----------- | ----- | +| **cursor** | **String** | The returned paging point to use to get the next results | [optional] | + +## Example + +```ruby +require 'datadog_api_client/v2' + +instance = DatadogAPIClient::V2::LogsAggregateRequestPage.new( + cursor: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== +) +``` + diff --git a/docs/v2/LogsAggregateRequestPaging.md b/docs/v2/LogsAggregateRequestPaging.md deleted file mode 100644 index c7bb17364a87..000000000000 --- a/docs/v2/LogsAggregateRequestPaging.md +++ /dev/null @@ -1,18 +0,0 @@ -# DatadogAPIClient::V2::LogsAggregateRequestPaging - -## Properties - -| Name | Type | Description | Notes | -| ---- | ---- | ----------- | ----- | -| **after** | **String** | The returned paging point to use to get the next results | [optional] | - -## Example - -```ruby -require 'datadog_api_client/v2' - -instance = DatadogAPIClient::V2::LogsAggregateRequestPaging.new( - after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== -) -``` - diff --git a/docs/v2/README.md b/docs/v2/README.md index 9fa89cffba4c..018cf25f62df 100644 --- a/docs/v2/README.md +++ b/docs/v2/README.md @@ -272,7 +272,7 @@ Class | Method | HTTP request | Description - [DatadogAPIClient::V2::LogsAggregateBucketValue](LogsAggregateBucketValue.md) - [DatadogAPIClient::V2::LogsAggregateBucketValueTimeseriesPoint](LogsAggregateBucketValueTimeseriesPoint.md) - [DatadogAPIClient::V2::LogsAggregateRequest](LogsAggregateRequest.md) - - [DatadogAPIClient::V2::LogsAggregateRequestPaging](LogsAggregateRequestPaging.md) + - [DatadogAPIClient::V2::LogsAggregateRequestPage](LogsAggregateRequestPage.md) - [DatadogAPIClient::V2::LogsAggregateResponse](LogsAggregateResponse.md) - [DatadogAPIClient::V2::LogsAggregateResponseData](LogsAggregateResponseData.md) - [DatadogAPIClient::V2::LogsAggregateResponseStatus](LogsAggregateResponseStatus.md) diff --git a/lib/datadog_api_client/v2.rb b/lib/datadog_api_client/v2.rb index b7e3cd165a18..9395e2517a06 100644 --- a/lib/datadog_api_client/v2.rb +++ b/lib/datadog_api_client/v2.rb @@ -123,7 +123,7 @@ require 'datadog_api_client/v2/models/logs_aggregate_bucket_value' require 'datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point' require 'datadog_api_client/v2/models/logs_aggregate_request' -require 'datadog_api_client/v2/models/logs_aggregate_request_paging' +require 'datadog_api_client/v2/models/logs_aggregate_request_page' require 'datadog_api_client/v2/models/logs_aggregate_response' require 'datadog_api_client/v2/models/logs_aggregate_response_data' require 'datadog_api_client/v2/models/logs_aggregate_response_status' diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb index dbb6b2220ad3..8c89c1853aac 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb @@ -29,7 +29,7 @@ class LogsAggregateRequest attr_accessor :options - attr_accessor :paging + attr_accessor :page # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map @@ -38,7 +38,7 @@ def self.attribute_map :'filter' => :'filter', :'group_by' => :'group_by', :'options' => :'options', - :'paging' => :'paging' + :'page' => :'page' } end @@ -54,7 +54,7 @@ def self.openapi_types :'filter' => :'LogsQueryFilter', :'group_by' => :'Array', :'options' => :'LogsQueryOptions', - :'paging' => :'LogsAggregateRequestPaging' + :'page' => :'LogsAggregateRequestPage' } end @@ -99,8 +99,8 @@ def initialize(attributes = {}) self.options = attributes[:'options'] end - if attributes.key?(:'paging') - self.paging = attributes[:'paging'] + if attributes.key?(:'page') + self.page = attributes[:'page'] end end @@ -126,7 +126,7 @@ def ==(o) filter == o.filter && group_by == o.group_by && options == o.options && - paging == o.paging + page == o.page end # @see the `==` method @@ -138,7 +138,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [compute, filter, group_by, options, paging].hash + [compute, filter, group_by, options, page].hash end # Builds the object from hash diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb similarity index 92% rename from lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb rename to lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb index 9c30abdc9b81..fce2dd79328e 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb @@ -18,14 +18,14 @@ module DatadogAPIClient::V2 # Paging settings - class LogsAggregateRequestPaging + class LogsAggregateRequestPage # The returned paging point to use to get the next results - attr_accessor :after + attr_accessor :cursor # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { - :'after' => :'after' + :'cursor' => :'cursor' } end @@ -37,7 +37,7 @@ def self.acceptable_attributes # Attribute type mapping. def self.openapi_types { - :'after' => :'String' + :'cursor' => :'String' } end @@ -51,19 +51,19 @@ def self.openapi_nullable # @param [Hash] attributes Model attributes in the form of hash def initialize(attributes = {}) if (!attributes.is_a?(Hash)) - fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPaging` initialize method" + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPage` initialize method" end # check to see if the attribute exists and convert string to symbol for hash key attributes = attributes.each_with_object({}) { |(k, v), h| if (!self.class.attribute_map.key?(k.to_sym)) - fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPaging`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPage`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect end h[k.to_sym] = v } - if attributes.key?(:'after') - self.after = attributes[:'after'] + if attributes.key?(:'cursor') + self.cursor = attributes[:'cursor'] end end @@ -85,7 +85,7 @@ def valid? def ==(o) return true if self.equal?(o) self.class == o.class && - after == o.after + cursor == o.cursor end # @see the `==` method @@ -97,7 +97,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [after].hash + [cursor].hash end # Builds the object from hash diff --git a/spec/v2/models/logs_aggregate_request_page_spec.rb b/spec/v2/models/logs_aggregate_request_page_spec.rb new file mode 100644 index 000000000000..f9a12e4a7d9a --- /dev/null +++ b/spec/v2/models/logs_aggregate_request_page_spec.rb @@ -0,0 +1,37 @@ +=begin +#Datadog API V2 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::V2::LogsAggregateRequestPage +# Automatically generated by openapi-generator (https://openapi-generator.tech) +# Please update as you see appropriate +describe DatadogAPIClient::V2::LogsAggregateRequestPage do + let(:instance) { DatadogAPIClient::V2::LogsAggregateRequestPage.new } + + describe 'test an instance of LogsAggregateRequestPage' do + it 'should create an instance of LogsAggregateRequestPage' do + expect(instance).to be_instance_of(DatadogAPIClient::V2::LogsAggregateRequestPage) + end + end + describe 'test attribute "cursor"' do + it 'should work' do + # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + end + end + +end From 3b65d9c3886af094a01a6b676a71c965edcc6725 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 11:00:04 +0100 Subject: [PATCH 2/8] update --- .apigentools-info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index 31c300f19afb..adb3019b1b2f 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,12 +4,12 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-27 17:33:33.083667", + "regenerated": "2021-01-28 09:55:44.647323", "spec_repo_commit": "9af4c1c" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-27 17:34:08.337826", + "regenerated": "2021-01-28 09:56:22.143213", "spec_repo_commit": "9af4c1c" } } From e991d4dc3a4c68396d6f00d60088a6d06c3da355 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 11:06:24 +0100 Subject: [PATCH 3/8] fix --- lib/datadog_api_client/v2.rb | 326 ------------------ .../v2/models/logs_aggregate_request.rb | 264 -------------- .../v2/models/logs_aggregate_request_page.rb | 223 ------------ 3 files changed, 813 deletions(-) delete mode 100644 lib/datadog_api_client/v2.rb delete mode 100644 lib/datadog_api_client/v2/models/logs_aggregate_request.rb delete mode 100644 lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb diff --git a/lib/datadog_api_client/v2.rb b/lib/datadog_api_client/v2.rb deleted file mode 100644 index 9395e2517a06..000000000000 --- a/lib/datadog_api_client/v2.rb +++ /dev/null @@ -1,326 +0,0 @@ -=begin -#Datadog API V2 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 - -# Common files -require 'datadog_api_client/version' -require 'datadog_api_client/v2/api_client' -require 'datadog_api_client/v2/api_error' -require 'datadog_api_client/v2/configuration' - -# Models -require 'datadog_api_client/v2/models/api_error_response' -require 'datadog_api_client/v2/models/api_key_create_attributes' -require 'datadog_api_client/v2/models/api_key_create_data' -require 'datadog_api_client/v2/models/api_key_create_request' -require 'datadog_api_client/v2/models/api_key_relationships' -require 'datadog_api_client/v2/models/api_key_response' -require 'datadog_api_client/v2/models/api_key_response_included_item' -require 'datadog_api_client/v2/models/api_key_update_attributes' -require 'datadog_api_client/v2/models/api_key_update_data' -require 'datadog_api_client/v2/models/api_key_update_request' -require 'datadog_api_client/v2/models/api_keys_response' -require 'datadog_api_client/v2/models/api_keys_sort' -require 'datadog_api_client/v2/models/api_keys_type' -require 'datadog_api_client/v2/models/application_key_create_attributes' -require 'datadog_api_client/v2/models/application_key_create_data' -require 'datadog_api_client/v2/models/application_key_create_request' -require 'datadog_api_client/v2/models/application_key_relationships' -require 'datadog_api_client/v2/models/application_key_response' -require 'datadog_api_client/v2/models/application_key_response_included_item' -require 'datadog_api_client/v2/models/application_key_update_attributes' -require 'datadog_api_client/v2/models/application_key_update_data' -require 'datadog_api_client/v2/models/application_key_update_request' -require 'datadog_api_client/v2/models/application_keys_sort' -require 'datadog_api_client/v2/models/application_keys_type' -require 'datadog_api_client/v2/models/creator' -require 'datadog_api_client/v2/models/dashboard_list_add_items_request' -require 'datadog_api_client/v2/models/dashboard_list_add_items_response' -require 'datadog_api_client/v2/models/dashboard_list_delete_items_request' -require 'datadog_api_client/v2/models/dashboard_list_delete_items_response' -require 'datadog_api_client/v2/models/dashboard_list_item' -require 'datadog_api_client/v2/models/dashboard_list_item_request' -require 'datadog_api_client/v2/models/dashboard_list_item_response' -require 'datadog_api_client/v2/models/dashboard_list_items' -require 'datadog_api_client/v2/models/dashboard_list_update_items_request' -require 'datadog_api_client/v2/models/dashboard_list_update_items_response' -require 'datadog_api_client/v2/models/dashboard_type' -require 'datadog_api_client/v2/models/full_api_key' -require 'datadog_api_client/v2/models/full_api_key_attributes' -require 'datadog_api_client/v2/models/full_application_key' -require 'datadog_api_client/v2/models/full_application_key_attributes' -require 'datadog_api_client/v2/models/incident_create_attributes' -require 'datadog_api_client/v2/models/incident_create_data' -require 'datadog_api_client/v2/models/incident_create_relationships' -require 'datadog_api_client/v2/models/incident_create_request' -require 'datadog_api_client/v2/models/incident_field_attributes' -require 'datadog_api_client/v2/models/incident_field_attributes_multiple_value' -require 'datadog_api_client/v2/models/incident_field_attributes_single_value' -require 'datadog_api_client/v2/models/incident_field_attributes_single_value_type' -require 'datadog_api_client/v2/models/incident_field_attributes_value_type' -require 'datadog_api_client/v2/models/incident_integration_metadata_type' -require 'datadog_api_client/v2/models/incident_postmortem_type' -require 'datadog_api_client/v2/models/incident_related_object' -require 'datadog_api_client/v2/models/incident_response' -require 'datadog_api_client/v2/models/incident_response_attributes' -require 'datadog_api_client/v2/models/incident_response_data' -require 'datadog_api_client/v2/models/incident_response_included_item' -require 'datadog_api_client/v2/models/incident_response_relationships' -require 'datadog_api_client/v2/models/incident_service_create_attributes' -require 'datadog_api_client/v2/models/incident_service_create_data' -require 'datadog_api_client/v2/models/incident_service_create_request' -require 'datadog_api_client/v2/models/incident_service_included_items' -require 'datadog_api_client/v2/models/incident_service_relationships' -require 'datadog_api_client/v2/models/incident_service_response' -require 'datadog_api_client/v2/models/incident_service_response_attributes' -require 'datadog_api_client/v2/models/incident_service_response_data' -require 'datadog_api_client/v2/models/incident_service_type' -require 'datadog_api_client/v2/models/incident_service_update_attributes' -require 'datadog_api_client/v2/models/incident_service_update_data' -require 'datadog_api_client/v2/models/incident_service_update_request' -require 'datadog_api_client/v2/models/incident_services_response' -require 'datadog_api_client/v2/models/incident_services_response_meta' -require 'datadog_api_client/v2/models/incident_services_response_meta_pagination' -require 'datadog_api_client/v2/models/incident_team_create_attributes' -require 'datadog_api_client/v2/models/incident_team_create_data' -require 'datadog_api_client/v2/models/incident_team_create_request' -require 'datadog_api_client/v2/models/incident_team_included_items' -require 'datadog_api_client/v2/models/incident_team_relationships' -require 'datadog_api_client/v2/models/incident_team_response' -require 'datadog_api_client/v2/models/incident_team_response_attributes' -require 'datadog_api_client/v2/models/incident_team_response_data' -require 'datadog_api_client/v2/models/incident_team_type' -require 'datadog_api_client/v2/models/incident_team_update_attributes' -require 'datadog_api_client/v2/models/incident_team_update_data' -require 'datadog_api_client/v2/models/incident_team_update_request' -require 'datadog_api_client/v2/models/incident_teams_response' -require 'datadog_api_client/v2/models/incident_timeline_cell_create_attributes' -require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_content_type' -require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_create_attributes' -require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_create_attributes_content' -require 'datadog_api_client/v2/models/incident_type' -require 'datadog_api_client/v2/models/incident_update_attributes' -require 'datadog_api_client/v2/models/incident_update_data' -require 'datadog_api_client/v2/models/incident_update_relationships' -require 'datadog_api_client/v2/models/incident_update_request' -require 'datadog_api_client/v2/models/incidents_response' -require 'datadog_api_client/v2/models/list_application_keys_response' -require 'datadog_api_client/v2/models/log' -require 'datadog_api_client/v2/models/log_attributes' -require 'datadog_api_client/v2/models/log_type' -require 'datadog_api_client/v2/models/logs_aggregate_bucket' -require 'datadog_api_client/v2/models/logs_aggregate_bucket_value' -require 'datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point' -require 'datadog_api_client/v2/models/logs_aggregate_request' -require 'datadog_api_client/v2/models/logs_aggregate_request_page' -require 'datadog_api_client/v2/models/logs_aggregate_response' -require 'datadog_api_client/v2/models/logs_aggregate_response_data' -require 'datadog_api_client/v2/models/logs_aggregate_response_status' -require 'datadog_api_client/v2/models/logs_aggregate_sort' -require 'datadog_api_client/v2/models/logs_aggregate_sort_type' -require 'datadog_api_client/v2/models/logs_aggregation_function' -require 'datadog_api_client/v2/models/logs_archive' -require 'datadog_api_client/v2/models/logs_archive_attributes' -require 'datadog_api_client/v2/models/logs_archive_create_request' -require 'datadog_api_client/v2/models/logs_archive_create_request_attributes' -require 'datadog_api_client/v2/models/logs_archive_create_request_definition' -require 'datadog_api_client/v2/models/logs_archive_create_request_destination' -require 'datadog_api_client/v2/models/logs_archive_definition' -require 'datadog_api_client/v2/models/logs_archive_destination' -require 'datadog_api_client/v2/models/logs_archive_destination_azure' -require 'datadog_api_client/v2/models/logs_archive_destination_azure_type' -require 'datadog_api_client/v2/models/logs_archive_destination_gcs' -require 'datadog_api_client/v2/models/logs_archive_destination_gcs_type' -require 'datadog_api_client/v2/models/logs_archive_destination_s3' -require 'datadog_api_client/v2/models/logs_archive_destination_s3_type' -require 'datadog_api_client/v2/models/logs_archive_integration_azure' -require 'datadog_api_client/v2/models/logs_archive_integration_gcs' -require 'datadog_api_client/v2/models/logs_archive_integration_s3' -require 'datadog_api_client/v2/models/logs_archive_order' -require 'datadog_api_client/v2/models/logs_archive_order_attributes' -require 'datadog_api_client/v2/models/logs_archive_order_definition' -require 'datadog_api_client/v2/models/logs_archive_order_definition_type' -require 'datadog_api_client/v2/models/logs_archive_state' -require 'datadog_api_client/v2/models/logs_archives' -require 'datadog_api_client/v2/models/logs_compute' -require 'datadog_api_client/v2/models/logs_compute_type' -require 'datadog_api_client/v2/models/logs_group_by' -require 'datadog_api_client/v2/models/logs_group_by_histogram' -require 'datadog_api_client/v2/models/logs_group_by_missing' -require 'datadog_api_client/v2/models/logs_group_by_total' -require 'datadog_api_client/v2/models/logs_list_request' -require 'datadog_api_client/v2/models/logs_list_request_page' -require 'datadog_api_client/v2/models/logs_list_response' -require 'datadog_api_client/v2/models/logs_list_response_links' -require 'datadog_api_client/v2/models/logs_metric_compute' -require 'datadog_api_client/v2/models/logs_metric_compute_aggregation_type' -require 'datadog_api_client/v2/models/logs_metric_create_attributes' -require 'datadog_api_client/v2/models/logs_metric_create_data' -require 'datadog_api_client/v2/models/logs_metric_create_request' -require 'datadog_api_client/v2/models/logs_metric_filter' -require 'datadog_api_client/v2/models/logs_metric_group_by' -require 'datadog_api_client/v2/models/logs_metric_response' -require 'datadog_api_client/v2/models/logs_metric_response_attributes' -require 'datadog_api_client/v2/models/logs_metric_response_compute' -require 'datadog_api_client/v2/models/logs_metric_response_compute_aggregation_type' -require 'datadog_api_client/v2/models/logs_metric_response_data' -require 'datadog_api_client/v2/models/logs_metric_response_filter' -require 'datadog_api_client/v2/models/logs_metric_response_group_by' -require 'datadog_api_client/v2/models/logs_metric_type' -require 'datadog_api_client/v2/models/logs_metric_update_attributes' -require 'datadog_api_client/v2/models/logs_metric_update_data' -require 'datadog_api_client/v2/models/logs_metric_update_request' -require 'datadog_api_client/v2/models/logs_metrics_response' -require 'datadog_api_client/v2/models/logs_query_filter' -require 'datadog_api_client/v2/models/logs_query_options' -require 'datadog_api_client/v2/models/logs_response_metadata' -require 'datadog_api_client/v2/models/logs_response_metadata_page' -require 'datadog_api_client/v2/models/logs_sort' -require 'datadog_api_client/v2/models/logs_sort_order' -require 'datadog_api_client/v2/models/logs_warning' -require 'datadog_api_client/v2/models/organization' -require 'datadog_api_client/v2/models/organization_attributes' -require 'datadog_api_client/v2/models/organizations_type' -require 'datadog_api_client/v2/models/pagination' -require 'datadog_api_client/v2/models/partial_api_key' -require 'datadog_api_client/v2/models/partial_api_key_attributes' -require 'datadog_api_client/v2/models/partial_application_key' -require 'datadog_api_client/v2/models/partial_application_key_attributes' -require 'datadog_api_client/v2/models/permission' -require 'datadog_api_client/v2/models/permission_attributes' -require 'datadog_api_client/v2/models/permissions_response' -require 'datadog_api_client/v2/models/permissions_type' -require 'datadog_api_client/v2/models/process_summaries_meta' -require 'datadog_api_client/v2/models/process_summaries_meta_page' -require 'datadog_api_client/v2/models/process_summaries_response' -require 'datadog_api_client/v2/models/process_summary' -require 'datadog_api_client/v2/models/process_summary_attributes' -require 'datadog_api_client/v2/models/process_summary_type' -require 'datadog_api_client/v2/models/query_sort_order' -require 'datadog_api_client/v2/models/relationship_to_incident_integration_metadata_data' -require 'datadog_api_client/v2/models/relationship_to_incident_integration_metadatas' -require 'datadog_api_client/v2/models/relationship_to_incident_postmortem' -require 'datadog_api_client/v2/models/relationship_to_incident_postmortem_data' -require 'datadog_api_client/v2/models/relationship_to_organization' -require 'datadog_api_client/v2/models/relationship_to_organization_data' -require 'datadog_api_client/v2/models/relationship_to_organizations' -require 'datadog_api_client/v2/models/relationship_to_permission' -require 'datadog_api_client/v2/models/relationship_to_permission_data' -require 'datadog_api_client/v2/models/relationship_to_permissions' -require 'datadog_api_client/v2/models/relationship_to_role' -require 'datadog_api_client/v2/models/relationship_to_role_data' -require 'datadog_api_client/v2/models/relationship_to_roles' -require 'datadog_api_client/v2/models/relationship_to_user' -require 'datadog_api_client/v2/models/relationship_to_user_data' -require 'datadog_api_client/v2/models/relationship_to_users' -require 'datadog_api_client/v2/models/response_meta_attributes' -require 'datadog_api_client/v2/models/role' -require 'datadog_api_client/v2/models/role_attributes' -require 'datadog_api_client/v2/models/role_create_attributes' -require 'datadog_api_client/v2/models/role_create_data' -require 'datadog_api_client/v2/models/role_create_request' -require 'datadog_api_client/v2/models/role_create_response' -require 'datadog_api_client/v2/models/role_create_response_data' -require 'datadog_api_client/v2/models/role_relationships' -require 'datadog_api_client/v2/models/role_response' -require 'datadog_api_client/v2/models/role_response_relationships' -require 'datadog_api_client/v2/models/role_update_attributes' -require 'datadog_api_client/v2/models/role_update_data' -require 'datadog_api_client/v2/models/role_update_request' -require 'datadog_api_client/v2/models/role_update_response' -require 'datadog_api_client/v2/models/role_update_response_data' -require 'datadog_api_client/v2/models/roles_response' -require 'datadog_api_client/v2/models/roles_sort' -require 'datadog_api_client/v2/models/roles_type' -require 'datadog_api_client/v2/models/security_monitoring_filter' -require 'datadog_api_client/v2/models/security_monitoring_filter_action' -require 'datadog_api_client/v2/models/security_monitoring_list_rules_response' -require 'datadog_api_client/v2/models/security_monitoring_rule_case' -require 'datadog_api_client/v2/models/security_monitoring_rule_case_create' -require 'datadog_api_client/v2/models/security_monitoring_rule_create_payload' -require 'datadog_api_client/v2/models/security_monitoring_rule_evaluation_window' -require 'datadog_api_client/v2/models/security_monitoring_rule_keep_alive' -require 'datadog_api_client/v2/models/security_monitoring_rule_max_signal_duration' -require 'datadog_api_client/v2/models/security_monitoring_rule_options' -require 'datadog_api_client/v2/models/security_monitoring_rule_query' -require 'datadog_api_client/v2/models/security_monitoring_rule_query_aggregation' -require 'datadog_api_client/v2/models/security_monitoring_rule_query_create' -require 'datadog_api_client/v2/models/security_monitoring_rule_response' -require 'datadog_api_client/v2/models/security_monitoring_rule_severity' -require 'datadog_api_client/v2/models/security_monitoring_rule_update_payload' -require 'datadog_api_client/v2/models/security_monitoring_signal' -require 'datadog_api_client/v2/models/security_monitoring_signal_attributes' -require 'datadog_api_client/v2/models/security_monitoring_signal_list_request' -require 'datadog_api_client/v2/models/security_monitoring_signal_list_request_filter' -require 'datadog_api_client/v2/models/security_monitoring_signal_list_request_page' -require 'datadog_api_client/v2/models/security_monitoring_signal_type' -require 'datadog_api_client/v2/models/security_monitoring_signals_list_response' -require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_links' -require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_meta' -require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_meta_page' -require 'datadog_api_client/v2/models/security_monitoring_signals_sort' -require 'datadog_api_client/v2/models/user' -require 'datadog_api_client/v2/models/user_attributes' -require 'datadog_api_client/v2/models/user_create_attributes' -require 'datadog_api_client/v2/models/user_create_data' -require 'datadog_api_client/v2/models/user_create_request' -require 'datadog_api_client/v2/models/user_invitation_data' -require 'datadog_api_client/v2/models/user_invitation_data_attributes' -require 'datadog_api_client/v2/models/user_invitation_relationships' -require 'datadog_api_client/v2/models/user_invitation_response' -require 'datadog_api_client/v2/models/user_invitation_response_data' -require 'datadog_api_client/v2/models/user_invitations_request' -require 'datadog_api_client/v2/models/user_invitations_response' -require 'datadog_api_client/v2/models/user_invitations_type' -require 'datadog_api_client/v2/models/user_relationships' -require 'datadog_api_client/v2/models/user_response' -require 'datadog_api_client/v2/models/user_response_included_item' -require 'datadog_api_client/v2/models/user_response_relationships' -require 'datadog_api_client/v2/models/user_update_attributes' -require 'datadog_api_client/v2/models/user_update_data' -require 'datadog_api_client/v2/models/user_update_request' -require 'datadog_api_client/v2/models/users_response' -require 'datadog_api_client/v2/models/users_type' - -# APIs -require 'datadog_api_client/v2/api/dashboard_lists_api' -require 'datadog_api_client/v2/api/incident_services_api' -require 'datadog_api_client/v2/api/incident_teams_api' -require 'datadog_api_client/v2/api/incidents_api' -require 'datadog_api_client/v2/api/key_management_api' -require 'datadog_api_client/v2/api/logs_api' -require 'datadog_api_client/v2/api/logs_archives_api' -require 'datadog_api_client/v2/api/logs_metrics_api' -require 'datadog_api_client/v2/api/processes_api' -require 'datadog_api_client/v2/api/roles_api' -require 'datadog_api_client/v2/api/security_monitoring_api' -require 'datadog_api_client/v2/api/users_api' - -module DatadogAPIClient::V2 - class << self - # Customize default settings for the SDK using block. - # DatadogAPIClient::V2.configure do |config| - # config.username = "xxx" - # config.password = "xxx" - # end - # If no block given, return the default Configuration object. - def configure - if block_given? - yield(Configuration.default) - else - Configuration.default - end - end - end -end diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb deleted file mode 100644 index 8c89c1853aac..000000000000 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb +++ /dev/null @@ -1,264 +0,0 @@ -=begin -#Datadog API V2 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::V2 - # The object sent with the request to retrieve a list of logs from your organization. - class LogsAggregateRequest - # The list of metrics or timeseries to compute for the retrieved buckets. - attr_accessor :compute - - attr_accessor :filter - - # The rules for the group by - attr_accessor :group_by - - attr_accessor :options - - attr_accessor :page - - # Attribute mapping from ruby-style variable name to JSON key. - def self.attribute_map - { - :'compute' => :'compute', - :'filter' => :'filter', - :'group_by' => :'group_by', - :'options' => :'options', - :'page' => :'page' - } - end - - # Returns all the JSON keys this model knows about - def self.acceptable_attributes - attribute_map.values - end - - # Attribute type mapping. - def self.openapi_types - { - :'compute' => :'Array', - :'filter' => :'LogsQueryFilter', - :'group_by' => :'Array', - :'options' => :'LogsQueryOptions', - :'page' => :'LogsAggregateRequestPage' - } - end - - # List of attributes with nullable: true - def self.openapi_nullable - Set.new([ - ]) - end - - # Initializes the object - # @param [Hash] attributes Model attributes in the form of hash - def initialize(attributes = {}) - if (!attributes.is_a?(Hash)) - fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequest` initialize method" - end - - # check to see if the attribute exists and convert string to symbol for hash key - attributes = attributes.each_with_object({}) { |(k, v), h| - if (!self.class.attribute_map.key?(k.to_sym)) - fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect - end - h[k.to_sym] = v - } - - if attributes.key?(:'compute') - if (value = attributes[:'compute']).is_a?(Array) - self.compute = value - end - end - - if attributes.key?(:'filter') - self.filter = attributes[:'filter'] - end - - if attributes.key?(:'group_by') - if (value = attributes[:'group_by']).is_a?(Array) - self.group_by = value - end - end - - if attributes.key?(:'options') - self.options = attributes[:'options'] - end - - if attributes.key?(:'page') - self.page = attributes[:'page'] - end - end - - # Show invalid properties with the reasons. Usually used together with valid? - # @return Array for valid properties with the reasons - def list_invalid_properties - invalid_properties = Array.new - invalid_properties - end - - # Check to see if the all the properties in the model are valid - # @return true if the model is valid - def valid? - true - end - - # Checks equality by comparing each attribute. - # @param [Object] Object to be compared - def ==(o) - return true if self.equal?(o) - self.class == o.class && - compute == o.compute && - filter == o.filter && - group_by == o.group_by && - options == o.options && - page == o.page - end - - # @see the `==` method - # @param [Object] Object to be compared - def eql?(o) - self == o - end - - # Calculates hash code according to all attributes. - # @return [Integer] Hash code - def hash - [compute, filter, group_by, options, page].hash - end - - # Builds the object from hash - # @param [Hash] attributes Model attributes in the form of hash - # @return [Object] Returns the model itself - def self.build_from_hash(attributes) - new.build_from_hash(attributes) - end - - # Builds the object from hash - # @param [Hash] attributes Model attributes in the form of hash - # @return [Object] Returns the model itself - def build_from_hash(attributes) - return nil unless attributes.is_a?(Hash) - self.class.openapi_types.each_pair do |key, type| - if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key) - self.send("#{key}=", nil) - elsif type =~ /\AArray<(.*)>/i - # check to ensure the input is an array given that the attribute - # is documented as an array but the input is not - if attributes[self.class.attribute_map[key]].is_a?(Array) - self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) }) - end - elsif !attributes[self.class.attribute_map[key]].nil? - self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) - end - end - - self - end - - # Deserializes the data based on type - # @param string type Data type - # @param string value Value to be deserialized - # @return [Object] Deserialized data - def _deserialize(type, value) - case type.to_sym - when :Time - Time.parse(value) - when :Date - Date.parse(value) - when :String - value.to_s - when :Integer - value.to_i - when :Float - value.to_f - when :Boolean - if value.to_s =~ /\A(true|t|yes|y|1)\z/i - true - else - false - end - when :Object - # generic object (usually a Hash), return directly - value - when /\AArray<(?.+)>\z/ - inner_type = Regexp.last_match[:inner_type] - value.map { |v| _deserialize(inner_type, v) } - when /\AHash<(?.+?), (?.+)>\z/ - k_type = Regexp.last_match[:k_type] - v_type = Regexp.last_match[:v_type] - {}.tap do |hash| - value.each do |k, v| - hash[_deserialize(k_type, k)] = _deserialize(v_type, v) - end - end - else # model - # models (e.g. Pet) or oneOf - klass = DatadogAPIClient::V2.const_get(type) - klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value) - end - end - - # Returns the string representation of the object - # @return [String] String presentation of the object - def to_s - to_hash.to_s - end - - # to_body is an alias to to_hash (backward compatibility) - # @return [Hash] Returns the object in the form of hash - def to_body - to_hash - end - - # Returns the object in the form of hash - # @return [Hash] Returns the object in the form of hash - def to_hash - hash = {} - self.class.attribute_map.each_pair do |attr, param| - value = self.send(attr) - if value.nil? - is_nullable = self.class.openapi_nullable.include?(attr) - next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}")) - end - - hash[param] = _to_hash(value) - end - hash - end - - # Outputs non-array value in the form of hash - # For object, use to_hash. Otherwise, just return the value - # @param [Object] value Any valid value - # @return [Hash] Returns the value in the form of hash - def _to_hash(value) - if value.is_a?(Array) - value.compact.map { |v| _to_hash(v) } - elsif value.is_a?(Hash) - {}.tap do |hash| - value.each { |k, v| hash[k] = _to_hash(v) } - end - elsif value.respond_to? :to_hash - value.to_hash - else - value - end - end - - end - -end diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb deleted file mode 100644 index fce2dd79328e..000000000000 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb +++ /dev/null @@ -1,223 +0,0 @@ -=begin -#Datadog API V2 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::V2 - # Paging settings - class LogsAggregateRequestPage - # The returned paging point to use to get the next results - attr_accessor :cursor - - # Attribute mapping from ruby-style variable name to JSON key. - def self.attribute_map - { - :'cursor' => :'cursor' - } - end - - # Returns all the JSON keys this model knows about - def self.acceptable_attributes - attribute_map.values - end - - # Attribute type mapping. - def self.openapi_types - { - :'cursor' => :'String' - } - end - - # List of attributes with nullable: true - def self.openapi_nullable - Set.new([ - ]) - end - - # Initializes the object - # @param [Hash] attributes Model attributes in the form of hash - def initialize(attributes = {}) - if (!attributes.is_a?(Hash)) - fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPage` initialize method" - end - - # check to see if the attribute exists and convert string to symbol for hash key - attributes = attributes.each_with_object({}) { |(k, v), h| - if (!self.class.attribute_map.key?(k.to_sym)) - fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPage`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect - end - h[k.to_sym] = v - } - - if attributes.key?(:'cursor') - self.cursor = attributes[:'cursor'] - end - end - - # Show invalid properties with the reasons. Usually used together with valid? - # @return Array for valid properties with the reasons - def list_invalid_properties - invalid_properties = Array.new - invalid_properties - end - - # Check to see if the all the properties in the model are valid - # @return true if the model is valid - def valid? - true - end - - # Checks equality by comparing each attribute. - # @param [Object] Object to be compared - def ==(o) - return true if self.equal?(o) - self.class == o.class && - cursor == o.cursor - end - - # @see the `==` method - # @param [Object] Object to be compared - def eql?(o) - self == o - end - - # Calculates hash code according to all attributes. - # @return [Integer] Hash code - def hash - [cursor].hash - end - - # Builds the object from hash - # @param [Hash] attributes Model attributes in the form of hash - # @return [Object] Returns the model itself - def self.build_from_hash(attributes) - new.build_from_hash(attributes) - end - - # Builds the object from hash - # @param [Hash] attributes Model attributes in the form of hash - # @return [Object] Returns the model itself - def build_from_hash(attributes) - return nil unless attributes.is_a?(Hash) - self.class.openapi_types.each_pair do |key, type| - if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key) - self.send("#{key}=", nil) - elsif type =~ /\AArray<(.*)>/i - # check to ensure the input is an array given that the attribute - # is documented as an array but the input is not - if attributes[self.class.attribute_map[key]].is_a?(Array) - self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) }) - end - elsif !attributes[self.class.attribute_map[key]].nil? - self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) - end - end - - self - end - - # Deserializes the data based on type - # @param string type Data type - # @param string value Value to be deserialized - # @return [Object] Deserialized data - def _deserialize(type, value) - case type.to_sym - when :Time - Time.parse(value) - when :Date - Date.parse(value) - when :String - value.to_s - when :Integer - value.to_i - when :Float - value.to_f - when :Boolean - if value.to_s =~ /\A(true|t|yes|y|1)\z/i - true - else - false - end - when :Object - # generic object (usually a Hash), return directly - value - when /\AArray<(?.+)>\z/ - inner_type = Regexp.last_match[:inner_type] - value.map { |v| _deserialize(inner_type, v) } - when /\AHash<(?.+?), (?.+)>\z/ - k_type = Regexp.last_match[:k_type] - v_type = Regexp.last_match[:v_type] - {}.tap do |hash| - value.each do |k, v| - hash[_deserialize(k_type, k)] = _deserialize(v_type, v) - end - end - else # model - # models (e.g. Pet) or oneOf - klass = DatadogAPIClient::V2.const_get(type) - klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value) - end - end - - # Returns the string representation of the object - # @return [String] String presentation of the object - def to_s - to_hash.to_s - end - - # to_body is an alias to to_hash (backward compatibility) - # @return [Hash] Returns the object in the form of hash - def to_body - to_hash - end - - # Returns the object in the form of hash - # @return [Hash] Returns the object in the form of hash - def to_hash - hash = {} - self.class.attribute_map.each_pair do |attr, param| - value = self.send(attr) - if value.nil? - is_nullable = self.class.openapi_nullable.include?(attr) - next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}")) - end - - hash[param] = _to_hash(value) - end - hash - end - - # Outputs non-array value in the form of hash - # For object, use to_hash. Otherwise, just return the value - # @param [Object] value Any valid value - # @return [Hash] Returns the value in the form of hash - def _to_hash(value) - if value.is_a?(Array) - value.compact.map { |v| _to_hash(v) } - elsif value.is_a?(Hash) - {}.tap do |hash| - value.each { |k, v| hash[k] = _to_hash(v) } - end - elsif value.respond_to? :to_hash - value.to_hash - else - value - end - end - - end - -end From db2eab874a1403e01a479205be73ae461503c510 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 15:05:17 +0100 Subject: [PATCH 4/8] Revert "fix" This reverts commit e991d4dc3a4c68396d6f00d60088a6d06c3da355. --- lib/datadog_api_client/v2.rb | 326 ++++++++++++++++++ .../v2/models/logs_aggregate_request.rb | 264 ++++++++++++++ .../v2/models/logs_aggregate_request_page.rb | 223 ++++++++++++ 3 files changed, 813 insertions(+) create mode 100644 lib/datadog_api_client/v2.rb create mode 100644 lib/datadog_api_client/v2/models/logs_aggregate_request.rb create mode 100644 lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb diff --git a/lib/datadog_api_client/v2.rb b/lib/datadog_api_client/v2.rb new file mode 100644 index 000000000000..9395e2517a06 --- /dev/null +++ b/lib/datadog_api_client/v2.rb @@ -0,0 +1,326 @@ +=begin +#Datadog API V2 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 + +# Common files +require 'datadog_api_client/version' +require 'datadog_api_client/v2/api_client' +require 'datadog_api_client/v2/api_error' +require 'datadog_api_client/v2/configuration' + +# Models +require 'datadog_api_client/v2/models/api_error_response' +require 'datadog_api_client/v2/models/api_key_create_attributes' +require 'datadog_api_client/v2/models/api_key_create_data' +require 'datadog_api_client/v2/models/api_key_create_request' +require 'datadog_api_client/v2/models/api_key_relationships' +require 'datadog_api_client/v2/models/api_key_response' +require 'datadog_api_client/v2/models/api_key_response_included_item' +require 'datadog_api_client/v2/models/api_key_update_attributes' +require 'datadog_api_client/v2/models/api_key_update_data' +require 'datadog_api_client/v2/models/api_key_update_request' +require 'datadog_api_client/v2/models/api_keys_response' +require 'datadog_api_client/v2/models/api_keys_sort' +require 'datadog_api_client/v2/models/api_keys_type' +require 'datadog_api_client/v2/models/application_key_create_attributes' +require 'datadog_api_client/v2/models/application_key_create_data' +require 'datadog_api_client/v2/models/application_key_create_request' +require 'datadog_api_client/v2/models/application_key_relationships' +require 'datadog_api_client/v2/models/application_key_response' +require 'datadog_api_client/v2/models/application_key_response_included_item' +require 'datadog_api_client/v2/models/application_key_update_attributes' +require 'datadog_api_client/v2/models/application_key_update_data' +require 'datadog_api_client/v2/models/application_key_update_request' +require 'datadog_api_client/v2/models/application_keys_sort' +require 'datadog_api_client/v2/models/application_keys_type' +require 'datadog_api_client/v2/models/creator' +require 'datadog_api_client/v2/models/dashboard_list_add_items_request' +require 'datadog_api_client/v2/models/dashboard_list_add_items_response' +require 'datadog_api_client/v2/models/dashboard_list_delete_items_request' +require 'datadog_api_client/v2/models/dashboard_list_delete_items_response' +require 'datadog_api_client/v2/models/dashboard_list_item' +require 'datadog_api_client/v2/models/dashboard_list_item_request' +require 'datadog_api_client/v2/models/dashboard_list_item_response' +require 'datadog_api_client/v2/models/dashboard_list_items' +require 'datadog_api_client/v2/models/dashboard_list_update_items_request' +require 'datadog_api_client/v2/models/dashboard_list_update_items_response' +require 'datadog_api_client/v2/models/dashboard_type' +require 'datadog_api_client/v2/models/full_api_key' +require 'datadog_api_client/v2/models/full_api_key_attributes' +require 'datadog_api_client/v2/models/full_application_key' +require 'datadog_api_client/v2/models/full_application_key_attributes' +require 'datadog_api_client/v2/models/incident_create_attributes' +require 'datadog_api_client/v2/models/incident_create_data' +require 'datadog_api_client/v2/models/incident_create_relationships' +require 'datadog_api_client/v2/models/incident_create_request' +require 'datadog_api_client/v2/models/incident_field_attributes' +require 'datadog_api_client/v2/models/incident_field_attributes_multiple_value' +require 'datadog_api_client/v2/models/incident_field_attributes_single_value' +require 'datadog_api_client/v2/models/incident_field_attributes_single_value_type' +require 'datadog_api_client/v2/models/incident_field_attributes_value_type' +require 'datadog_api_client/v2/models/incident_integration_metadata_type' +require 'datadog_api_client/v2/models/incident_postmortem_type' +require 'datadog_api_client/v2/models/incident_related_object' +require 'datadog_api_client/v2/models/incident_response' +require 'datadog_api_client/v2/models/incident_response_attributes' +require 'datadog_api_client/v2/models/incident_response_data' +require 'datadog_api_client/v2/models/incident_response_included_item' +require 'datadog_api_client/v2/models/incident_response_relationships' +require 'datadog_api_client/v2/models/incident_service_create_attributes' +require 'datadog_api_client/v2/models/incident_service_create_data' +require 'datadog_api_client/v2/models/incident_service_create_request' +require 'datadog_api_client/v2/models/incident_service_included_items' +require 'datadog_api_client/v2/models/incident_service_relationships' +require 'datadog_api_client/v2/models/incident_service_response' +require 'datadog_api_client/v2/models/incident_service_response_attributes' +require 'datadog_api_client/v2/models/incident_service_response_data' +require 'datadog_api_client/v2/models/incident_service_type' +require 'datadog_api_client/v2/models/incident_service_update_attributes' +require 'datadog_api_client/v2/models/incident_service_update_data' +require 'datadog_api_client/v2/models/incident_service_update_request' +require 'datadog_api_client/v2/models/incident_services_response' +require 'datadog_api_client/v2/models/incident_services_response_meta' +require 'datadog_api_client/v2/models/incident_services_response_meta_pagination' +require 'datadog_api_client/v2/models/incident_team_create_attributes' +require 'datadog_api_client/v2/models/incident_team_create_data' +require 'datadog_api_client/v2/models/incident_team_create_request' +require 'datadog_api_client/v2/models/incident_team_included_items' +require 'datadog_api_client/v2/models/incident_team_relationships' +require 'datadog_api_client/v2/models/incident_team_response' +require 'datadog_api_client/v2/models/incident_team_response_attributes' +require 'datadog_api_client/v2/models/incident_team_response_data' +require 'datadog_api_client/v2/models/incident_team_type' +require 'datadog_api_client/v2/models/incident_team_update_attributes' +require 'datadog_api_client/v2/models/incident_team_update_data' +require 'datadog_api_client/v2/models/incident_team_update_request' +require 'datadog_api_client/v2/models/incident_teams_response' +require 'datadog_api_client/v2/models/incident_timeline_cell_create_attributes' +require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_content_type' +require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_create_attributes' +require 'datadog_api_client/v2/models/incident_timeline_cell_markdown_create_attributes_content' +require 'datadog_api_client/v2/models/incident_type' +require 'datadog_api_client/v2/models/incident_update_attributes' +require 'datadog_api_client/v2/models/incident_update_data' +require 'datadog_api_client/v2/models/incident_update_relationships' +require 'datadog_api_client/v2/models/incident_update_request' +require 'datadog_api_client/v2/models/incidents_response' +require 'datadog_api_client/v2/models/list_application_keys_response' +require 'datadog_api_client/v2/models/log' +require 'datadog_api_client/v2/models/log_attributes' +require 'datadog_api_client/v2/models/log_type' +require 'datadog_api_client/v2/models/logs_aggregate_bucket' +require 'datadog_api_client/v2/models/logs_aggregate_bucket_value' +require 'datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point' +require 'datadog_api_client/v2/models/logs_aggregate_request' +require 'datadog_api_client/v2/models/logs_aggregate_request_page' +require 'datadog_api_client/v2/models/logs_aggregate_response' +require 'datadog_api_client/v2/models/logs_aggregate_response_data' +require 'datadog_api_client/v2/models/logs_aggregate_response_status' +require 'datadog_api_client/v2/models/logs_aggregate_sort' +require 'datadog_api_client/v2/models/logs_aggregate_sort_type' +require 'datadog_api_client/v2/models/logs_aggregation_function' +require 'datadog_api_client/v2/models/logs_archive' +require 'datadog_api_client/v2/models/logs_archive_attributes' +require 'datadog_api_client/v2/models/logs_archive_create_request' +require 'datadog_api_client/v2/models/logs_archive_create_request_attributes' +require 'datadog_api_client/v2/models/logs_archive_create_request_definition' +require 'datadog_api_client/v2/models/logs_archive_create_request_destination' +require 'datadog_api_client/v2/models/logs_archive_definition' +require 'datadog_api_client/v2/models/logs_archive_destination' +require 'datadog_api_client/v2/models/logs_archive_destination_azure' +require 'datadog_api_client/v2/models/logs_archive_destination_azure_type' +require 'datadog_api_client/v2/models/logs_archive_destination_gcs' +require 'datadog_api_client/v2/models/logs_archive_destination_gcs_type' +require 'datadog_api_client/v2/models/logs_archive_destination_s3' +require 'datadog_api_client/v2/models/logs_archive_destination_s3_type' +require 'datadog_api_client/v2/models/logs_archive_integration_azure' +require 'datadog_api_client/v2/models/logs_archive_integration_gcs' +require 'datadog_api_client/v2/models/logs_archive_integration_s3' +require 'datadog_api_client/v2/models/logs_archive_order' +require 'datadog_api_client/v2/models/logs_archive_order_attributes' +require 'datadog_api_client/v2/models/logs_archive_order_definition' +require 'datadog_api_client/v2/models/logs_archive_order_definition_type' +require 'datadog_api_client/v2/models/logs_archive_state' +require 'datadog_api_client/v2/models/logs_archives' +require 'datadog_api_client/v2/models/logs_compute' +require 'datadog_api_client/v2/models/logs_compute_type' +require 'datadog_api_client/v2/models/logs_group_by' +require 'datadog_api_client/v2/models/logs_group_by_histogram' +require 'datadog_api_client/v2/models/logs_group_by_missing' +require 'datadog_api_client/v2/models/logs_group_by_total' +require 'datadog_api_client/v2/models/logs_list_request' +require 'datadog_api_client/v2/models/logs_list_request_page' +require 'datadog_api_client/v2/models/logs_list_response' +require 'datadog_api_client/v2/models/logs_list_response_links' +require 'datadog_api_client/v2/models/logs_metric_compute' +require 'datadog_api_client/v2/models/logs_metric_compute_aggregation_type' +require 'datadog_api_client/v2/models/logs_metric_create_attributes' +require 'datadog_api_client/v2/models/logs_metric_create_data' +require 'datadog_api_client/v2/models/logs_metric_create_request' +require 'datadog_api_client/v2/models/logs_metric_filter' +require 'datadog_api_client/v2/models/logs_metric_group_by' +require 'datadog_api_client/v2/models/logs_metric_response' +require 'datadog_api_client/v2/models/logs_metric_response_attributes' +require 'datadog_api_client/v2/models/logs_metric_response_compute' +require 'datadog_api_client/v2/models/logs_metric_response_compute_aggregation_type' +require 'datadog_api_client/v2/models/logs_metric_response_data' +require 'datadog_api_client/v2/models/logs_metric_response_filter' +require 'datadog_api_client/v2/models/logs_metric_response_group_by' +require 'datadog_api_client/v2/models/logs_metric_type' +require 'datadog_api_client/v2/models/logs_metric_update_attributes' +require 'datadog_api_client/v2/models/logs_metric_update_data' +require 'datadog_api_client/v2/models/logs_metric_update_request' +require 'datadog_api_client/v2/models/logs_metrics_response' +require 'datadog_api_client/v2/models/logs_query_filter' +require 'datadog_api_client/v2/models/logs_query_options' +require 'datadog_api_client/v2/models/logs_response_metadata' +require 'datadog_api_client/v2/models/logs_response_metadata_page' +require 'datadog_api_client/v2/models/logs_sort' +require 'datadog_api_client/v2/models/logs_sort_order' +require 'datadog_api_client/v2/models/logs_warning' +require 'datadog_api_client/v2/models/organization' +require 'datadog_api_client/v2/models/organization_attributes' +require 'datadog_api_client/v2/models/organizations_type' +require 'datadog_api_client/v2/models/pagination' +require 'datadog_api_client/v2/models/partial_api_key' +require 'datadog_api_client/v2/models/partial_api_key_attributes' +require 'datadog_api_client/v2/models/partial_application_key' +require 'datadog_api_client/v2/models/partial_application_key_attributes' +require 'datadog_api_client/v2/models/permission' +require 'datadog_api_client/v2/models/permission_attributes' +require 'datadog_api_client/v2/models/permissions_response' +require 'datadog_api_client/v2/models/permissions_type' +require 'datadog_api_client/v2/models/process_summaries_meta' +require 'datadog_api_client/v2/models/process_summaries_meta_page' +require 'datadog_api_client/v2/models/process_summaries_response' +require 'datadog_api_client/v2/models/process_summary' +require 'datadog_api_client/v2/models/process_summary_attributes' +require 'datadog_api_client/v2/models/process_summary_type' +require 'datadog_api_client/v2/models/query_sort_order' +require 'datadog_api_client/v2/models/relationship_to_incident_integration_metadata_data' +require 'datadog_api_client/v2/models/relationship_to_incident_integration_metadatas' +require 'datadog_api_client/v2/models/relationship_to_incident_postmortem' +require 'datadog_api_client/v2/models/relationship_to_incident_postmortem_data' +require 'datadog_api_client/v2/models/relationship_to_organization' +require 'datadog_api_client/v2/models/relationship_to_organization_data' +require 'datadog_api_client/v2/models/relationship_to_organizations' +require 'datadog_api_client/v2/models/relationship_to_permission' +require 'datadog_api_client/v2/models/relationship_to_permission_data' +require 'datadog_api_client/v2/models/relationship_to_permissions' +require 'datadog_api_client/v2/models/relationship_to_role' +require 'datadog_api_client/v2/models/relationship_to_role_data' +require 'datadog_api_client/v2/models/relationship_to_roles' +require 'datadog_api_client/v2/models/relationship_to_user' +require 'datadog_api_client/v2/models/relationship_to_user_data' +require 'datadog_api_client/v2/models/relationship_to_users' +require 'datadog_api_client/v2/models/response_meta_attributes' +require 'datadog_api_client/v2/models/role' +require 'datadog_api_client/v2/models/role_attributes' +require 'datadog_api_client/v2/models/role_create_attributes' +require 'datadog_api_client/v2/models/role_create_data' +require 'datadog_api_client/v2/models/role_create_request' +require 'datadog_api_client/v2/models/role_create_response' +require 'datadog_api_client/v2/models/role_create_response_data' +require 'datadog_api_client/v2/models/role_relationships' +require 'datadog_api_client/v2/models/role_response' +require 'datadog_api_client/v2/models/role_response_relationships' +require 'datadog_api_client/v2/models/role_update_attributes' +require 'datadog_api_client/v2/models/role_update_data' +require 'datadog_api_client/v2/models/role_update_request' +require 'datadog_api_client/v2/models/role_update_response' +require 'datadog_api_client/v2/models/role_update_response_data' +require 'datadog_api_client/v2/models/roles_response' +require 'datadog_api_client/v2/models/roles_sort' +require 'datadog_api_client/v2/models/roles_type' +require 'datadog_api_client/v2/models/security_monitoring_filter' +require 'datadog_api_client/v2/models/security_monitoring_filter_action' +require 'datadog_api_client/v2/models/security_monitoring_list_rules_response' +require 'datadog_api_client/v2/models/security_monitoring_rule_case' +require 'datadog_api_client/v2/models/security_monitoring_rule_case_create' +require 'datadog_api_client/v2/models/security_monitoring_rule_create_payload' +require 'datadog_api_client/v2/models/security_monitoring_rule_evaluation_window' +require 'datadog_api_client/v2/models/security_monitoring_rule_keep_alive' +require 'datadog_api_client/v2/models/security_monitoring_rule_max_signal_duration' +require 'datadog_api_client/v2/models/security_monitoring_rule_options' +require 'datadog_api_client/v2/models/security_monitoring_rule_query' +require 'datadog_api_client/v2/models/security_monitoring_rule_query_aggregation' +require 'datadog_api_client/v2/models/security_monitoring_rule_query_create' +require 'datadog_api_client/v2/models/security_monitoring_rule_response' +require 'datadog_api_client/v2/models/security_monitoring_rule_severity' +require 'datadog_api_client/v2/models/security_monitoring_rule_update_payload' +require 'datadog_api_client/v2/models/security_monitoring_signal' +require 'datadog_api_client/v2/models/security_monitoring_signal_attributes' +require 'datadog_api_client/v2/models/security_monitoring_signal_list_request' +require 'datadog_api_client/v2/models/security_monitoring_signal_list_request_filter' +require 'datadog_api_client/v2/models/security_monitoring_signal_list_request_page' +require 'datadog_api_client/v2/models/security_monitoring_signal_type' +require 'datadog_api_client/v2/models/security_monitoring_signals_list_response' +require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_links' +require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_meta' +require 'datadog_api_client/v2/models/security_monitoring_signals_list_response_meta_page' +require 'datadog_api_client/v2/models/security_monitoring_signals_sort' +require 'datadog_api_client/v2/models/user' +require 'datadog_api_client/v2/models/user_attributes' +require 'datadog_api_client/v2/models/user_create_attributes' +require 'datadog_api_client/v2/models/user_create_data' +require 'datadog_api_client/v2/models/user_create_request' +require 'datadog_api_client/v2/models/user_invitation_data' +require 'datadog_api_client/v2/models/user_invitation_data_attributes' +require 'datadog_api_client/v2/models/user_invitation_relationships' +require 'datadog_api_client/v2/models/user_invitation_response' +require 'datadog_api_client/v2/models/user_invitation_response_data' +require 'datadog_api_client/v2/models/user_invitations_request' +require 'datadog_api_client/v2/models/user_invitations_response' +require 'datadog_api_client/v2/models/user_invitations_type' +require 'datadog_api_client/v2/models/user_relationships' +require 'datadog_api_client/v2/models/user_response' +require 'datadog_api_client/v2/models/user_response_included_item' +require 'datadog_api_client/v2/models/user_response_relationships' +require 'datadog_api_client/v2/models/user_update_attributes' +require 'datadog_api_client/v2/models/user_update_data' +require 'datadog_api_client/v2/models/user_update_request' +require 'datadog_api_client/v2/models/users_response' +require 'datadog_api_client/v2/models/users_type' + +# APIs +require 'datadog_api_client/v2/api/dashboard_lists_api' +require 'datadog_api_client/v2/api/incident_services_api' +require 'datadog_api_client/v2/api/incident_teams_api' +require 'datadog_api_client/v2/api/incidents_api' +require 'datadog_api_client/v2/api/key_management_api' +require 'datadog_api_client/v2/api/logs_api' +require 'datadog_api_client/v2/api/logs_archives_api' +require 'datadog_api_client/v2/api/logs_metrics_api' +require 'datadog_api_client/v2/api/processes_api' +require 'datadog_api_client/v2/api/roles_api' +require 'datadog_api_client/v2/api/security_monitoring_api' +require 'datadog_api_client/v2/api/users_api' + +module DatadogAPIClient::V2 + class << self + # Customize default settings for the SDK using block. + # DatadogAPIClient::V2.configure do |config| + # config.username = "xxx" + # config.password = "xxx" + # end + # If no block given, return the default Configuration object. + def configure + if block_given? + yield(Configuration.default) + else + Configuration.default + end + end + end +end diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb new file mode 100644 index 000000000000..8c89c1853aac --- /dev/null +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb @@ -0,0 +1,264 @@ +=begin +#Datadog API V2 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::V2 + # The object sent with the request to retrieve a list of logs from your organization. + class LogsAggregateRequest + # The list of metrics or timeseries to compute for the retrieved buckets. + attr_accessor :compute + + attr_accessor :filter + + # The rules for the group by + attr_accessor :group_by + + attr_accessor :options + + attr_accessor :page + + # Attribute mapping from ruby-style variable name to JSON key. + def self.attribute_map + { + :'compute' => :'compute', + :'filter' => :'filter', + :'group_by' => :'group_by', + :'options' => :'options', + :'page' => :'page' + } + end + + # Returns all the JSON keys this model knows about + def self.acceptable_attributes + attribute_map.values + end + + # Attribute type mapping. + def self.openapi_types + { + :'compute' => :'Array', + :'filter' => :'LogsQueryFilter', + :'group_by' => :'Array', + :'options' => :'LogsQueryOptions', + :'page' => :'LogsAggregateRequestPage' + } + end + + # List of attributes with nullable: true + def self.openapi_nullable + Set.new([ + ]) + end + + # Initializes the object + # @param [Hash] attributes Model attributes in the form of hash + def initialize(attributes = {}) + if (!attributes.is_a?(Hash)) + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequest` initialize method" + end + + # check to see if the attribute exists and convert string to symbol for hash key + attributes = attributes.each_with_object({}) { |(k, v), h| + if (!self.class.attribute_map.key?(k.to_sym)) + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + end + h[k.to_sym] = v + } + + if attributes.key?(:'compute') + if (value = attributes[:'compute']).is_a?(Array) + self.compute = value + end + end + + if attributes.key?(:'filter') + self.filter = attributes[:'filter'] + end + + if attributes.key?(:'group_by') + if (value = attributes[:'group_by']).is_a?(Array) + self.group_by = value + end + end + + if attributes.key?(:'options') + self.options = attributes[:'options'] + end + + if attributes.key?(:'page') + self.page = attributes[:'page'] + end + end + + # Show invalid properties with the reasons. Usually used together with valid? + # @return Array for valid properties with the reasons + def list_invalid_properties + invalid_properties = Array.new + invalid_properties + end + + # Check to see if the all the properties in the model are valid + # @return true if the model is valid + def valid? + true + end + + # Checks equality by comparing each attribute. + # @param [Object] Object to be compared + def ==(o) + return true if self.equal?(o) + self.class == o.class && + compute == o.compute && + filter == o.filter && + group_by == o.group_by && + options == o.options && + page == o.page + end + + # @see the `==` method + # @param [Object] Object to be compared + def eql?(o) + self == o + end + + # Calculates hash code according to all attributes. + # @return [Integer] Hash code + def hash + [compute, filter, group_by, options, page].hash + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def self.build_from_hash(attributes) + new.build_from_hash(attributes) + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def build_from_hash(attributes) + return nil unless attributes.is_a?(Hash) + self.class.openapi_types.each_pair do |key, type| + if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key) + self.send("#{key}=", nil) + elsif type =~ /\AArray<(.*)>/i + # check to ensure the input is an array given that the attribute + # is documented as an array but the input is not + if attributes[self.class.attribute_map[key]].is_a?(Array) + self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) }) + end + elsif !attributes[self.class.attribute_map[key]].nil? + self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) + end + end + + self + end + + # Deserializes the data based on type + # @param string type Data type + # @param string value Value to be deserialized + # @return [Object] Deserialized data + def _deserialize(type, value) + case type.to_sym + when :Time + Time.parse(value) + when :Date + Date.parse(value) + when :String + value.to_s + when :Integer + value.to_i + when :Float + value.to_f + when :Boolean + if value.to_s =~ /\A(true|t|yes|y|1)\z/i + true + else + false + end + when :Object + # generic object (usually a Hash), return directly + value + when /\AArray<(?.+)>\z/ + inner_type = Regexp.last_match[:inner_type] + value.map { |v| _deserialize(inner_type, v) } + when /\AHash<(?.+?), (?.+)>\z/ + k_type = Regexp.last_match[:k_type] + v_type = Regexp.last_match[:v_type] + {}.tap do |hash| + value.each do |k, v| + hash[_deserialize(k_type, k)] = _deserialize(v_type, v) + end + end + else # model + # models (e.g. Pet) or oneOf + klass = DatadogAPIClient::V2.const_get(type) + klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value) + end + end + + # Returns the string representation of the object + # @return [String] String presentation of the object + def to_s + to_hash.to_s + end + + # to_body is an alias to to_hash (backward compatibility) + # @return [Hash] Returns the object in the form of hash + def to_body + to_hash + end + + # Returns the object in the form of hash + # @return [Hash] Returns the object in the form of hash + def to_hash + hash = {} + self.class.attribute_map.each_pair do |attr, param| + value = self.send(attr) + if value.nil? + is_nullable = self.class.openapi_nullable.include?(attr) + next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}")) + end + + hash[param] = _to_hash(value) + end + hash + end + + # Outputs non-array value in the form of hash + # For object, use to_hash. Otherwise, just return the value + # @param [Object] value Any valid value + # @return [Hash] Returns the value in the form of hash + def _to_hash(value) + if value.is_a?(Array) + value.compact.map { |v| _to_hash(v) } + elsif value.is_a?(Hash) + {}.tap do |hash| + value.each { |k, v| hash[k] = _to_hash(v) } + end + elsif value.respond_to? :to_hash + value.to_hash + else + value + end + end + + end + +end diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb new file mode 100644 index 000000000000..fce2dd79328e --- /dev/null +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb @@ -0,0 +1,223 @@ +=begin +#Datadog API V2 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::V2 + # Paging settings + class LogsAggregateRequestPage + # The returned paging point to use to get the next results + attr_accessor :cursor + + # Attribute mapping from ruby-style variable name to JSON key. + def self.attribute_map + { + :'cursor' => :'cursor' + } + end + + # Returns all the JSON keys this model knows about + def self.acceptable_attributes + attribute_map.values + end + + # Attribute type mapping. + def self.openapi_types + { + :'cursor' => :'String' + } + end + + # List of attributes with nullable: true + def self.openapi_nullable + Set.new([ + ]) + end + + # Initializes the object + # @param [Hash] attributes Model attributes in the form of hash + def initialize(attributes = {}) + if (!attributes.is_a?(Hash)) + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPage` initialize method" + end + + # check to see if the attribute exists and convert string to symbol for hash key + attributes = attributes.each_with_object({}) { |(k, v), h| + if (!self.class.attribute_map.key?(k.to_sym)) + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPage`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + end + h[k.to_sym] = v + } + + if attributes.key?(:'cursor') + self.cursor = attributes[:'cursor'] + end + end + + # Show invalid properties with the reasons. Usually used together with valid? + # @return Array for valid properties with the reasons + def list_invalid_properties + invalid_properties = Array.new + invalid_properties + end + + # Check to see if the all the properties in the model are valid + # @return true if the model is valid + def valid? + true + end + + # Checks equality by comparing each attribute. + # @param [Object] Object to be compared + def ==(o) + return true if self.equal?(o) + self.class == o.class && + cursor == o.cursor + end + + # @see the `==` method + # @param [Object] Object to be compared + def eql?(o) + self == o + end + + # Calculates hash code according to all attributes. + # @return [Integer] Hash code + def hash + [cursor].hash + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def self.build_from_hash(attributes) + new.build_from_hash(attributes) + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def build_from_hash(attributes) + return nil unless attributes.is_a?(Hash) + self.class.openapi_types.each_pair do |key, type| + if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key) + self.send("#{key}=", nil) + elsif type =~ /\AArray<(.*)>/i + # check to ensure the input is an array given that the attribute + # is documented as an array but the input is not + if attributes[self.class.attribute_map[key]].is_a?(Array) + self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) }) + end + elsif !attributes[self.class.attribute_map[key]].nil? + self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) + end + end + + self + end + + # Deserializes the data based on type + # @param string type Data type + # @param string value Value to be deserialized + # @return [Object] Deserialized data + def _deserialize(type, value) + case type.to_sym + when :Time + Time.parse(value) + when :Date + Date.parse(value) + when :String + value.to_s + when :Integer + value.to_i + when :Float + value.to_f + when :Boolean + if value.to_s =~ /\A(true|t|yes|y|1)\z/i + true + else + false + end + when :Object + # generic object (usually a Hash), return directly + value + when /\AArray<(?.+)>\z/ + inner_type = Regexp.last_match[:inner_type] + value.map { |v| _deserialize(inner_type, v) } + when /\AHash<(?.+?), (?.+)>\z/ + k_type = Regexp.last_match[:k_type] + v_type = Regexp.last_match[:v_type] + {}.tap do |hash| + value.each do |k, v| + hash[_deserialize(k_type, k)] = _deserialize(v_type, v) + end + end + else # model + # models (e.g. Pet) or oneOf + klass = DatadogAPIClient::V2.const_get(type) + klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value) + end + end + + # Returns the string representation of the object + # @return [String] String presentation of the object + def to_s + to_hash.to_s + end + + # to_body is an alias to to_hash (backward compatibility) + # @return [Hash] Returns the object in the form of hash + def to_body + to_hash + end + + # Returns the object in the form of hash + # @return [Hash] Returns the object in the form of hash + def to_hash + hash = {} + self.class.attribute_map.each_pair do |attr, param| + value = self.send(attr) + if value.nil? + is_nullable = self.class.openapi_nullable.include?(attr) + next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}")) + end + + hash[param] = _to_hash(value) + end + hash + end + + # Outputs non-array value in the form of hash + # For object, use to_hash. Otherwise, just return the value + # @param [Object] value Any valid value + # @return [Hash] Returns the value in the form of hash + def _to_hash(value) + if value.is_a?(Array) + value.compact.map { |v| _to_hash(v) } + elsif value.is_a?(Hash) + {}.tap do |hash| + value.each { |k, v| hash[k] = _to_hash(v) } + end + elsif value.respond_to? :to_hash + value.to_hash + else + value + end + end + + end + +end From 49bb4482ec16c80d0953492e8e193e4af6195db8 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 15:05:26 +0100 Subject: [PATCH 5/8] Revert "update" This reverts commit 3b65d9c3886af094a01a6b676a71c965edcc6725. --- .apigentools-info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index adb3019b1b2f..31c300f19afb 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,12 +4,12 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-28 09:55:44.647323", + "regenerated": "2021-01-27 17:33:33.083667", "spec_repo_commit": "9af4c1c" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-28 09:56:22.143213", + "regenerated": "2021-01-27 17:34:08.337826", "spec_repo_commit": "9af4c1c" } } From d039f6a1387e403deb158b65e00ca1215a6eabb7 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 15:05:39 +0100 Subject: [PATCH 6/8] Revert "[logs][v2][aggregate] fix aggregate paging name" This reverts commit 965b34ba2c813e286780c28aa9659191ec2e0750. --- .apigentools-info | 8 ++-- .openapi-generator/FILES | 6 +-- data/v2/openapi.yaml | 4 +- docs/v2/LogsAggregateRequest.md | 4 +- docs/v2/LogsAggregateRequestPage.md | 18 --------- docs/v2/LogsAggregateRequestPaging.md | 18 +++++++++ docs/v2/README.md | 2 +- lib/datadog_api_client/v2.rb | 2 +- .../v2/models/logs_aggregate_request.rb | 14 +++---- ...ge.rb => logs_aggregate_request_paging.rb} | 20 +++++----- .../logs_aggregate_request_page_spec.rb | 37 ------------------- 11 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 docs/v2/LogsAggregateRequestPage.md create mode 100644 docs/v2/LogsAggregateRequestPaging.md rename lib/datadog_api_client/v2/models/{logs_aggregate_request_page.rb => logs_aggregate_request_paging.rb} (92%) delete mode 100644 spec/v2/models/logs_aggregate_request_page_spec.rb diff --git a/.apigentools-info b/.apigentools-info index 31c300f19afb..7b2b75bd966f 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-27 17:33:33.083667", - "spec_repo_commit": "9af4c1c" + "regenerated": "2021-01-26 17:15:04.320994", + "spec_repo_commit": "db8c9ba" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-27 17:34:08.337826", - "spec_repo_commit": "9af4c1c" + "regenerated": "2021-01-26 17:15:16.348572", + "spec_repo_commit": "db8c9ba" } } } \ No newline at end of file diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 954cea074ac5..cc0901b862f2 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -109,7 +109,7 @@ docs/LogsAggregateBucket.md docs/LogsAggregateBucketValue.md docs/LogsAggregateBucketValueTimeseriesPoint.md docs/LogsAggregateRequest.md -docs/LogsAggregateRequestPage.md +docs/LogsAggregateRequestPaging.md docs/LogsAggregateResponse.md docs/LogsAggregateResponseData.md docs/LogsAggregateResponseStatus.md @@ -405,7 +405,7 @@ lib/datadog_api_client/v2/models/logs_aggregate_bucket.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point.rb lib/datadog_api_client/v2/models/logs_aggregate_request.rb -lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb +lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb lib/datadog_api_client/v2/models/logs_aggregate_response.rb lib/datadog_api_client/v2/models/logs_aggregate_response_data.rb lib/datadog_api_client/v2/models/logs_aggregate_response_status.rb @@ -691,7 +691,7 @@ spec/models/log_type_spec.rb spec/models/logs_aggregate_bucket_spec.rb spec/models/logs_aggregate_bucket_value_spec.rb spec/models/logs_aggregate_bucket_value_timeseries_point_spec.rb -spec/models/logs_aggregate_request_page_spec.rb +spec/models/logs_aggregate_request_paging_spec.rb spec/models/logs_aggregate_request_spec.rb spec/models/logs_aggregate_response_data_spec.rb spec/models/logs_aggregate_response_spec.rb diff --git a/data/v2/openapi.yaml b/data/v2/openapi.yaml index 54313b225748..9130418d84e3 100644 --- a/data/v2/openapi.yaml +++ b/data/v2/openapi.yaml @@ -1917,10 +1917,10 @@ components: type: array options: $ref: '#/components/schemas/LogsQueryOptions' - page: + paging: description: Paging settings properties: - cursor: + after: description: The returned paging point to use to get the next results example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== type: string diff --git a/docs/v2/LogsAggregateRequest.md b/docs/v2/LogsAggregateRequest.md index 1a9e7626ddba..47a9aa84c011 100644 --- a/docs/v2/LogsAggregateRequest.md +++ b/docs/v2/LogsAggregateRequest.md @@ -8,7 +8,7 @@ | **filter** | [**LogsQueryFilter**](LogsQueryFilter.md) | | [optional] | | **group_by** | [**Array<LogsGroupBy>**](LogsGroupBy.md) | The rules for the group by | [optional] | | **options** | [**LogsQueryOptions**](LogsQueryOptions.md) | | [optional] | -| **page** | [**LogsAggregateRequestPage**](LogsAggregateRequestPage.md) | | [optional] | +| **paging** | [**LogsAggregateRequestPaging**](LogsAggregateRequestPaging.md) | | [optional] | ## Example @@ -20,7 +20,7 @@ instance = DatadogAPIClient::V2::LogsAggregateRequest.new( filter: null, group_by: null, options: null, - page: null + paging: null ) ``` diff --git a/docs/v2/LogsAggregateRequestPage.md b/docs/v2/LogsAggregateRequestPage.md deleted file mode 100644 index 4cb00fde9cba..000000000000 --- a/docs/v2/LogsAggregateRequestPage.md +++ /dev/null @@ -1,18 +0,0 @@ -# DatadogAPIClient::V2::LogsAggregateRequestPage - -## Properties - -| Name | Type | Description | Notes | -| ---- | ---- | ----------- | ----- | -| **cursor** | **String** | The returned paging point to use to get the next results | [optional] | - -## Example - -```ruby -require 'datadog_api_client/v2' - -instance = DatadogAPIClient::V2::LogsAggregateRequestPage.new( - cursor: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== -) -``` - diff --git a/docs/v2/LogsAggregateRequestPaging.md b/docs/v2/LogsAggregateRequestPaging.md new file mode 100644 index 000000000000..c7bb17364a87 --- /dev/null +++ b/docs/v2/LogsAggregateRequestPaging.md @@ -0,0 +1,18 @@ +# DatadogAPIClient::V2::LogsAggregateRequestPaging + +## Properties + +| Name | Type | Description | Notes | +| ---- | ---- | ----------- | ----- | +| **after** | **String** | The returned paging point to use to get the next results | [optional] | + +## Example + +```ruby +require 'datadog_api_client/v2' + +instance = DatadogAPIClient::V2::LogsAggregateRequestPaging.new( + after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== +) +``` + diff --git a/docs/v2/README.md b/docs/v2/README.md index 018cf25f62df..9fa89cffba4c 100644 --- a/docs/v2/README.md +++ b/docs/v2/README.md @@ -272,7 +272,7 @@ Class | Method | HTTP request | Description - [DatadogAPIClient::V2::LogsAggregateBucketValue](LogsAggregateBucketValue.md) - [DatadogAPIClient::V2::LogsAggregateBucketValueTimeseriesPoint](LogsAggregateBucketValueTimeseriesPoint.md) - [DatadogAPIClient::V2::LogsAggregateRequest](LogsAggregateRequest.md) - - [DatadogAPIClient::V2::LogsAggregateRequestPage](LogsAggregateRequestPage.md) + - [DatadogAPIClient::V2::LogsAggregateRequestPaging](LogsAggregateRequestPaging.md) - [DatadogAPIClient::V2::LogsAggregateResponse](LogsAggregateResponse.md) - [DatadogAPIClient::V2::LogsAggregateResponseData](LogsAggregateResponseData.md) - [DatadogAPIClient::V2::LogsAggregateResponseStatus](LogsAggregateResponseStatus.md) diff --git a/lib/datadog_api_client/v2.rb b/lib/datadog_api_client/v2.rb index 9395e2517a06..b7e3cd165a18 100644 --- a/lib/datadog_api_client/v2.rb +++ b/lib/datadog_api_client/v2.rb @@ -123,7 +123,7 @@ require 'datadog_api_client/v2/models/logs_aggregate_bucket_value' require 'datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point' require 'datadog_api_client/v2/models/logs_aggregate_request' -require 'datadog_api_client/v2/models/logs_aggregate_request_page' +require 'datadog_api_client/v2/models/logs_aggregate_request_paging' require 'datadog_api_client/v2/models/logs_aggregate_response' require 'datadog_api_client/v2/models/logs_aggregate_response_data' require 'datadog_api_client/v2/models/logs_aggregate_response_status' diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb index 8c89c1853aac..dbb6b2220ad3 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb @@ -29,7 +29,7 @@ class LogsAggregateRequest attr_accessor :options - attr_accessor :page + attr_accessor :paging # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map @@ -38,7 +38,7 @@ def self.attribute_map :'filter' => :'filter', :'group_by' => :'group_by', :'options' => :'options', - :'page' => :'page' + :'paging' => :'paging' } end @@ -54,7 +54,7 @@ def self.openapi_types :'filter' => :'LogsQueryFilter', :'group_by' => :'Array', :'options' => :'LogsQueryOptions', - :'page' => :'LogsAggregateRequestPage' + :'paging' => :'LogsAggregateRequestPaging' } end @@ -99,8 +99,8 @@ def initialize(attributes = {}) self.options = attributes[:'options'] end - if attributes.key?(:'page') - self.page = attributes[:'page'] + if attributes.key?(:'paging') + self.paging = attributes[:'paging'] end end @@ -126,7 +126,7 @@ def ==(o) filter == o.filter && group_by == o.group_by && options == o.options && - page == o.page + paging == o.paging end # @see the `==` method @@ -138,7 +138,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [compute, filter, group_by, options, page].hash + [compute, filter, group_by, options, paging].hash end # Builds the object from hash diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb similarity index 92% rename from lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb rename to lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb index fce2dd79328e..9c30abdc9b81 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb @@ -18,14 +18,14 @@ module DatadogAPIClient::V2 # Paging settings - class LogsAggregateRequestPage + class LogsAggregateRequestPaging # The returned paging point to use to get the next results - attr_accessor :cursor + attr_accessor :after # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { - :'cursor' => :'cursor' + :'after' => :'after' } end @@ -37,7 +37,7 @@ def self.acceptable_attributes # Attribute type mapping. def self.openapi_types { - :'cursor' => :'String' + :'after' => :'String' } end @@ -51,19 +51,19 @@ def self.openapi_nullable # @param [Hash] attributes Model attributes in the form of hash def initialize(attributes = {}) if (!attributes.is_a?(Hash)) - fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPage` initialize method" + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPaging` initialize method" end # check to see if the attribute exists and convert string to symbol for hash key attributes = attributes.each_with_object({}) { |(k, v), h| if (!self.class.attribute_map.key?(k.to_sym)) - fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPage`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPaging`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect end h[k.to_sym] = v } - if attributes.key?(:'cursor') - self.cursor = attributes[:'cursor'] + if attributes.key?(:'after') + self.after = attributes[:'after'] end end @@ -85,7 +85,7 @@ def valid? def ==(o) return true if self.equal?(o) self.class == o.class && - cursor == o.cursor + after == o.after end # @see the `==` method @@ -97,7 +97,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [cursor].hash + [after].hash end # Builds the object from hash diff --git a/spec/v2/models/logs_aggregate_request_page_spec.rb b/spec/v2/models/logs_aggregate_request_page_spec.rb deleted file mode 100644 index f9a12e4a7d9a..000000000000 --- a/spec/v2/models/logs_aggregate_request_page_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -=begin -#Datadog API V2 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::V2::LogsAggregateRequestPage -# Automatically generated by openapi-generator (https://openapi-generator.tech) -# Please update as you see appropriate -describe DatadogAPIClient::V2::LogsAggregateRequestPage do - let(:instance) { DatadogAPIClient::V2::LogsAggregateRequestPage.new } - - describe 'test an instance of LogsAggregateRequestPage' do - it 'should create an instance of LogsAggregateRequestPage' do - expect(instance).to be_instance_of(DatadogAPIClient::V2::LogsAggregateRequestPage) - end - end - describe 'test attribute "cursor"' do - it 'should work' do - # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers - end - end - -end From 52e5d6bb49f318b52624582cdefb0a32d1763f25 Mon Sep 17 00:00:00 2001 From: Sami Tabet Date: Thu, 28 Jan 2021 15:06:38 +0100 Subject: [PATCH 7/8] fix --- ...rb => logs_aggregate_request_page_spec.rb} | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) rename spec/v2/models/{logs_aggregate_request_paging_spec.rb => logs_aggregate_request_page_spec.rb} (54%) diff --git a/spec/v2/models/logs_aggregate_request_paging_spec.rb b/spec/v2/models/logs_aggregate_request_page_spec.rb similarity index 54% rename from spec/v2/models/logs_aggregate_request_paging_spec.rb rename to spec/v2/models/logs_aggregate_request_page_spec.rb index e0be87921584..59424cefcaa8 100644 --- a/spec/v2/models/logs_aggregate_request_paging_spec.rb +++ b/spec/v2/models/logs_aggregate_request_page_spec.rb @@ -1,31 +1,30 @@ =begin #Datadog API V2 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 -OpenAPI Generator version: 5.0.0-SNAPSHOT - + 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::V2::LogsAggregateRequestPaging +# Unit tests for DatadogAPIClient::V2::LogsAggregateRequestPage # Automatically generated by openapi-generator (https://openapi-generator.tech) # Please update as you see appropriate -describe DatadogAPIClient::V2::LogsAggregateRequestPaging do - let(:instance) { DatadogAPIClient::V2::LogsAggregateRequestPaging.new } +describe DatadogAPIClient::V2::LogsAggregateRequestPage do + let(:instance) { DatadogAPIClient::V2::LogsAggregateRequestPage.new } - describe 'test an instance of LogsAggregateRequestPaging' do - it 'should create an instance of LogsAggregateRequestPaging' do - expect(instance).to be_instance_of(DatadogAPIClient::V2::LogsAggregateRequestPaging) + describe 'test an instance of LogsAggregateRequestPage' do + it 'should create an instance of LogsAggregateRequestPage' do + expect(instance).to be_instance_of(DatadogAPIClient::V2::LogsAggregateRequestPage) end end - describe 'test attribute "after"' do + describe 'test attribute "cursor"' do it 'should work' do # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers end From 7c6b3fed92705354248613bb0261bd67f757120e Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Thu, 28 Jan 2021 16:03:59 +0000 Subject: [PATCH 8/8] Regenerate client from commit c2cedbf of spec repo --- .apigentools-info | 8 ++++---- .openapi-generator/FILES | 6 +++--- data/v2/openapi.yaml | 4 ++-- docs/v2/LogsAggregateRequest.md | 4 ++-- docs/v2/LogsAggregateRequestPage.md | 18 +++++++++++++++++ docs/v2/LogsAggregateRequestPaging.md | 18 ----------------- docs/v2/README.md | 2 +- lib/datadog_api_client/v2.rb | 2 +- .../v2/models/logs_aggregate_request.rb | 14 ++++++------- ...ging.rb => logs_aggregate_request_page.rb} | 20 +++++++++---------- 10 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 docs/v2/LogsAggregateRequestPage.md delete mode 100644 docs/v2/LogsAggregateRequestPaging.md rename lib/datadog_api_client/v2/models/{logs_aggregate_request_paging.rb => logs_aggregate_request_page.rb} (92%) diff --git a/.apigentools-info b/.apigentools-info index 7b2b75bd966f..23489779f09e 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-26 17:15:04.320994", - "spec_repo_commit": "db8c9ba" + "regenerated": "2021-01-28 16:03:45.588352", + "spec_repo_commit": "c2cedbf" }, "v2": { "apigentools_version": "1.4.1.dev2", - "regenerated": "2021-01-26 17:15:16.348572", - "spec_repo_commit": "db8c9ba" + "regenerated": "2021-01-28 16:03:58.136402", + "spec_repo_commit": "c2cedbf" } } } \ No newline at end of file diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index cc0901b862f2..954cea074ac5 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -109,7 +109,7 @@ docs/LogsAggregateBucket.md docs/LogsAggregateBucketValue.md docs/LogsAggregateBucketValueTimeseriesPoint.md docs/LogsAggregateRequest.md -docs/LogsAggregateRequestPaging.md +docs/LogsAggregateRequestPage.md docs/LogsAggregateResponse.md docs/LogsAggregateResponseData.md docs/LogsAggregateResponseStatus.md @@ -405,7 +405,7 @@ lib/datadog_api_client/v2/models/logs_aggregate_bucket.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value.rb lib/datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point.rb lib/datadog_api_client/v2/models/logs_aggregate_request.rb -lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb +lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb lib/datadog_api_client/v2/models/logs_aggregate_response.rb lib/datadog_api_client/v2/models/logs_aggregate_response_data.rb lib/datadog_api_client/v2/models/logs_aggregate_response_status.rb @@ -691,7 +691,7 @@ spec/models/log_type_spec.rb spec/models/logs_aggregate_bucket_spec.rb spec/models/logs_aggregate_bucket_value_spec.rb spec/models/logs_aggregate_bucket_value_timeseries_point_spec.rb -spec/models/logs_aggregate_request_paging_spec.rb +spec/models/logs_aggregate_request_page_spec.rb spec/models/logs_aggregate_request_spec.rb spec/models/logs_aggregate_response_data_spec.rb spec/models/logs_aggregate_response_spec.rb diff --git a/data/v2/openapi.yaml b/data/v2/openapi.yaml index 9130418d84e3..54313b225748 100644 --- a/data/v2/openapi.yaml +++ b/data/v2/openapi.yaml @@ -1917,10 +1917,10 @@ components: type: array options: $ref: '#/components/schemas/LogsQueryOptions' - paging: + page: description: Paging settings properties: - after: + cursor: description: The returned paging point to use to get the next results example: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== type: string diff --git a/docs/v2/LogsAggregateRequest.md b/docs/v2/LogsAggregateRequest.md index 47a9aa84c011..1a9e7626ddba 100644 --- a/docs/v2/LogsAggregateRequest.md +++ b/docs/v2/LogsAggregateRequest.md @@ -8,7 +8,7 @@ | **filter** | [**LogsQueryFilter**](LogsQueryFilter.md) | | [optional] | | **group_by** | [**Array<LogsGroupBy>**](LogsGroupBy.md) | The rules for the group by | [optional] | | **options** | [**LogsQueryOptions**](LogsQueryOptions.md) | | [optional] | -| **paging** | [**LogsAggregateRequestPaging**](LogsAggregateRequestPaging.md) | | [optional] | +| **page** | [**LogsAggregateRequestPage**](LogsAggregateRequestPage.md) | | [optional] | ## Example @@ -20,7 +20,7 @@ instance = DatadogAPIClient::V2::LogsAggregateRequest.new( filter: null, group_by: null, options: null, - paging: null + page: null ) ``` diff --git a/docs/v2/LogsAggregateRequestPage.md b/docs/v2/LogsAggregateRequestPage.md new file mode 100644 index 000000000000..4cb00fde9cba --- /dev/null +++ b/docs/v2/LogsAggregateRequestPage.md @@ -0,0 +1,18 @@ +# DatadogAPIClient::V2::LogsAggregateRequestPage + +## Properties + +| Name | Type | Description | Notes | +| ---- | ---- | ----------- | ----- | +| **cursor** | **String** | The returned paging point to use to get the next results | [optional] | + +## Example + +```ruby +require 'datadog_api_client/v2' + +instance = DatadogAPIClient::V2::LogsAggregateRequestPage.new( + cursor: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== +) +``` + diff --git a/docs/v2/LogsAggregateRequestPaging.md b/docs/v2/LogsAggregateRequestPaging.md deleted file mode 100644 index c7bb17364a87..000000000000 --- a/docs/v2/LogsAggregateRequestPaging.md +++ /dev/null @@ -1,18 +0,0 @@ -# DatadogAPIClient::V2::LogsAggregateRequestPaging - -## Properties - -| Name | Type | Description | Notes | -| ---- | ---- | ----------- | ----- | -| **after** | **String** | The returned paging point to use to get the next results | [optional] | - -## Example - -```ruby -require 'datadog_api_client/v2' - -instance = DatadogAPIClient::V2::LogsAggregateRequestPaging.new( - after: eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ== -) -``` - diff --git a/docs/v2/README.md b/docs/v2/README.md index 9fa89cffba4c..018cf25f62df 100644 --- a/docs/v2/README.md +++ b/docs/v2/README.md @@ -272,7 +272,7 @@ Class | Method | HTTP request | Description - [DatadogAPIClient::V2::LogsAggregateBucketValue](LogsAggregateBucketValue.md) - [DatadogAPIClient::V2::LogsAggregateBucketValueTimeseriesPoint](LogsAggregateBucketValueTimeseriesPoint.md) - [DatadogAPIClient::V2::LogsAggregateRequest](LogsAggregateRequest.md) - - [DatadogAPIClient::V2::LogsAggregateRequestPaging](LogsAggregateRequestPaging.md) + - [DatadogAPIClient::V2::LogsAggregateRequestPage](LogsAggregateRequestPage.md) - [DatadogAPIClient::V2::LogsAggregateResponse](LogsAggregateResponse.md) - [DatadogAPIClient::V2::LogsAggregateResponseData](LogsAggregateResponseData.md) - [DatadogAPIClient::V2::LogsAggregateResponseStatus](LogsAggregateResponseStatus.md) diff --git a/lib/datadog_api_client/v2.rb b/lib/datadog_api_client/v2.rb index b7e3cd165a18..9395e2517a06 100644 --- a/lib/datadog_api_client/v2.rb +++ b/lib/datadog_api_client/v2.rb @@ -123,7 +123,7 @@ require 'datadog_api_client/v2/models/logs_aggregate_bucket_value' require 'datadog_api_client/v2/models/logs_aggregate_bucket_value_timeseries_point' require 'datadog_api_client/v2/models/logs_aggregate_request' -require 'datadog_api_client/v2/models/logs_aggregate_request_paging' +require 'datadog_api_client/v2/models/logs_aggregate_request_page' require 'datadog_api_client/v2/models/logs_aggregate_response' require 'datadog_api_client/v2/models/logs_aggregate_response_data' require 'datadog_api_client/v2/models/logs_aggregate_response_status' diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb index dbb6b2220ad3..8c89c1853aac 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request.rb @@ -29,7 +29,7 @@ class LogsAggregateRequest attr_accessor :options - attr_accessor :paging + attr_accessor :page # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map @@ -38,7 +38,7 @@ def self.attribute_map :'filter' => :'filter', :'group_by' => :'group_by', :'options' => :'options', - :'paging' => :'paging' + :'page' => :'page' } end @@ -54,7 +54,7 @@ def self.openapi_types :'filter' => :'LogsQueryFilter', :'group_by' => :'Array', :'options' => :'LogsQueryOptions', - :'paging' => :'LogsAggregateRequestPaging' + :'page' => :'LogsAggregateRequestPage' } end @@ -99,8 +99,8 @@ def initialize(attributes = {}) self.options = attributes[:'options'] end - if attributes.key?(:'paging') - self.paging = attributes[:'paging'] + if attributes.key?(:'page') + self.page = attributes[:'page'] end end @@ -126,7 +126,7 @@ def ==(o) filter == o.filter && group_by == o.group_by && options == o.options && - paging == o.paging + page == o.page end # @see the `==` method @@ -138,7 +138,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [compute, filter, group_by, options, paging].hash + [compute, filter, group_by, options, page].hash end # Builds the object from hash diff --git a/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb similarity index 92% rename from lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb rename to lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb index 9c30abdc9b81..fce2dd79328e 100644 --- a/lib/datadog_api_client/v2/models/logs_aggregate_request_paging.rb +++ b/lib/datadog_api_client/v2/models/logs_aggregate_request_page.rb @@ -18,14 +18,14 @@ module DatadogAPIClient::V2 # Paging settings - class LogsAggregateRequestPaging + class LogsAggregateRequestPage # The returned paging point to use to get the next results - attr_accessor :after + attr_accessor :cursor # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { - :'after' => :'after' + :'cursor' => :'cursor' } end @@ -37,7 +37,7 @@ def self.acceptable_attributes # Attribute type mapping. def self.openapi_types { - :'after' => :'String' + :'cursor' => :'String' } end @@ -51,19 +51,19 @@ def self.openapi_nullable # @param [Hash] attributes Model attributes in the form of hash def initialize(attributes = {}) if (!attributes.is_a?(Hash)) - fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPaging` initialize method" + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::LogsAggregateRequestPage` initialize method" end # check to see if the attribute exists and convert string to symbol for hash key attributes = attributes.each_with_object({}) { |(k, v), h| if (!self.class.attribute_map.key?(k.to_sym)) - fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPaging`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V2::LogsAggregateRequestPage`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect end h[k.to_sym] = v } - if attributes.key?(:'after') - self.after = attributes[:'after'] + if attributes.key?(:'cursor') + self.cursor = attributes[:'cursor'] end end @@ -85,7 +85,7 @@ def valid? def ==(o) return true if self.equal?(o) self.class == o.class && - after == o.after + cursor == o.cursor end # @see the `==` method @@ -97,7 +97,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [after].hash + [cursor].hash end # Builds the object from hash