wavefront-cli 8.3.0 → 8.5.1

data/spec/wavefront-cli/opt_handler_spec.rb

@@ -19,7 +19,7 @@ class OptHandlerTest < MiniTest::Test
     x = WavefrontCli::OptHandler.new
     assert x.is_a?(WavefrontCli::OptHandler)
     assert x.opts.is_a?(Hash)
-    assert x.opts.keys.include?(:endpoint)
+    assert x.opts.key?(:endpoint)
   end
 
   def test_missing_config
@@ -36,7 +36,7 @@ class OptHandlerTest < MiniTest::Test
     o = x.opts
     assert x.is_a?(WavefrontCli::OptHandler)
     assert o.is_a?(Hash)
-    refute o.keys.include?(:token)
+    refute o.key?(:token)
     assert_equal(o[:endpoint], 'metrics.wavefront.com')
   end
 
@@ -52,7 +52,7 @@ class OptHandlerTest < MiniTest::Test
     assert_equal(o[:token], 'abcd1234')
     assert_nil o[:config]
     assert_equal(o[:endpoint], 'myendpoint.wavefront.com')
-    refute o.keys.include?(:proxy)
+    refute o.key?(:proxy)
     ENV['WAVEFRONT_TOKEN'] = nil
     ENV['WAVEFRONT_ENDPOINT'] = nil
   end

data/spec/wavefront-cli/serviceaccount_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../lib/wavefront-cli/serviceaccount'
 
 # Ensure 'serviceaccount' commands produce the correct API calls.
 #
-# rubocop:disable Metrics/ClassLength
 class ServiceAccountEndToEndTest < EndToEndTest
   include WavefrontCliTest::Describe
   # include WavefrontCliTest::Import
@@ -41,20 +40,36 @@ class ServiceAccountEndToEndTest < EndToEndTest
     assert_abort_on_missing_creds("groups #{id}")
   end
 
-  def test_permissions
+  def test_roles
     quietly do
-      assert_cmd_gets("permissions #{id}", "/api/v2/#{api_path}/#{id}")
+      assert_cmd_gets("roles #{id}", "/api/v2/#{api_path}/#{id}")
     end
 
-    assert_invalid_id("permissions #{invalid_id}")
-    assert_usage('permissions')
+    assert_invalid_id("roles #{invalid_id}")
+    assert_usage('roles')
 
     assert_noop(
-      "permissions #{id}",
+      "roles #{id}",
       "uri: GET https://default.wavefront.com/api/v2/#{api_path}/#{id}"
     )
 
-    assert_abort_on_missing_creds("permissions #{id}")
+    assert_abort_on_missing_creds("roles #{id}")
+  end
+
+  def test_ingestionpolicy
+    quietly do
+      assert_cmd_gets("ingestionpolicy #{id}", "/api/v2/#{api_path}/#{id}")
+    end
+
+    assert_invalid_id("ingestionpolicy #{invalid_id}")
+    assert_usage('ingestionpolicy')
+
+    assert_noop(
+      "ingestionpolicy #{id}",
+      "uri: GET https://default.wavefront.com/api/v2/#{api_path}/#{id}"
+    )
+
+    assert_abort_on_missing_creds("ingestionpolicy #{id}")
   end
 
   def test_activate
@@ -85,7 +100,7 @@ class ServiceAccountEndToEndTest < EndToEndTest
                        '/api/v2/account/serviceaccount',
                        identifier: id,
                        active: true,
-                       groups: [],
+                       roles: [],
                        tokens: [],
                        userGroups: [])
     end
@@ -95,8 +110,8 @@ class ServiceAccountEndToEndTest < EndToEndTest
       'uri: POST https://default.wavefront.com/api/v2/account/serviceaccount',
       'body: ' + { identifier: id,
                    active: true,
-                   groups: [],
                    tokens: [],
+                   roles: [],
                    userGroups: [] }.to_json
     )
 
@@ -111,43 +126,56 @@ class ServiceAccountEndToEndTest < EndToEndTest
                        identifier: id,
                        description: 'words',
                        active: false,
-                       groups: [],
+                       roles: [],
                        tokens: [],
                        userGroups: [])
     end
   end
 
