From d870ac0fb985eba180a5e33a60ce7f61b580a3ae Mon Sep 17 00:00:00 2001
From: Quentin Madec <degemer@users.noreply.github.com>
Date: Tue, 23 Aug 2016 18:26:04 -0400
Subject: [PATCH] Configurable Datadog endpoint (#108)

It was previously only possible to do this from the environment
(`DATADOG_HOST` env var).

It is now a parameter of Dogapi::Client.
---
 lib/dogapi/common.rb     |  5 ++---
 lib/dogapi/facade.rb     | 32 ++++++++++++++++----------------
 spec/unit/common_spec.rb |  9 +++++++++
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/lib/dogapi/common.rb b/lib/dogapi/common.rb
index 30bcc3aa..c3851dde 100644
--- a/lib/dogapi/common.rb
+++ b/lib/dogapi/common.rb
@@ -69,13 +69,12 @@ def request(method, url, params)
 
   # Superclass that deals with the details of communicating with the DataDog API
   class APIService
-    def initialize(api_key, application_key, silent=true, timeout=nil, endpoints=nil)
+    def initialize(api_key, application_key, silent=true, timeout=nil, endpoint=nil)
       @api_key = api_key
       @application_key = application_key
-      @api_host = Dogapi.find_datadog_host()
+      @api_host = endpoint || Dogapi.find_datadog_host()
       @silent = silent
       @timeout = timeout || 5
-      @endpoints = endpoints || { @api_host => [[api_key, application_key]] }
     end
 
     # Manages the HTTP connection
diff --git a/lib/dogapi/facade.rb b/lib/dogapi/facade.rb
index fc44d7bf..8dfa47ba 100644
--- a/lib/dogapi/facade.rb
+++ b/lib/dogapi/facade.rb
@@ -10,7 +10,7 @@ module Dogapi
   # Class methods return a tuple of (+response_code+, +response_body+). Unless otherwise noted, the response body is deserialized JSON. Up-to-date information about the JSON object structure is available in the HTTP API documentation, here[https://github.com/DataDog/dogapi/wiki].
   class Client
 
-    def initialize(api_key, application_key=nil, host=nil, device=nil, silent=true, timeout=nil)
+    def initialize(api_key, application_key=nil, host=nil, device=nil, silent=true, timeout=nil, endpoint=nil)
 
       if api_key
         @api_key = api_key
@@ -19,24 +19,24 @@ def initialize(api_key, application_key=nil, host=nil, device=nil, silent=true,
       end
 
       @application_key = application_key
-      @datadog_host = Dogapi.find_datadog_host()
-      @host = host ||= Dogapi.find_localhost()
+      @datadog_host = endpoint || Dogapi.find_datadog_host()
+      @host = host || Dogapi.find_localhost()
       @device = device
 
       # FIXME: refactor to avoid all this code duplication
-      @metric_svc = Dogapi::V1::MetricService.new(@api_key, @application_key, silent, timeout)
-      @event_svc = Dogapi::V1::EventService.new(@api_key, @application_key, silent, timeout)
-      @tag_svc = Dogapi::V1::TagService.new(@api_key, @application_key, silent, timeout)
-      @comment_svc = Dogapi::V1::CommentService.new(@api_key, @application_key, silent, timeout)
-      @search_svc = Dogapi::V1::SearchService.new(@api_key, @application_key, silent, timeout)
-      @dash_service = Dogapi::V1::DashService.new(@api_key, @application_key, silent, timeout)
-      @alert_svc = Dogapi::V1::AlertService.new(@api_key, @application_key, silent, timeout)
-      @user_svc = Dogapi::V1::UserService.new(@api_key, @application_key, silent, timeout)
-      @snapshot_svc = Dogapi::V1::SnapshotService.new(@api_key, @application_key, silent, timeout)
-      @embed_svc = Dogapi::V1::EmbedService.new(@api_key, @application_key, silent, timeout)
-      @screenboard_svc = Dogapi::V1::ScreenboardService.new(@api_key, @application_key, silent, timeout)
-      @monitor_svc = Dogapi::V1::MonitorService.new(@api_key, @application_key, silent, timeout)
-      @service_check_svc = Dogapi::V1::ServiceCheckService.new(@api_key, @application_key, silent, timeout)
+      @metric_svc = Dogapi::V1::MetricService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @event_svc = Dogapi::V1::EventService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @tag_svc = Dogapi::V1::TagService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @comment_svc = Dogapi::V1::CommentService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @search_svc = Dogapi::V1::SearchService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @dash_service = Dogapi::V1::DashService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @alert_svc = Dogapi::V1::AlertService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @user_svc = Dogapi::V1::UserService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @snapshot_svc = Dogapi::V1::SnapshotService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @embed_svc = Dogapi::V1::EmbedService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @screenboard_svc = Dogapi::V1::ScreenboardService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @monitor_svc = Dogapi::V1::MonitorService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @service_check_svc = Dogapi::V1::ServiceCheckService.new(@api_key, @application_key, silent, timeout, @datadog_host)
       @legacy_event_svc = Dogapi::EventService.new(@datadog_host)
     end
 
diff --git a/spec/unit/common_spec.rb b/spec/unit/common_spec.rb
index 00a99500..ee9d96ab 100644
--- a/spec/unit/common_spec.rb
+++ b/spec/unit/common_spec.rb
@@ -28,6 +28,15 @@
 
       ENV['http_proxy'] = nil
     end
+
+    it 'respects the endpoint configuration' do
+      service = Dogapi::APIService.new('api_key', 'app_key', true, nil, 'https://app.example.com')
+
+      service.connect do |conn|
+        expect(conn.address).to eq 'app.example.com'
+        expect(conn.port).to eq 443
+      end
+    end
   end
 end