dogapi 1.37.1 → 1.38.0

data/spec/integration/aws_logs_spec.rb

@@ -0,0 +1,55 @@
+require_relative '../spec_helper'
+
+describe Dogapi::Client do
+  CONFIG = {
+    account_id: '123456789101',
+    lambda_arn: 'arn:aws:lambda:us-east-1:123456789101:function:LogsCollectionAPITest'
+  }.freeze
+
+  SERVICES_CONFIG = {
+    account_id: '601427279990',
+    services: %w([s3] [elb] [elbv2] [cloudfront] [redshift] [lambda])
+  }.freeze
+
+  describe '#aws_logs_add_lambda' do
+    it_behaves_like 'an api method',
+                    :aws_logs_add_lambda, [CONFIG],
+                    :post, '/integration/aws/logs', CONFIG
+  end
+
+  describe '#aws_logs_save_services' do
+    it_behaves_like 'an api method',
+                    :aws_logs_save_services, [SERVICES_CONFIG],
+                    :post, '/integration/aws/logs/services', SERVICES_CONFIG
+  end
+
+  describe '#aws_logs_check_services' do
+    it_behaves_like 'an api method',
+                    :aws_logs_check_services, [SERVICES_CONFIG],
+                    :post, '/integration/aws/logs/services_async', SERVICES_CONFIG
+  end
+
+  describe '#aws_logs_check_lambda' do
+    it_behaves_like 'an api method',
+                    :aws_logs_check_lambda, [CONFIG],
+                    :post, '/integration/aws/logs/check_async', CONFIG
+  end
+
+  describe '#aws_logs_list_services' do
+    it_behaves_like 'an api method',
+                    :aws_logs_list_services, nil,
+                    :get, '/integration/aws/logs/services'
+  end
+
+  describe '#aws_logs_integrations_list' do
+    it_behaves_like 'an api method',
+                    :aws_logs_integrations_list, nil,
+                    :get, '/integration/aws/logs'
+  end
+
+  describe '#aws_logs_integration_delete' do
+    it_behaves_like 'an api method',
+                    :aws_logs_integration_delete, [CONFIG],
+                    :delete, '/integration/aws/logs', CONFIG
+  end
+end

data/spec/integration/azure_integration_spec.rb

@@ -0,0 +1,59 @@
+require_relative '../spec_helper'
+
+describe Dogapi::Client do
+  CONFIG = {
+    tenant_name: 'testc44-1234-5678-9101-cc00736ftest',
+    client_id: 'testc7f6-1234-5678-9101-3fcbf464test'
+  }.freeze
+
+  CREATE_CONFIG = {
+    tenant_name: 'testc44-1234-5678-9101-cc00736ftest',
+    host_filters: 'api:test',
+    client_id: 'testc7f6-1234-5678-9101-3fcbf464test',
+    client_secret: 'testingx./Sw*g/Y33t..R1cH+hScMDt'
+  }.freeze
+
+  UPDATE_HF_CONFIG = {
+    tenant_name: 'testc44-1234-5678-9101-cc00736ftest',
+    host_filters: 'api:test1,api:test2',
+    client_id: 'testc7f6-1234-5678-9101-3fcbf464test'
+  }.freeze
+
+  UPDATE_CONFIG = {
+    tenant_name: 'testc44-1234-5678-9101-cc00736ftest',
+    new_tenant_name: '1234abcd-1234-5678-9101-abcd1234abcd',
+    host_filters: 'api:test3',
+    client_id: 'testc7f6-1234-5678-9101-3fcbf464test',
+    new_client_id: 'abcd1234-5678-1234-5678-1234abcd5678'
+  }.freeze
+
+  describe '#azure_integration_list' do
+    it_behaves_like 'an api method',
+                    :azure_integration_list, nil,
+                    :get, '/integration/azure'
+  end
+
+  describe '#azure_integration_create' do
+    it_behaves_like 'an api method',
+                    :azure_integration_create, [CREATE_CONFIG],
+                    :post, '/integration/azure', CREATE_CONFIG
+  end
+
+  describe '#azure_integration_update_host_filters' do
+    it_behaves_like 'an api method',
+                    :azure_integration_update_host_filters, [UPDATE_HF_CONFIG],
+                    :post, '/integration/azure/host_filters', UPDATE_HF_CONFIG
+  end
+
+  describe '#azure_integration_update' do
+    it_behaves_like 'an api method',
+                    :azure_integration_update, [UPDATE_CONFIG],
+                    :put, '/integration/azure', UPDATE_CONFIG
+  end
+
+  describe '#azure_integration_delete' do
+    it_behaves_like 'an api method',
+                    :azure_integration_delete, [CONFIG],
+                    :delete, '/integration/azure', CONFIG
+  end
+end