-  def test_create_account_in_usergroups
+  def test_create_account_with_usergroups
     quietly do
       assert_cmd_posts("create -g #{usergroups[0]} -g #{usergroups[1]} #{id}",
                        '/api/v2/account/serviceaccount',
                        identifier: id,
                        active: true,
-                       groups: [],
                        tokens: [],
+                       roles: [],
                        userGroups: usergroups)
     end
   end
 
+  def test_create_account_with_roles
+    quietly do
+      assert_cmd_posts("create -r #{roles[0]} -r #{roles[1]} #{id}",
+                       '/api/v2/account/serviceaccount',
+                       identifier: id,
+                       active: true,
+                       tokens: [],
+                       roles: roles,
+                       userGroups: [])
+    end
+  end
+
   def test_create_account_with_tokens
     quietly do
       assert_cmd_posts("create -k #{tokens[0]} -k #{tokens[1]} #{id}",
                        '/api/v2/account/serviceaccount',
                        identifier: id,
                        active: true,
-                       groups: [],
                        tokens: tokens,
+                       roles: [],
                        userGroups: [])
     end
   end
 
-  def test_create_account_with_permissions
+  def test_create_account_with_ingestion_policy
     quietly do
-      assert_cmd_posts("create -p #{permissions[0]} -p #{permissions[1]} #{id}",
+      assert_cmd_posts("create -p #{ingestion_policy} #{id}",
                        '/api/v2/account/serviceaccount',
                        identifier: id,
                        active: true,
-                       groups: permissions,
+                       ingestionPolicyId: ingestion_policy,
+                       roles: [],
                        tokens: [],
                        userGroups: [])
     end
@@ -158,8 +186,8 @@ class ServiceAccountEndToEndTest < EndToEndTest
                       "create -g abcdefg #{id}")
   end
 
-  def test_create_invalid_permission
-    assert_exits_with("'123456' is not a valid Wavefront permission.",
+  def test_create_invalid_ingestion_policy
+    assert_exits_with("'123456' is not a valid ingestion policy ID.",
                       "create -p 123456 #{id}")
   end
 
@@ -358,8 +386,9 @@ class ServiceAccountEndToEndTest < EndToEndTest
     'service account'
   end
 
-  def permissions
-    %w[alerts_management events_management]
+  def roles
+    %w[07fc5cdd-0979-489e-8f70-325f39d15e55
+       0a42adf6-e738-4c5d-9e53-fd10bd979a31]
   end
 
   def tokens
@@ -372,6 +401,10 @@ class ServiceAccountEndToEndTest < EndToEndTest
        abcdef12-1234-abcd-1234-abcdef012345]
   end
 
+  def ingestion_policy
+    'test-policy-1607616352537'
+  end
+
   def import_fields
     %i[identifier description active tokens groups userGroups]
   end
@@ -396,4 +429,3 @@ class ServiceAccountEndToEndTest < EndToEndTest
       identifier: 'sa::test' }
   end
 end
-# rubocop:enable Metrics/ClassLength

data/wavefront-cli.gemspec

@@ -26,11 +26,14 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'docopt', '~> 0.6.0'
   gem.add_runtime_dependency 'inifile', '~> 3.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.3'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.4', '>= 5.4.2'
 
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '0.91.0'
+  gem.add_development_dependency 'rubocop', '~> 1.9'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
   gem.add_development_dependency 'spy', '~> 1.0.0'
   gem.add_development_dependency 'webmock', '~> 3.8'
   gem.add_development_dependency 'yard', '~> 0.9.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.5.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +90,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
@@ -144,9 +192,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -226,6 +275,7 @@ files:
 - lib/wavefront-cli/display/webhook.rb
 - lib/wavefront-cli/display/write.rb
 - lib/wavefront-cli/event.rb
+- lib/wavefront-cli/event_store.rb
 - lib/wavefront-cli/exception.rb
 - lib/wavefront-cli/exception_handler.rb
 - lib/wavefront-cli/externallink.rb
@@ -316,6 +366,7 @@ files:
 - spec/wavefront-cli/display/printer/long_spec.rb
 - spec/wavefront-cli/display/printer/terse_spec.rb
 - spec/wavefront-cli/event_spec.rb
