wavefront-sdk 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048989974d0868e696c8f50dc59007960e2456ca0e9ccb64d632b83d854124bf'
-  data.tar.gz: 66bc38c3d72355594b51aa5cbe9b34ab069f158cc133f168c94ba28f25dde79d
+  metadata.gz: 313adfc6845c757c8ce079ac7cc44a6a4a4979fe37204d3851d837af68496466
+  data.tar.gz: a797317ab7e0c00c10d6231ec3c6db552f973562cc4172b620c98bf6e47af02b
 SHA512:
-  metadata.gz: e4026c3af06d8e8d3de5a13f02cbc006072fe6852d95a04219b91383db003b97516ee56fd12abf1c2f47a34e238a38fd75dd02707e385b1e9c474c7d1acb0dca
-  data.tar.gz: fe902524b8af12691cbe40d50ffcb2f24b3aac5b35472743c9774009a33e464e621d6879e806ac0d41c20f71c1b54d3ebfd30e089ed43b029984afb205f08125
+  metadata.gz: e54e07151bf094132e03effce102428d40837605accfd03156426ecca98de7244f618f5fe191783dac6792ce8cf760f43252ea8e24b25c0d7f9b4fadced4e22f
+  data.tar.gz: 487f7dc0c1f06be5a3b743bb97f75ac8a3e6439625d9b46caba07801aa49a279ec8d8a7c0236442496fb1312279c3d6fa263478d58293a227f2c0f8f83a88049

data/HISTORY.md

@@ -1,6 +1,9 @@
 # Changelog
 
-# 3.0.0
+## 3.0.1
+* User IDs do not have to be e-mail addresses.
+
+## 3.0.0 (23/03/2019)
 * Drop support for Ruby 2.2. (Potentially breaking change.)
 * Add `Wavefront::Settings` class to cover new `settings` API
   endpoint.

data/lib/wavefront-sdk/defs/version.rb

@@ -1,4 +1,4 @@
 require 'pathname'
 
-WF_SDK_VERSION = '3.0.0'.freeze
+WF_SDK_VERSION = '3.0.1'.freeze
 WF_SDK_LOCATION = Pathname.new(__FILE__).dirname.parent.parent.parent

data/lib/wavefront-sdk/validators.rb

@@ -386,11 +386,7 @@ module Wavefront
     # @raise Wavefront::Exceptions::InvalidUserId if not valid
     #
     def wf_user_id?(user)
-      if user.is_a?(String) &&
-         user =~ /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
-        return true
-      end
-
+      return true if user.is_a?(String) && user.length < 256 && !user.empty?
       raise Wavefront::Exception::InvalidUserId
     end
 

data/spec/wavefront-sdk/support/user_mixins_spec.rb

@@ -15,11 +15,11 @@ class WavefrontUserMixinsTest < MiniTest::Test
     assert validate_user_list(%w[u1@d1.net u2@d2.org u3@d3.com])
 
     assert_raises(Wavefront::Exception::InvalidUserId) do
-      validate_user_list(%w[u1d1.net u2@d2.org u3@d3.com])
+      validate_user_list(['', 'u1d1.net', 'u2@d2.org', 'u3@d3.com'])
     end
 
     assert_raises(Wavefront::Exception::InvalidUserId) do
-      validate_user_list(%w[u1@d1.net org u3@d3.com])
+      validate_user_list(['u1@d1.net', '', 'bbrg', 'u3@d3.com'])
     end
 
     assert_raises(ArgumentError) { validate_user_list('u1@d1.net') }
@@ -28,7 +28,7 @@ class WavefrontUserMixinsTest < MiniTest::Test
   def validate_usergroup_list
     assert_raises(Wavefront::Exception::InvalidUserGroupId) do
       validate_user_list(%w[f8dc0c14-91a0-4ca9-8a2a-7d47f4db4672
-                            bad_id
+                            '',
                             2659191e-aad4-4302-a94e-9667e1517127])
     end
 

data/spec/wavefront-sdk/user_spec.rb

@@ -3,6 +3,7 @@
 require_relative '../spec_helper'
 
 USER = 'user@example.com'.freeze
+BAD_USER = ('user' * 500).freeze
 PERMISSION = 'agent_management'.freeze
 
 USER_BODY = { emailAddress: USER, groups: %w[browse] }.freeze
@@ -28,20 +29,20 @@ class WavefrontUserTest < WavefrontTestBase
 
   def test_delete
     should_work(:delete, USER, USER, :delete)
-    should_be_invalid(:delete, 'abcdefg')
+    should_be_invalid(:delete, BAD_USER)
     assert_raises(ArgumentError) { wf.delete }
   end
 
   def test_describe
     should_work(:describe, USER, USER)
