datadog_api_client 1.9.0 → 2.0.0

data/spec/{v1/api_client_spec.rb → api_client_spec.rb}

@@ -15,51 +15,51 @@ Generated by: https://openapi-generator.tech
 
 require 'spec_helper'
 
-describe DatadogAPIClient::V1::APIClient do
+describe DatadogAPIClient::APIClient do
   context 'initialization' do
     context 'URL stuff' do
       context 'host' do
         it 'removes http from host' do
-          DatadogAPIClient::V1.configure { |c| c.host = 'http://example.com' }
-          expect(DatadogAPIClient::V1::Configuration.default.host).to eq('example.com')
+          DatadogAPIClient.configure { |c| c.host = 'http://example.com' }
+          expect(DatadogAPIClient::Configuration.default.host).to eq('example.com')
         end
 
         it 'removes https from host' do
-          DatadogAPIClient::V1.configure { |c| c.host = 'https://wookiee.com' }
-          expect(DatadogAPIClient::V1::APIClient.default.config.host).to eq('wookiee.com')
+          DatadogAPIClient.configure { |c| c.host = 'https://wookiee.com' }
+          expect(DatadogAPIClient::APIClient.default.config.host).to eq('wookiee.com')
         end
 
         it 'removes trailing path from host' do
-          DatadogAPIClient::V1.configure { |c| c.host = 'hobo.com/v4' }
-          expect(DatadogAPIClient::V1::Configuration.default.host).to eq('hobo.com')
+          DatadogAPIClient.configure { |c| c.host = 'hobo.com/v4' }
+          expect(DatadogAPIClient::Configuration.default.host).to eq('hobo.com')
         end
       end
 
       context 'base_path' do
         it "prepends a slash to base_path" do
-          DatadogAPIClient::V1.configure { |c| c.base_path = 'v4/dog' }
-          expect(DatadogAPIClient::V1::Configuration.default.base_path).to eq('/v4/dog')
+          DatadogAPIClient.configure { |c| c.base_path = 'v4/dog' }
+          expect(DatadogAPIClient::Configuration.default.base_path).to eq('/v4/dog')
         end
 
         it "doesn't prepend a slash if one is already there" do
-          DatadogAPIClient::V1.configure { |c| c.base_path = '/v4/dog' }
-          expect(DatadogAPIClient::V1::Configuration.default.base_path).to eq('/v4/dog')
+          DatadogAPIClient.configure { |c| c.base_path = '/v4/dog' }
+          expect(DatadogAPIClient::Configuration.default.base_path).to eq('/v4/dog')
         end
 
         it "ends up as a blank string if nil" do
-          DatadogAPIClient::V1.configure { |c| c.base_path = nil }
-          expect(DatadogAPIClient::V1::Configuration.default.base_path).to eq('')
+          DatadogAPIClient.configure { |c| c.base_path = nil }
+          expect(DatadogAPIClient::Configuration.default.base_path).to eq('')
         end
       end
     end
   end
 
   describe 'timeout in #build_request' do
-    let(:config) { DatadogAPIClient::V1::Configuration.new }
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new(config) }
+    let(:config) { DatadogAPIClient::Configuration.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new(config) }
 
     it 'defaults to nil' do
-      expect(DatadogAPIClient::V1::Configuration.default.timeout).to eq(nil)
+      expect(DatadogAPIClient::Configuration.default.timeout).to eq(nil)
       expect(config.timeout).to eq(nil)
 
       request = api_client.build_request(Net::HTTP::Get, '/test')
@@ -75,28 +75,28 @@ describe DatadogAPIClient::V1::APIClient do
 
   describe '#deserialize' do
     it "handles Array<Integer>" do
-      api_client = DatadogAPIClient::V1::APIClient.new
+      api_client = DatadogAPIClient::APIClient.new
       headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '[12, 34]')
-      data = api_client.deserialize(response, 'Array<Integer>')
+      data = api_client.deserialize("V1", response, 'Array<Integer>')
       expect(data).to be_instance_of(Array)
       expect(data).to eq([12, 34])
     end
 
     it 'handles Array<Array<Integer>>' do
-      api_client = DatadogAPIClient::V1::APIClient.new
+      api_client = DatadogAPIClient::APIClient.new
       headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '[[12, 34], [56]]')
-      data = api_client.deserialize(response, 'Array<Array<Integer>>')
+      data = api_client.deserialize("V1", response, 'Array<Array<Integer>>')
       expect(data).to be_instance_of(Array)
       expect(data).to eq([[12, 34], [56]])
     end
 
     it 'handles Hash<String, String>' do
-      api_client = DatadogAPIClient::V1::APIClient.new
+      api_client = DatadogAPIClient::APIClient.new
       headers = { 'Content-Type' => 'application/json' }
       response = double('response', headers: headers, body: '{"message": "Hello"}')
