Fix paging parameter names for logs aggregate queries (#181)

* [logs][v2][aggregate] fix aggregate paging name * update * fix * Revert "fix" This reverts commit e991d4d. * Revert "update" This reverts commit 3b65d9c. * Revert "[logs][v2][aggregate] fix aggregate paging name" This reverts commit 965b34b. * fix * Regenerate client from commit c2cedbf of spec repo Co-authored-by: Sami Tabet <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Co-authored-by: ci.datadog-api-spec <[email protected]>
DataDog · Jan 28, 2021 · 6d14190 · 6d14190
1 parent c53215e
commit 6d14190
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 59 deletions.
diff --git 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"
         }
     }
 }
diff --git 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
@@ -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
@@ -8,7 +8,7 @@
 | **filter** | [**LogsQueryFilter**](LogsQueryFilter.md) |  | [optional] |
 | **group_by** | [**Array&lt;LogsGroupBy&gt;**](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
@@ -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&#x3D;&#x3D;
+)
+```
+
diff --git a/docs/v2/LogsAggregateRequestPaging.md b/docs/v2/LogsAggregateRequestPaging.md
diff --git 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
@@ -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
@@ -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<LogsGroupBy>',
         :'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/...2/models/logs_aggregate_request_paging.rb → .../v2/models/logs_aggregate_request_page.rb b/...2/models/logs_aggregate_request_paging.rb → .../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/...els/logs_aggregate_request_paging_spec.rb → ...odels/logs_aggregate_request_page_spec.rb b/...els/logs_aggregate_request_paging_spec.rb → ...odels/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: [email protected]
 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