-    should_be_invalid(:describe, 'abcdefg')
+    should_be_invalid(:describe, BAD_USER)
     assert_raises(ArgumentError) { wf.describe }
   end
 
   def test_update
     should_work(:update, [USER, USER_BODY, false], USER, :put,
                 JSON_POST_HEADERS, USER_BODY.to_json)
-    should_be_invalid(:update, ['!invalid uid!', USER_BODY])
+    should_be_invalid(:update, [BAD_USER, USER_BODY])
     assert_raises(ArgumentError) { wf.update }
   end
 
@@ -51,7 +52,7 @@ class WavefrontUserTest < WavefrontTestBase
                 JSON_POST_HEADERS, USERGROUP_LIST.to_json)
 
     assert_raises(Wavefront::Exception::InvalidUserId) do
-      wf.add_groups_to_user('invalid address', USERGROUP_LIST)
+      wf.add_groups_to_user(BAD_USER, USERGROUP_LIST)
     end
   end
 
@@ -61,7 +62,7 @@ class WavefrontUserTest < WavefrontTestBase
                 JSON_POST_HEADERS, USERGROUP_LIST.to_json)
 
     assert_raises(Wavefront::Exception::InvalidUserId) do
-      wf.remove_groups_from_user('invalid address', USERGROUP_LIST)
+      wf.remove_groups_from_user(BAD_USER, USERGROUP_LIST)
     end
   end
 
@@ -71,7 +72,7 @@ class WavefrontUserTest < WavefrontTestBase
                          'Content-Type': 'application/x-www-form-urlencoded'
                 ),
                 "group=#{PERMISSION}")
-    should_be_invalid(:grant, ['abcde', PERMISSION])
+    should_be_invalid(:grant, [BAD_USER, PERMISSION])
     assert_raises(ArgumentError) { wf.grant }
   end
 
@@ -81,7 +82,7 @@ class WavefrontUserTest < WavefrontTestBase
                          'Content-Type': 'application/x-www-form-urlencoded'
                 ),
                 "group=#{PERMISSION}")
-    should_be_invalid(:revoke, ['abcde', PERMISSION])
+    should_be_invalid(:revoke, [BAD_USER, PERMISSION])
     assert_raises(ArgumentError) { wf.revoke }
   end
 
@@ -91,7 +92,7 @@ class WavefrontUserTest < WavefrontTestBase
                 [USER, 'other@example.com'].to_json)
 
     assert_raises(Wavefront::Exception::InvalidUserId) do
-      wf.delete_users(['invalid address'])
+      wf.delete_users([BAD_USER])
     end
 
     assert_raises(ArgumentError) { wf.delete_users('a@b.com') }
@@ -101,7 +102,7 @@ class WavefrontUserTest < WavefrontTestBase
     should_work(:grant_permission, [PERMISSION, USER_LIST],
                 [:grant, PERMISSION].uri_concat, :post,
                 JSON_POST_HEADERS, USER_LIST.to_json)
-    should_be_invalid(:grant, ['abcde', PERMISSION])
+    should_be_invalid(:grant, [BAD_USER, PERMISSION])
     assert_raises(ArgumentError) { wf.grant }
   end
 
@@ -109,7 +110,7 @@ class WavefrontUserTest < WavefrontTestBase
     should_work(:revoke_permission, [PERMISSION, USER_LIST],
                 [:revoke, PERMISSION].uri_concat, :post,
                 JSON_POST_HEADERS, USER_LIST.to_json)
-    should_be_invalid(:revoke, ['abcde', PERMISSION])
+    should_be_invalid(:revoke, [BAD_USER, PERMISSION])
     assert_raises(ArgumentError) { wf.grant }
   end
 

data/spec/wavefront-sdk/usergroup_spec.rb

@@ -11,7 +11,7 @@ USERGROUP_BODY = { name:        'test group',
                                    events_management] }.freeze
 
 USER_LIST = %w[someone@somewhere.com other@elsewhere.net].freeze
-BAD_USER_LIST = %w[badusername very!bad!username].freeze
+BAD_USER_LIST = ['bad' * 500, ''].freeze
 
 PERMISSION = 'alerts_management'.freeze
 

data/spec/wavefront-sdk/validators_spec.rb

@@ -202,8 +202,8 @@ class WavefrontValidatorsTest < MiniTest::Test
 
   def test_wf_user_id?
     good = %w[Some.User@example.com general99+specific@somewhere.net
-              someone@somewhere.com]
-    bad = %w[word Name]
+              someone@somewhere.com a user user-name]
+    bad = ['', [], {}, 'a' * 1000]
     good_and_bad('wf_user_id?', 'InvalidUserId', good, bad)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable