wavefront-sdk 3.0.2 → 3.2.0

data/spec/wavefront-sdk/validators_spec.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'date'
-require 'minitest/autorun'
 require_relative '../spec_helper'
 require_relative '../../lib/wavefront-sdk/defs/constants'
 require_relative '../../lib/wavefront-sdk/validators'
@@ -337,6 +336,16 @@ class WavefrontValidatorsTest < MiniTest::Test
     good_and_bad('wf_integration_id?', 'InvalidIntegrationId', good, bad)
   end
 
+  def test_apitoken_id
+    good = %w[2bfdcac7-1c9c-4c4b-9b56-c41c22c586dc
+              17db4cc1-65f6-40a8-a1fa-6fcae460c4bd
+              fca312fb-5ff4-420d-862d-5d6d99ed6bcf
+              3a1957e0-459e-49e5-9209-3888a4e8ac5b]
+
+    bad = %w[fa312fb-5ff4-420d-862d-5d6d99ed6bcf thing 123]
+    good_and_bad('wf_apitoken_id?', 'InvalidApiTokenId', good, bad)
+  end
+
   def test_distribution_interval
     good = %i[m h d]
     bad = ['m', [], {}, nil, 'bad id', :x, 'p']

data/spec/wavefront-sdk/write_spec.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
 require_relative '../spec_helper'
-require 'minitest/autorun'
-require_relative '../../lib/wavefront-sdk/write.rb'
+require_relative '../../lib/wavefront-sdk/write'
+require_relative '../../lib/wavefront-sdk/core/response'
 require_relative 'resources/dummy_points'
 
-W_CREDS = { proxy: 'wavefront', port: 2878 }.freeze
-
 # This class is sufficiently different to the API calling classes
 # that it doesn't use spec helper or inherit anything.
 #
@@ -29,6 +27,75 @@ class WavefrontWriteTest < MiniTest::Test
     assert_instance_of(Wavefront::Writer::Socket, wf.writer)
   end
 
+  def test_composite_response
+    bad_status = { result: 'ERROR', message: nil, code: nil }
+    bad_response = { sent: 0, rejected: 1, unsent: 0 }
+    good_status = { result: 'OK', message: nil, code: nil }
+    good_response = { sent: 1, rejected: 0, unsent: 0 }
+
+    bad_resp = Wavefront::Response.new(
+      { status: bad_status, response: bad_response }.to_json, nil
+    )
+
+    good_resp = Wavefront::Response.new(
+      { status: good_status, response: good_response }.to_json, nil
+    )
+
+    x = wf.composite_response(Array.new(5).map { good_resp })
+    assert x.ok?
+    assert_equal('OK', x.status.result)
+    assert_equal(5, x.response.sent)
+    assert_equal(0, x.response.rejected)
+    assert_equal(0, x.response.unsent)
+
+    y = wf.composite_response(Array.new(4).map { good_resp } + [bad_resp])
+    refute y.ok?
+    assert_equal('ERROR', y.status.result)
+    assert_equal(4, y.response.sent)
+    assert_equal(1, y.response.rejected)
+    assert_equal(0, y.response.unsent)
+
+    z = wf.composite_response(Array.new(5).map { bad_resp })
+    refute z.ok?
+    assert_equal('ERROR', z.status.result)
+    assert_equal(0, z.response.sent)
+    assert_equal(5, z.response.rejected)
+    assert_equal(0, z.response.unsent)
+  end
+
+  def test_write_empty
+    assert wf.write([])
+  end
+
+  def test_bad_write
+    write_method = Spy.on(wf.writer, :write).and_return(BadMocket.new)
+    refute wf.write(point_array(19)).ok?
+    assert write_method.has_been_called?
+    assert_equal(1, write_method.calls.size)
+  end
+
+  def test_write_single_chunk
+    write_method = Spy.on(wf.writer, :write).and_return(Mocket.new)
+    assert wf.write(point_array(19)).ok?
+    assert write_method.has_been_called?
+    assert_equal(1, write_method.calls.size)
+  end
+
+  def test_write_multi_chunk
+    write_method = Spy.on(wf.writer, :write).and_return(Mocket.new)
+    assert wf.write(point_array(4321))
+    assert write_method.has_been_called?
+    assert_equal(5, write_method.calls.size)
+  end
+
+  # helper to test write chunking
+  #
+  def point_array(count)
+    1.upto(count).map do |i|
+      { path: 'dummy.path', value: i, ts: Time.now.to_i - i }
+    end
+  end
+
   def test_paths_to_deltas
     x = wf.paths_to_deltas(POINTS.dup)
     assert_equal(x.size, 2)

data/spec/wavefront-sdk/writers/core_spec.rb

@@ -37,17 +37,17 @@ class WavefrontCoreWriteTest < MiniTest::Test
   end
 
   def test_prefix_points
-    assert_equal(wf.prefix_points(%w[p1 p2 p3 p4]), %w[p1 p2 p3 p4])
-    assert_equal(wf.prefix_points([%w[p1 p2 p3 p4]]), %w[p1 p2 p3 p4])
-    assert_equal(wf.prefix_points('p1'), %w[p1])
-    assert_equal(wf.prefix_points([{ path: 'p1' },
-                                   { path: 'p2' },
-                                   { path: 'p3' }], 'prefix'),
-                 [{ path: 'prefix.p1' },
+    assert_equal(%w[p1 p2 p3 p4], wf.prefix_points(%w[p1 p2 p3 p4]))
+    assert_equal(%w[p1 p2 p3 p4], wf.prefix_points([%w[p1 p2 p3 p4]]))
+    assert_equal(%w[p1], wf.prefix_points('p1'))
+    assert_equal([{ path: 'prefix.p1' },
                   { path: 'prefix.p2' },
-                  { path: 'prefix.p3' }])
+                  { path: 'prefix.p3' }],
+                 wf.prefix_points([{ path: 'p1' },
+                                   { path: 'p2' },
+                                   { path: 'p3' }], 'prefix'))
 
