sensu-plugin 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15f38b4709b2ac89b59531eccfdc58d53ae6824
-  data.tar.gz: 5c165bc7759153d78948f0ee03093de67569cc41
+  metadata.gz: b1dfcce5f32c8ed80fd9da0ff34dfac0b6b3a999
+  data.tar.gz: 19da9ae23b0a0706f05c84ffb50ad4415433c383
 SHA512:
-  metadata.gz: e689ee660aeaab03c13780cbda36c65e834ebc83ddc0e6361cd04fb0baf998027a74b576a5739afc4c4537025efae80e6302aefc12c3bdb370b4b35bbb95c694
-  data.tar.gz: 9b78540d2de31488f61911fa144e81091f3eaf447b6377ca5a35d8c01a3410864aa28a86bc0688cad13f00d18224ae3bce0268eb64219768bd08426a6ccbcb4f
+  metadata.gz: 3eb2f697572579bf4af26638f38a1e849ca873150412ccff731f6f770f4342b5d98919c4b7bc6bcd0a9c488c938ebd67e042bfd143dcc3c157084a6a7cf4789a
+  data.tar.gz: 0bb69e9bb18ddf8eaea85f5f07643ff45cc230b4ca2510e84814c20dd7b1f87f52c6ea524cd62d5f7a06c11b2f835d90dcb45d8338e25780455cadb592ff7c62

data/lib/sensu-plugin.rb

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

data/lib/sensu-plugin/utils.rb

@@ -115,7 +115,11 @@ module Sensu
             unknown("Non-OK response from API query: #{get_uri(query_path)}")
           end
           data = JSON.parse(response.body)
+          # when the data is empty, we have hit the end
           break if data.empty?
+          # If API lacks pagination support, it will
+          # return same data on subsequent iterations
+          break if results.any? { |r| r == data }
           results << data
           offset += limit
         end

data/test/handle_api_request_test.rb

@@ -33,11 +33,17 @@ class TestHandleAPIRequest < MiniTest::Test
   end
 
   def test_http_paginated_get
+    result_two = sample_check_result.dup
+    result_two[:client] = 'haproxy01'
+    result_two[:name]   = 'check_haproxy'
+    result_two[:output] = 'haproxy is fubar'
+    result_two[:status] = 2
+
     stub_request(:get, 'http://127.0.0.1:4567/results?limit=1&offset=0')
       .to_return(status: 200, headers: {}, body: JSON.dump([sample_check_result]))
 
     stub_request(:get, 'http://127.0.0.1:4567/results?limit=1&offset=1')
-      .to_return(status: 200, headers: {}, body: JSON.dump([sample_check_result]))
+      .to_return(status: 200, headers: {}, body: JSON.dump([result_two]))
 
     stub_request(:get, 'http://127.0.0.1:4567/results?limit=1&offset=2')
       .to_return(status: 200, headers: {}, body: JSON.dump([]))
@@ -46,7 +52,7 @@ class TestHandleAPIRequest < MiniTest::Test
     response = handler.paginated_get('/results', 'limit' => 1)
 
     # we expect the combined results to be an array containing two instances of the sample check result
-    combined_results = JSON.parse("[ #{JSON.dump(sample_check_result)} , #{JSON.dump(sample_check_result)} ]")
+    combined_results = JSON.parse("[ #{JSON.dump(sample_check_result)} , #{JSON.dump(result_two)} ]")
     assert_equal(response, combined_results)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Decklin Foster