-      data = api_client.deserialize(response, 'Hash<String, String>')
+      data = api_client.deserialize("V1", response, 'Hash<String, String>')
       expect(data).to be_instance_of(Hash)
       expect(data).to eq(:message => 'Hello')
     end
@@ -105,8 +105,8 @@ describe DatadogAPIClient::V1::APIClient do
   describe "#object_to_hash" do
     it 'ignores nils and includes empty arrays' do
       # uncomment below to test object_to_hash for model
-      # api_client = DatadogAPIClient::V1::APIClient.new
-      # _model = DatadogAPIClient::V1::ModelName.new
+      # api_client = DatadogAPIClient::APIClient.new
+      # _model = DatadogAPIClient::ModelName.new
       # update the model attribute below
       # _model.id = 1
       # update the expected value (hash) below
@@ -117,7 +117,7 @@ describe DatadogAPIClient::V1::APIClient do
 
   describe '#build_collection_param' do
     let(:param) { ['aa', 'bb', 'cc'] }
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new }
 
     it 'works for csv' do
       expect(api_client.build_collection_param(param, :csv)).to eq('aa,bb,cc')
@@ -145,7 +145,7 @@ describe DatadogAPIClient::V1::APIClient do
   end
 
   describe '#json_mime?' do
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new }
 
     it 'works' do
       expect(api_client.json_mime?(nil)).to eq false
@@ -162,23 +162,23 @@ describe DatadogAPIClient::V1::APIClient do
   end
 
   describe '#select_header_accept' do
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new }
 
     it 'works' do
       expect(api_client.select_header_accept(nil)).to be_nil
       expect(api_client.select_header_accept([])).to be_nil
 
       expect(api_client.select_header_accept(['application/json'])).to eq('application/json')
-      expect(api_client.select_header_accept(['application/xml', 'application/json; charset=UTF8'])).to eq('application/json; charset=UTF8')
-      expect(api_client.select_header_accept(['APPLICATION/JSON', 'text/html'])).to eq('APPLICATION/JSON')
+      expect(api_client.select_header_accept(['application/xml', 'application/json; charset=UTF8'])).to eq('application/xml, application/json; charset=UTF8')
+      expect(api_client.select_header_accept(['APPLICATION/JSON', 'text/html'])).to eq('APPLICATION/JSON, text/html')
 
       expect(api_client.select_header_accept(['application/xml'])).to eq('application/xml')
-      expect(api_client.select_header_accept(['text/html', 'application/xml'])).to eq('text/html,application/xml')
+      expect(api_client.select_header_accept(['text/html', 'application/xml'])).to eq('text/html, application/xml')
     end
   end
 
   describe '#select_header_content_type' do
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new }
 
     it 'works' do
       expect(api_client.select_header_content_type(nil)).to eq('application/json')
@@ -193,7 +193,7 @@ describe DatadogAPIClient::V1::APIClient do
   end
 
   describe '#sanitize_filename' do
-    let(:api_client) { DatadogAPIClient::V1::APIClient.new }
+    let(:api_client) { DatadogAPIClient::APIClient.new }
 
     it 'works' do
       expect(api_client.sanitize_filename('sun')).to eq('sun')

data/spec/{v1/configuration_spec.rb → configuration_spec.rb}

@@ -15,14 +15,14 @@ Generated by: https://openapi-generator.tech
 
 require 'spec_helper'
 
-describe DatadogAPIClient::V1::Configuration do
-  let(:config) { DatadogAPIClient::V1::Configuration.default }
+describe DatadogAPIClient::Configuration do
+  let(:config) { DatadogAPIClient::Configuration.default }
 
   before(:each) do
     # uncomment below to setup host and base_path
     # require 'URI'
     # uri = URI.parse("https://api.datadoghq.com")
-    # DatadogAPIClient::V1.configure do |c|
+    # DatadogAPIClient.configure do |c|
     #   c.host = uri.host
     #   c.base_path = uri.path
     # end

data/spec/spec_helper.rb

@@ -97,9 +97,7 @@ RSpec.configure do |config|
       now = Time.now
       name = example.metadata[:full_description].gsub(/[^A-Za-z0-9]+/, '-')[0..100]
       @unique ||= "ruby-#{name}-#{now.to_i}"
-      m = example.metadata[:file_path].match /spec\/v(?<version>\d+)\/.*/
-      @api_version = m[:version]
-      api = Object.const_get("DatadogAPIClient::V#{@api_version}")
+      api = Object.const_get("DatadogAPIClient")
       @configuration = api::Configuration.new
       @configuration.api_key = ENV["DD_TEST_CLIENT_API_KEY"]
       @configuration.application_key = ENV["DD_TEST_CLIENT_APP_KEY"]