-    assert_equal(wf.prefix_points({ path: 'p1' }, 'prefix'),
-                 [path: 'prefix.p1'])
+    assert_equal([path: 'prefix.p1'],
+                 wf.prefix_points({ path: 'p1' }, 'prefix'))
   end
 end

data/spec/wavefront-sdk/writers/socket_spec.rb

@@ -85,12 +85,24 @@ class WavefrontWriterSocketTest < MiniTest::Test
     tcp_spy = Spy.on(TCPSocket, :new)
     wf.open
     assert tcp_spy.has_been_called?
-    assert_equal(tcp_spy.calls.first.args, ['wavefront-proxy', 2878])
+    assert_equal(['wavefront-proxy', 2878], tcp_spy.calls.first.args)
   end
 
   def test_noop_open
     tcp_spy = Spy.on(TCPSocket, :new)
+    log_spy = Spy.on(wf_noop.logger, :log)
     wf_noop.open
     refute tcp_spy.has_been_called?
+    assert_equal(['No-op requested. Not opening connection to proxy.'],
+                 log_spy.calls.last.args)
+    assert_equal(1, log_spy.calls.size)
+  end
+
+  def test_noop_close
+    tcp_spy = Spy.on(TCPSocket, :new)
+    log_spy = Spy.on(wf_noop.logger, :log)
+    wf_noop.close
+    refute tcp_spy.has_been_called?
+    refute log_spy.has_been_called?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -180,6 +180,10 @@ files:
 - README.md
 - Rakefile
 - lib/wavefront-sdk/alert.rb
+- lib/wavefront-sdk/api_mixins/acl.rb
+- lib/wavefront-sdk/api_mixins/tag.rb
+- lib/wavefront-sdk/api_mixins/user.rb
+- lib/wavefront-sdk/apitoken.rb
 - lib/wavefront-sdk/cloudintegration.rb
 - lib/wavefront-sdk/core/api.rb
 - lib/wavefront-sdk/core/api_caller.rb
@@ -217,7 +221,6 @@ files:
 - lib/wavefront-sdk/stdlib/string.rb
 - lib/wavefront-sdk/support/mixins.rb
 - lib/wavefront-sdk/support/parse_time.rb
-- lib/wavefront-sdk/support/user_mixins.rb
 - lib/wavefront-sdk/types/status.rb
 - lib/wavefront-sdk/user.rb
 - lib/wavefront-sdk/usergroup.rb
@@ -234,6 +237,8 @@ files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
 - spec/wavefront-sdk/alert_spec.rb
+- spec/wavefront-sdk/api_mixins/user_mixins_spec.rb
+- spec/wavefront-sdk/apitoken_spec.rb
 - spec/wavefront-sdk/cloudintegration_spec.rb
 - spec/wavefront-sdk/core/api_caller_spec.rb
 - spec/wavefront-sdk/core/api_spec.rb
@@ -269,7 +274,6 @@ files:
 - spec/wavefront-sdk/stdlib/string_spec.rb
 - spec/wavefront-sdk/support/mixins_spec.rb
 - spec/wavefront-sdk/support/parse_time_spec.rb
-- spec/wavefront-sdk/support/user_mixins_spec.rb
 - spec/wavefront-sdk/user_spec.rb
 - spec/wavefront-sdk/usergroup_spec.rb
 - spec/wavefront-sdk/validators_spec.rb
@@ -308,6 +312,8 @@ test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
 - spec/wavefront-sdk/alert_spec.rb
+- spec/wavefront-sdk/api_mixins/user_mixins_spec.rb
+- spec/wavefront-sdk/apitoken_spec.rb
 - spec/wavefront-sdk/cloudintegration_spec.rb
 - spec/wavefront-sdk/core/api_caller_spec.rb
 - spec/wavefront-sdk/core/api_spec.rb
@@ -343,7 +349,6 @@ test_files:
 - spec/wavefront-sdk/stdlib/string_spec.rb
 - spec/wavefront-sdk/support/mixins_spec.rb
 - spec/wavefront-sdk/support/parse_time_spec.rb
-- spec/wavefront-sdk/support/user_mixins_spec.rb
 - spec/wavefront-sdk/user_spec.rb
 - spec/wavefront-sdk/usergroup_spec.rb
 - spec/wavefront-sdk/validators_spec.rb

data/lib/wavefront-sdk/support/user_mixins.rb

@@ -1,24 +0,0 @@
-module Wavefront
-  #
-  # Things needed by User and UserGroup classes
-  #
-  module UserMixins
-    # Validate a list of users.
-    # @param list [Array[String]] list of user IDs
-    # @raise Wavefront::Exception::InvalidUser
-    #
-    def validate_user_list(list)
-      raise ArgumentError unless list.is_a?(Array)
-      list.each { |id| wf_user_id?(id) }
-    end
-
-    # Validate a list of user groups
-    # @param list [Array[String]] list of user group IDs
-    # @raise Wavefront::Exception::InvalidUserGroup
-    #
-    def validate_usergroup_list(list)
-      raise ArgumentError unless list.is_a?(Array)
-      list.each { |id| wf_usergroup_id?(id) }
-    end
-  end
-end