data/spec/integration/gcp_integration_spec.rb

@@ -0,0 +1,53 @@
+require_relative '../spec_helper'
+
+describe Dogapi::Client do
+  CONFIG = {
+    project_id: 'datadog-apitest',
+    client_email: 'email@example.com'
+  }.freeze
+
+  CREATE_CONFIG = {
+    type: 'service_account',
+    project_id: 'datadog-apitest',
+    private_key_id: '123456789abcdefghi123456789abcdefghijklm',
+    private_key: 'fake_key',
+    client_email: 'email@example.com',
+    client_id: '123456712345671234567',
+    auth_uri: 'fake_uri',
+    token_uri: 'fake_uri',
+    auth_provider_x509_cert_url: 'fake_url',
+    client_x509_cert_url: 'fake_url',
+    host_filters: 'api:test'
+  }.freeze
+
+  UPDATE_CONFIG = {
+    project_id: 'datadog-apitest',
+    client_email: 'email@example.com',
+    host_filters: 'api:test1,api:test2',
+    automute: false
+  }.freeze
+
+  describe '#gcp_integration_list' do
+    it_behaves_like 'an api method',
+                    :gcp_integration_list, nil,
+                    :get, '/integration/gcp'
+  end
+
+  describe '#gcp_integration_create' do
+    it_behaves_like 'an api method',
+                    :gcp_integration_create, [CREATE_CONFIG],
+                    :post, '/integration/gcp', CREATE_CONFIG
+  end
+
+  describe '#gcp_integration_update' do
+    it_behaves_like 'an api method',
+                    :gcp_integration_update, [UPDATE_CONFIG],
+                    :put, '/integration/gcp', UPDATE_CONFIG
+  end
+
+  describe '#gcp_integration_delete' do
+    it_behaves_like 'an api method',
+                    :gcp_integration_delete, [CONFIG],
+                    :delete, '/integration/gcp', CONFIG
+  end
+end

data/spec/integration/monitor_spec.rb

@@ -27,6 +27,20 @@ describe Dogapi::Client do
                     :get, "/monitor/#{MONITOR_ID}", group_states: %w(custom all)
   end
 
+  describe '#can_delete_monitors' do
+    context 'with one id' do
+      it_behaves_like 'an api method',
+                      :can_delete_monitors, [MONITOR_ID],
+                      :get, '/monitor/can_delete'
+    end
+
+    context 'with multiple ids' do
+      it_behaves_like 'an api method',
+                      :can_delete_monitors, [[MONITOR_ID, MONITOR_ID + 1, MONITOR_ID + 2]],
+                      :get, '/monitor/can_delete'
+    end
+  end
+
   describe '#delete_monitor' do
     it_behaves_like 'an api method',
                     :delete_monitor, [MONITOR_ID],
@@ -102,7 +116,7 @@ describe Dogapi::Client do
   describe '#cancel_downtime_by_scope' do
     it_behaves_like 'an api method',
                     :cancel_downtime_by_scope, [DOWNTIME_SCOPE],
-                    :post, '/downtime/cancel/by_scope'
+                    :post, '/downtime/cancel/by_scope', 'scope' => DOWNTIME_SCOPE
   end
 
   describe '#get_all_downtimes' do

data/spec/spec_helper.rb

@@ -73,6 +73,23 @@ module SpecDog
     end
   end
 
+  shared_examples 'an api method with params and body' do |command, args, request, endpoint, params, body|
+    it 'queries the api with params and body' do
+      url = api_url + endpoint
+      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      expect(dog.send(command, *args)).to eq ['200', {}]
+      params.each { |k, v| params[k] = v.join(',') if v.is_a? Array }
+      params = params
+
+      body = MultiJson.dump(body) if body
+
+      expect(WebMock).to have_requested(request, url).with(
+        query: params,
+        body: body
+      )
+    end
+  end
+
   shared_examples 'an api method with optional params' do |command, args, request, endpoint, opt_params|
     include_examples 'an api method', command, args, request, endpoint
     it 'queries the api with optional params' do

