sensu-plugin 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8747827e125aa55103dc20ba8217bffea6971346
-  data.tar.gz: 985836889272cfa6c86511c63c764c6fb1697b53
+  metadata.gz: 789c3f9cdd93f38450e3c7fa33a076570d17c3ba
+  data.tar.gz: e1e46b0ec50069844d69e447bfb5546928bdc887
 SHA512:
-  metadata.gz: c044b4e98fae26fb3e04973678d35813a91abfdf5fab1dd379d014e93dace786e43b39d79b9065e33e4054ba4954195e769bd0f31aff8eed3206f24b016a763a
-  data.tar.gz: 5b2d6108d52570617b9d1e2143b83e25ee9747f7e937417bfe0f5bbe8882b90b14da2e0476bf3777a15f98dc8d11734d3010ea0b197e9acbcb6dcc759f800044
+  metadata.gz: 14d1e113b578a0690fcf0fd6f2512d8a2b146366e6c3e39b4fee4af11a024c66c4c4aa9312bcdc9bf0b10f50e020fcfebfddecd7a0dd3feb8aca64678ec1c368
+  data.tar.gz: 161a7ace2d9a55d2f47c0724e1fc3a9a3d66ac919763fac2a9f9bb453166487c9956d54621ede9c483d78fe51d1ac74f06db8b72384a31c762d71c2830ffaefc

data/lib/sensu-handler.rb

@@ -99,6 +99,14 @@ module Sensu
       exit 0
     end
 
+    # Override API settings (for testing purposes)
+    #
+    # @param api_settings [Hash]
+    # @return [Hash]
+    def api_settings=(api_settings)
+      @api_settings = api_settings
+    end
+
     # Return a hash of API settings derived first from ENV['SENSU_API_URL'] if set,
     # then Sensu config `api` scope if configured, and finally falling back to
     # to ipv4 localhost address on default API port.
@@ -108,7 +116,9 @@ module Sensu
       return @api_settings if @api_settings
       if ENV['SENSU_API_URL']
         uri = URI(ENV['SENSU_API_URL'])
+        ssl = uri.scheme == 'https' ? {} : nil
         @api_settings = {
+          'ssl' => ssl,
           'host' => uri.host,
           'port' => uri.port,
           'user' => uri.user,
@@ -126,14 +136,15 @@ module Sensu
       if api_settings.nil?
         raise 'api.json settings not found.'
       end
-      domain = api_settings['host'].start_with?('http') ? api_settings['host'] : 'http://' + api_settings['host']
-      uri = URI("#{domain}:#{api_settings['port']}#{path}")
-      req = net_http_req_class(method).new(uri.path)
+      use_ssl = api_settings['ssl'].is_a?(Hash) ||
+                api_settings['host'].start_with?('https')
+      hostname = api_settings['host'].gsub(/https?:\/\//, '')
+      req = net_http_req_class(method).new(path)
       if api_settings['user'] && api_settings['password']
         req.basic_auth(api_settings['user'], api_settings['password'])
       end
       yield(req) if block_given?
-      res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      res = Net::HTTP.start(hostname, api_settings['port'], use_ssl: use_ssl) do |http|
         http.request(req)
       end
       res

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
     EXIT_CODES = {
       'OK'       => 0,
       'WARNING'  => 1,

data/test/handle_api_request_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'webmock/minitest'
+require 'sensu-handler'
+
+class TestHandleAPIRequest < MiniTest::Test
+  include SensuPluginTestHelper
+
+  Sensu::Handler.disable_autorun
+
+  def test_http_request
+    stub_request(:get, 'http://127.0.0.1:4567/foo').to_return(status: 200, body: '', headers: {})
+
+    handler = Sensu::Handler.new([])
+    response = handler.api_request(:get, '/foo')
+
+    assert_equal(response.code, '200')
+  end
+
+  def test_https_request
+    stub_request(:get, 'https://127.0.0.1:4567/foo').to_return(status: 200, body: '', headers: {})
+
+    handler = Sensu::Handler.new([])
+    handler.api_settings = handler.api_settings.merge('ssl' => {})
+
+    response = handler.api_request(:get, '/foo')
+
+    assert_equal(response.code, '200')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Decklin Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email:
 - decklin@red-bean.com
@@ -102,6 +116,7 @@ files:
 - test/external_handler_argument_test.rb
 - test/external_handler_test.rb
 - test/external_metric_test.rb
+- test/handle_api_request_test.rb
 - test/handle_filter_test.rb
 - test/handle_helper_test.rb
 - test/mutator_test.rb
@@ -131,6 +146,7 @@ signing_key:
 specification_version: 4
 summary: Sensu Plugins
 test_files:
+- test/handle_api_request_test.rb
 - test/handle_helper_test.rb
 - test/external_handler_test.rb
 - test/external_metric_test.rb