+- spec/wavefront-cli/event_store_spec.rb
 - spec/wavefront-cli/externallink_spec.rb
 - spec/wavefront-cli/integration_spec.rb
 - spec/wavefront-cli/maintenancewindow_spec.rb
@@ -403,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2
@@ -455,6 +506,7 @@ test_files:
 - spec/wavefront-cli/display/printer/long_spec.rb
 - spec/wavefront-cli/display/printer/terse_spec.rb
 - spec/wavefront-cli/event_spec.rb
+- spec/wavefront-cli/event_store_spec.rb
 - spec/wavefront-cli/externallink_spec.rb
 - spec/wavefront-cli/integration_spec.rb
 - spec/wavefront-cli/maintenancewindow_spec.rb

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-before_install: gem install bundler --no-document
-deploy:
-  provider: rubygems
-  api_key:
-    secure: dpVC480pAmGQrkEeugPowxhYzM8Er9UDhY02u2P5ytrCXC9J05uGKvN8uZ6H8SJr1ZKUb7OGxCq+EVKrA/q1s6Cv07Xl9u1HiOR0cB4ZUW3wBl6TGdl7c/rcor5AQxjELTcWnhCJvTzB+i46a1s4AcWjGBIVEY7/b1iloj/Sm0U43UZPcWPaIl5xfnANBk6v9F5eEfQy5IXlQUQKtRLXzgyqwyJi7DQcNcnEXA0O33KKwka7QDQsycYE7axEiJGOBt0PbYiRUXRZBxKWnsrtq9Sk9QukYsZSQqZgkykV6ImvMYzWI/vUwDRl+dJWmyAG6K2mz4kqMjhiMkB4ctbj5sxDG1BzsBlNTTEb0P8PGBEYgcf4VBd7XDlEt0Sythp6ztn9EVtw35M22n5Q7sdgalf6TFrzQpp9sec3o4AqO3IXUIqRN4VD4vPRQVBJHcwFOuZ3EUO0VekUzCUO3R/mG4oHUIQ9VgRzrUuyYpCwuwWyoVKVA/AukHHW6Y7El2g+JlpP+ijf0ABpqusHENELVWnuCRcv36sxbyM6Rbt2JrT9FrG1oSAELz4yMS86Qhq104II89d6apGJT3thUH8n9m2KA16DmxQYXkNamfygCn3D5ogC2gcIgVicQnJma+405Pv43/a+PaKy/oKr3/H7IJJmoqHfiMyG9DtkFTWQrfA=
-  gem: wavefront-cli
-  on:
-    tags: true
-    repo: snltd/wavefront-cli
-    ruby: 2.6.6
-notifications:
-  email: false
-  slack:
-    secure: YrwfBiBscjUCHZIyPHH/FEm5VbHZN3AczHnlOJfETsAdsVpM+JOvHnoCaY0AGjvCvmFMPE9yg11yhwMfXZJVwjAC6b75VrXoCFIvC1tjLqFizuI4VBZXUZk3CQZK0pIh1ZRYVINa0LuYLDyxF0EG2N9KTYqQcMEsBwsVohsca+zjbjyIW5H0FeVWJC4QlFqVHBwFHvylfHnPjh0pQAn3sE9j7Of3W2HQVM753/lsOkMf3sHYOv8AOrzjTNqyrageTxUGnO91S41DirNdesrjF8Qg+/s1RSiNeYSZLkqI2pk+3sdkMkpA+2z2zQ/ZbgudS/38AVlh2Wb2KkmFw0+XhdpUGqQZgLlgWMDKoiS7j2dNQ3zA4guCZIQSW6gqR76wTUqeCZQ3UNalChAhACFnG0FmZj+AIE72r28dOH747zKEmTaoJt5FR7GlSoG6cH1EV9qTeIjZ/33ehL703E6qrWITjQ6VrNrPsTCt8rvoW2MV8TP9qb32JVJqWxabqUMBicIWLEeDjPyAmOZs32cWwfk9zcJ6hIJcFffkxgVJN0vU6Qi4tGWUmYK12EIclVgrKgvN1yHUrUN/r7+sUPX9WRj82RNFU6RSPircekV9oWj9Hr8A2imnFqiMTnPpSb56y02cG9FbwFPqxLSaNNV4lALzoBmluKv0RSeEWhRvrGI=