dogapi 1.37.0 → 1.41.0

data/spec/integration/tag_spec.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require_relative '../spec_helper'
 
 describe Dogapi::Client do

data/spec/integration/usage_spec.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require_relative '../spec_helper'
 
 describe Dogapi::Client do

data/spec/integration/user_spec.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require_relative '../spec_helper'
 
 describe Dogapi::Client do

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require 'rspec'
 require 'simplecov'
 require 'webmock/rspec'
@@ -42,22 +46,6 @@ module SpecDog
     end
   end
 
-  shared_examples 'an api method with named args' do |command, args, request, endpoint, body|
-    it 'queries the api' do
-      url = api_url + endpoint
-      old_url = old_api_url + endpoint
-      stub_request(request, /#{url}|#{old_url}/).to_return(body: '{}').then.to_raise(StandardError)
-      expect(dog.send(command, **args)).to eq ['200', {}]
-
-      body = MultiJson.dump(body) if body
-
-      expect(WebMock).to have_requested(request, /#{url}|#{old_url}/).with(
-          # ignore query: default_query -- here as in the test it's never properly included
-          body: body
-      )
-    end
-  end
-
   shared_examples 'an api method with options' do |command, args, request, endpoint, body|
     include_examples 'an api method', command, args, request, endpoint, body
     it 'queries the api with options' do
@@ -89,16 +77,19 @@ module SpecDog
     end
   end
 
-  shared_examples 'an api method with named args making params' do |command, args, request, endpoint, params|
-    it 'queries the api with params' do
+  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', {}]
+      expect(dog.send(command, *args)).to eq ['200', {}]
       params.each { |k, v| params[k] = v.join(',') if v.is_a? Array }
-      # hack/note: do not merge with default_query for this test case
+      params = params
+
+      body = MultiJson.dump(body) if body
 
       expect(WebMock).to have_requested(request, url).with(
-          query: params
+        query: params,
+        body: body
       )
     end
   end

data/spec/unit/capistrano_spec.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require 'spec_helper'
 require 'capistrano/datadog'
 require 'benchmark'

data/spec/unit/common_spec.rb

@@ -1,6 +1,27 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require_relative '../spec_helper'
 
 describe 'Common' do
+  describe 'validate_tags' do
+    it 'raises if tags is not an array' do
+      tags = 'foo:bar'
+      expect { Dogapi.validate_tags(tags) }.to raise_error(ArgumentError)
+      tags = nil
+      expect { Dogapi.validate_tags(tags) }.to raise_error(ArgumentError)
+    end
+    it 'raises if elements of tags are not strings' do
+      tags = ['toto:tata', { foo: 'bar' }]
+      expect { Dogapi.validate_tags(tags) }.to raise_error(ArgumentError)
+    end
+    it 'passes if tags are correct' do
+      tags = ['foo:bar', 'baz']
+      Dogapi.validate_tags(tags)
+    end
+  end
+
   describe Dogapi.find_datadog_host do
     it 'gives precedence to DATADOG_HOST env var' do
       allow(ENV).to receive(:[]).with('DATADOG_HOST').and_return('example.com')
@@ -40,6 +61,26 @@ describe 'Common' do
       ENV['http_proxy'] = nil
     end
 
+    it 'uses-the dogapi specific proxy if set' do
+      service = Dogapi::APIService.new('api_key', 'app_key')
+
+      service.connect do |conn|
+        expect(conn.proxy_address).to be(nil)
+        expect(conn.proxy_port).to be(nil)
+      end
+
+      ENV['https_proxy'] = 'https://www.proxy.com:443'
+      ENV['dd_proxy_https'] = 'https://www.otherproxy.com:443'
+
+      service.connect do |conn|
+        expect(conn.proxy_address).to eq 'www.otherproxy.com'
+        expect(conn.proxy_port).to eq 443
+      end
+
+      ENV['https_proxy'] = nil
+      ENV['dd_proxy_https'] = nil
+    end
+
     it 'respects the endpoint configuration' do
       service = Dogapi::APIService.new('api_key', 'app_key', true, nil, 'https://app.example.com')
 
@@ -65,11 +106,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,10 +124,25 @@ 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
+
+    it 'properly sets User-Agent header' do
+      service = Dogapi::APIService.new('api_key', 'app_key', true, nil, 'https://app.example.com')
+      params = service.prepare_params(nil, '/api/v1/validate', true)
+      req = service.prepare_request(Net::HTTP::Get, '/api/v1/validate', params, nil, false, true)
+
+      expect(req.key?('User-Agent')).to be true
+      expect(req['User-Agent']).to match(%r{dogapi-rb\/[^\s]+ \(ruby [^\s]+; os [^\s]+; arch [^\s]+\)})
+    end
   end
 end
 

data/spec/unit/facade_spec.rb

@@ -1,3 +1,7 @@
+# Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2011-Present Datadog, Inc.
+
 require 'spec_helper'
 
 describe Dogapi::Client do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.41.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -75,16 +75,29 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".azure-pipelines/all.yml"
+- ".github/CODEOWNERS"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/labeler.yml"
+- ".github/workflows/labeler.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".tailor"
 - CHANGELOG.md
+- CONTRIBUTING.md
+- DEVELOPMENT.md
 - Gemfile
+- Gemfile_1.9
 - LICENSE
+- LICENSE-3rdparty.csv
 - README.rdoc
+- RELEASING.md
 - Rakefile
+- SUPPORT.md
 - dogapi.gemspec
 - examples/Capfile
 - examples/custom_event.rb
@@ -100,12 +113,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
@@ -116,6 +133,7 @@ files:
 - lib/dogapi/v1/service_check.rb
 - lib/dogapi/v1/service_level_objective.rb
 - lib/dogapi/v1/snapshot.rb
+- lib/dogapi/v1/synthetics.rb
 - lib/dogapi/v1/tag.rb
 - lib/dogapi/v1/usage.rb
 - lib/dogapi/v1/user.rb
@@ -123,6 +141,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
@@ -130,6 +151,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
@@ -139,6 +161,7 @@ files:
 - spec/integration/service_check_spec.rb
 - spec/integration/service_level_objective_spec.rb
 - spec/integration/snapshot_spec.rb
+- spec/integration/synthetics_spec.rb
 - spec/integration/tag_spec.rb
 - spec/integration/usage_spec.rb
 - spec/integration/user_spec.rb
@@ -175,13 +198,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 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
@@ -189,6 +214,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
@@ -198,6 +224,7 @@ test_files:
 - spec/integration/service_check_spec.rb
 - spec/integration/service_level_objective_spec.rb
 - spec/integration/snapshot_spec.rb
+- spec/integration/synthetics_spec.rb
 - spec/integration/tag_spec.rb
 - spec/integration/usage_spec.rb
 - spec/integration/user_spec.rb