data/spec/unit/common_spec.rb

@@ -65,11 +65,12 @@ describe 'Common' do
               '/api/v1/screen']
 
       urls.each do |url|
-        params = service.set_api_and_app_keys_in_params(url, true)
-        expect(params).to have_key(:api_key)
-        expect(params[:api_key]).to eq service.api_key
-        expect(params).to have_key(:application_key)
-        expect(params[:application_key]).to eq service.application_key
+        expect(service.should_set_api_and_app_keys_in_params?(url)).to be true
+        params = service.prepare_params(nil, url, true)
+        expect(params).to eq("?api_key=#{service.api_key}&application_key=#{service.application_key}")
+        req = service.prepare_request(Net::HTTP::Get, url, params, nil, false, true)
+        expect(req.key?('DD-API-KEY')).to be false
+        expect(req.key?('DD-APPLICATION-KEY')).to be false
       end
     end
 
@@ -82,8 +83,14 @@ describe 'Common' do
               '/api/v2/users']
 
       urls.each do |url|
-        params = service.set_api_and_app_keys_in_params(url, true)
-        expect(params).to eq({})
+        expect(service.should_set_api_and_app_keys_in_params?(url)).to be false
+        params = service.prepare_params(nil, url, true)
+        expect(params).to eq('?')
+        req = service.prepare_request(Net::HTTP::Get, url, params, nil, false, true)
+        expect(req.key?('DD-API-KEY')).to be true
+        expect(req['DD-API-KEY']).to eq service.api_key
+        expect(req.key?('DD-APPLICATION-KEY')).to be true
+        expect(req['DD-APPLICATION-KEY']).to eq service.application_key
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.37.1
+  version: 1.38.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -82,6 +82,7 @@ files:
 - ".tailor"
 - CHANGELOG.md
 - Gemfile
+- Gemfile_1.9
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -100,12 +101,16 @@ files:
 - lib/dogapi/metric.rb
 - lib/dogapi/v1.rb
 - lib/dogapi/v1/alert.rb
+- lib/dogapi/v1/aws_integration.rb
+- lib/dogapi/v1/aws_logs.rb
+- lib/dogapi/v1/azure_integration.rb
 - lib/dogapi/v1/comment.rb
 - lib/dogapi/v1/dash.rb
 - lib/dogapi/v1/dashboard.rb
 - lib/dogapi/v1/dashboard_list.rb
 - lib/dogapi/v1/embed.rb
 - lib/dogapi/v1/event.rb
+- lib/dogapi/v1/gcp_integration.rb
 - lib/dogapi/v1/hosts.rb
 - lib/dogapi/v1/integration.rb
 - lib/dogapi/v1/metadata.rb
@@ -122,6 +127,9 @@ files:
 - lib/dogapi/v2/dashboard_list.rb
 - lib/dogapi/version.rb
 - spec/integration/alert_spec.rb
+- spec/integration/aws_integration_spec.rb
+- spec/integration/aws_logs_spec.rb
+- spec/integration/azure_integration_spec.rb
 - spec/integration/comment_spec.rb
 - spec/integration/common_spec.rb
 - spec/integration/dash_spec.rb
@@ -129,6 +137,7 @@ files:
 - spec/integration/dashboard_spec.rb
 - spec/integration/embed_spec.rb
 - spec/integration/event_spec.rb
+- spec/integration/gcp_integration_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/metadata_spec.rb
 - spec/integration/metric_spec.rb
@@ -180,6 +189,9 @@ specification_version: 4
 summary: Ruby bindings for Datadog's API
 test_files:
 - spec/integration/alert_spec.rb
+- spec/integration/aws_integration_spec.rb
+- spec/integration/aws_logs_spec.rb
+- spec/integration/azure_integration_spec.rb
 - spec/integration/comment_spec.rb
 - spec/integration/common_spec.rb
 - spec/integration/dash_spec.rb
@@ -187,6 +199,7 @@ test_files:
 - spec/integration/dashboard_spec.rb
 - spec/integration/embed_spec.rb
 - spec/integration/event_spec.rb
+- spec/integration/gcp_integration_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/metadata_spec.rb
 - spec/integration/metric_spec.rb