wavefront-cli 5.1.1 → 7.2.0

data/spec/wavefront-cli/cloudintegration_spec.rb

@@ -7,12 +7,11 @@ require_relative '../../lib/wavefront-cli/cloudintegration'
 # Ensure 'cloudintegration' commands produce the correct API calls.
 #
 class CloudIntegrationEndToEndTest < EndToEndTest
-  include WavefrontCliTest::DeleteUndelete
-  include WavefrontCliTest::Describe
-  include WavefrontCliTest::Dump
-  include WavefrontCliTest::List
-  # include WavefrontCliTest::Import
-  include WavefrontCliTest::Search
+  # include WavefrontCliTest::DeleteUndelete
+  # include WavefrontCliTest::Describe
+  # include WavefrontCliTest::Dump
+  # include WavefrontCliTest::List
+  # include WavefrontCliTest::Search
 
   def test_enable
     assert_repeated_output("Enabled '#{id}'.") do
@@ -46,6 +45,20 @@ class CloudIntegrationEndToEndTest < EndToEndTest
                 'body: null')
   end
 
+  def test_aws_id_generate
+    # assert_repeated_output("Disabled '#{id}'.") do
+    # assert_cmd_posts("disable #{id}",
+    # "/api/v2/cloudintegration/#{id}/disable")
+    # end
+
+    assert_abort_on_missing_creds('awsid generate')
+
+    assert_noop('awsid generate',
+                'uri: POST https://default.wavefront.com/api/v2/' \
+                'cloudintegration/awsExternalId',
+                'body: null')
+  end
+
   private
 
   def id

data/spec/wavefront-cli/commands/write_spec.rb

@@ -13,6 +13,6 @@ class WavefrontCommmandWriteTest < WavefrontCommmandBaseTest
   def setup
     @wf = WavefrontCommandWrite.new
     @col_width = 25
-    @skip_cmd = /write (point|file|distribution)/
+    @skip_cmd = /write (point|file|distribution|noise)/
   end
 end

data/spec/wavefront-cli/event_spec.rb

@@ -13,8 +13,8 @@ TEST_EVENT_DIR = Pathname.new('/tmp/wf_event_test')
 #
 class EventEndToEndTest < EndToEndTest
   attr_reader :test_state_dir
-  include Wavefront::Mixins
 
+  include Wavefront::Mixins
   include WavefrontCliTest::Describe
   include WavefrontCliTest::Delete
   # Ones above work, ones below don't

data/spec/wavefront-cli/output/csv/query_spec.rb

@@ -161,7 +161,7 @@ class WavefrontOutputCsvTest < MiniTest::Test
     out.each do |l|
       c = l.split(',', 5)
       assert_equal(c[0], 'solaris.network.obytes64')
-      assert_match(/^[\d\.]+$/, c[1])
+      assert_match(/^[\d.]+$/, c[1])
       # query returns epoch s timestamp, raw returns epoch ms
       assert_match(/^\d+$/, c[2])
       assert(c[2].size == 10 || c[2].size == 13)

data/spec/wavefront-cli/output/wavefront/query_spec.rb

@@ -61,13 +61,13 @@ class WavefrontOutputWavefrontTest < MiniTest::Test
     out.each do |l|
       c = l.split(' ', 5)
       assert_equal(c[0], 'solaris.network.obytes64')
-      assert_match(/^[\d\.]+$/, c[1])
+      assert_match(/^[\d.]+$/, c[1])
       # query returns epoch s timestamp, raw returns epoch ms
       assert_match(/^\d+$/, c[2])
       assert(c[2].size == 10 || c[2].size == 13)
       assert_match(/^source=[-\w]+$/, c[3])
       assert_match(/^source=[-\w]+$/, c[3])
-      c[4].split.each { |t| assert_match(/^\w+=\"[-\w]+\"$/, t) }
+      c[4].split.each { |t| assert_match(/^\w+="[-\w]+"$/, t) }
     end
   end
 end

data/spec/wavefront-cli/query_spec.rb

@@ -27,9 +27,10 @@ class QueryEndToEndTest < EndToEndTest
     assert_noop(
       "-s #{epoch_time[0]} -k #{query}",
       'uri: GET https://default.wavefront.com/api/v2/chart/api',
-      'params: {:i=>false, :summarization=>"mean", :listMode=>true, ' \
-      ':strict=>true, :sorted=>true, :q=>"ts(\"dev.cli.test\")", ' \
-      ":g=>:m, :s=>#{epoch_time[0]}}"
+      'params: {:autoEvents=>false, :i=>false, :summarization=>"mean", ' \
+      ':listMode=>true, :strict=>true, :includeObsoleteMetrics=>false, ' \
+      ':sorted=>true, :q=>"ts(\"dev.cli.test\")", :g=>:m, ' \
+      ":s=>#{epoch_time[0]}}"
     )
   end
 
@@ -92,6 +93,22 @@ class QueryEndToEndTest < EndToEndTest
     assert_match(/query\s+ts\("cpu.0.pc.user"\)/, out)
   end
 
+  def test_query_with_start_and_end_and_nostrict_and_nocache
+    out, err = capture_io do
+      assert_cmd_gets_with_params("-s #{epoch_time[0]} -CK #{query}",
+                                  '/api/v2/chart/api',
+                                  { q: query,
+                                    g: 'm',
+                                    i: 'false',
+                                    strict: 'false',
+                                    s: epoch_time[0].to_s,
+                                    cached: 'false' }, canned_response)
+    end
+
+    assert_empty(err)
+    assert_match(/query\s+ts\("cpu.0.pc.user"\)/, out)
+  end
+
   def test_query_with_start_and_end_and_name
     out, err = capture_io do
       assert_cmd_gets_with_params(

data/spec/wavefront-cli/role_spec.rb

@@ -0,0 +1,187 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../support/command_base'
+require_relative '../../lib/wavefront-cli/role'
+
+# Ensure 'role' commands produce the correct API calls.
+#
+class RoleEndToEndTest < EndToEndTest
+  include WavefrontCliTest::List
+  include WavefrontCliTest::Describe
+  include WavefrontCliTest::Dump
+  include WavefrontCliTest::Search
+  include WavefrontCliTest::Delete
+  include WavefrontCliTest::Set
+
+  def test_create
+    quietly do
+      assert_cmd_posts("create #{role_name}",
+                       '/api/v2/role',
+                       name: role_name, permissions: [])
+    end
+
+    assert_abort_on_missing_creds("create #{role_name}")
+    assert_usage('create')
+  end
+
+  def test_create_with_permissions
+    quietly do
+      assert_cmd_posts("create -p #{permissions[0]} -p #{permissions[1]} " \
+                       "#{role_name}",
+                       '/api/v2/role',
+                       name: role_name, permissions: permissions)
+    end
+  end
+
+  def test_create_with_permissions_and_description
+    quietly do
+      assert_cmd_posts("create -p #{permissions[0]} -p #{permissions[1]} " \
+                       "-d description #{role_name}",
+                       '/api/v2/role',
+                       name: role_name,
+                       permissions: permissions,
+                       description: 'description')
+    end
+  end
+
+  def test_accounts
+    assert_repeated_output("No accounts have role '#{id}'.") do
+      assert_cmd_posts("accounts #{id}",
+                       '/api/v2/search/account',
+                       {  limit: 999,
+                          offset: 0,
+                          query: [{ key: 'roles',
+                                    value: id,
+                                    matchingMethod: 'CONTAINS',
+                                    negated: false }],
+                          sort: { field: 'id', ascending: true } })
+    end
+
+    assert_abort_on_missing_creds("accounts #{id}")
+    assert_invalid_id("accounts #{invalid_id}")
+    assert_usage('accounts')
+  end
+
+  def test_groups
+    assert_repeated_output("No groups have role '#{id}'.") do
+      assert_cmd_posts("groups #{id}",
+                       '/api/v2/search/usergroup',
+                       {  limit: 999,
+                          offset: 0,
+                          query: [{ key: 'roles',
+                                    value: id,
+                                    matchingMethod: 'CONTAINS',
+                                    negated: false }],
+                          sort: { field: 'id', ascending: true } })
+    end
+
+    assert_abort_on_missing_creds("groups #{id}")
+    assert_invalid_id("groups #{invalid_id}")
+    assert_usage('groups')
+  end
+
+  def test_permissions
+    assert_repeated_output("Role '#{id}' has no permissions.") do
+      assert_cmd_gets("permissions #{id}",
+                      "/api/v2/role/#{id}",
+                      { permissions: [] }.to_json)
+    end
+
+    out, err = capture_io do
+      assert_cmd_gets("permissions #{id}",
+                      "/api/v2/role/#{id}",
+                      { permissions: permissions }.to_json)
+    end
+
+    assert_equal(permissions.join("\n"), out.strip)
+    assert_empty err
+
+    assert_abort_on_missing_creds("permissions #{id}")
+    assert_invalid_id("permissions #{invalid_id}")
+    assert_usage('permissions')
+  end
+
+  def test_give_to
+    assert_repeated_output("Gave '#{id}' to '#{accounts.first}'.") do
+      assert_cmd_posts("give #{id} to #{accounts.first}",
+                       "/api/v2/role/#{id}/addAssignees",
+                       [accounts.first].to_json)
+    end
+
+    assert_abort_on_missing_creds("give #{id} to #{accounts.first}")
+    assert_invalid_id("give #{invalid_id} to #{accounts.first}")
+  end
+
+  def test_take_from
+    out, err = capture_io do
+      assert_cmd_posts("take #{id} from #{accounts.join(' ')}",
+                       "/api/v2/role/#{id}/removeAssignees",
+                       accounts.to_json)
+    end
+
+    assert_equal("Took '#{id}' from '#{accounts.first}', '#{accounts.last}'.",
+                 out.strip.tr("\n", ' '))
+
+    assert_empty err
+
+    assert_abort_on_missing_creds("take #{id} from #{accounts.join(' ')}")
+    assert_invalid_id("take #{invalid_id} from #{accounts.join(' ')}")
+  end
+
+  def test_grant
+    assert_repeated_output(
+      "Granted '#{permissions.first}' permission to '#{id}'."
+    ) do
+      assert_cmd_posts("grant #{permissions.first} to #{id}",
+                       "/api/v2/role/grant/#{permissions.first}",
+                       [id].to_json)
+    end
+
+    assert_abort_on_missing_creds("grant #{permissions.first} to #{id}")
+    assert_invalid_id("grant #{permissions.first} to #{invalid_id}")
+  end
+
+  def test_revoke
+    assert_repeated_output(
+      "Revoked '#{permissions.last}' permission from '#{id}'."
+    ) do
+      assert_cmd_posts("revoke #{permissions.last} from #{id}",
+                       "/api/v2/role/revoke/#{permissions.last}",
+                       [id].to_json)
+    end
+
+    assert_abort_on_missing_creds("revoke #{permissions.last} from #{id}")
+    assert_invalid_id("revoke #{permissions.last} from #{invalid_id}")
+  end
+
+  private
+
+  def id
+    '2659191e-aad4-4302-a94e-9667e1517127'
+  end
+
+  def invalid_id
+    '__BAD__'
+  end
+
+  def cmd_word
+    'role'
+  end
+
+  def role_name
+    'test_role'
+  end
+
+  def permissions
+    %w[alerts_management events_management]
+  end
+
+  def accounts
+    %w[someone@example.com sa::testacct]
+  end
+
+  def set_key
+    'description'
+  end
+end

data/spec/wavefront-cli/serviceaccount_spec.rb

@@ -154,17 +154,17 @@ class ServiceAccountEndToEndTest < EndToEndTest
   end
 
   def test_create_invalid_usergroup
-    assert_exits_with('Unable to run command. Invalid usergroup ID.',
+    assert_exits_with("'abcdefg' is not a valid user group ID.",
                       "create -g abcdefg #{id}")
   end
 
   def test_create_invalid_permission
-    assert_exits_with('Unable to run command. Invalid permission.',
+    assert_exits_with("'123456' is not a valid Wavefront permission.",
                       "create -p 123456 #{id}")
   end
 
   def test_create_invalid_token
-    assert_exits_with('Unable to run command. Invalid API token.',
+    assert_exits_with("'abcdefg' is not a valid API token ID.",
                       "create -k abcdefg #{id}")
   end
 

data/spec/wavefront-cli/usergroup_spec.rb

@@ -18,19 +18,18 @@ class UserGroupEndToEndTest < EndToEndTest
     quietly do
       assert_cmd_posts("create #{groupname}",
                        '/api/v2/usergroup',
-                       name: groupname, permissions: [])
+                       name: groupname, roleIDs: [])
     end
 
     assert_abort_on_missing_creds("create #{groupname}")
     assert_usage('create')
   end
 
-  def test_create_with_privileges
+  def test_create_with_roles
     quietly do
-      assert_cmd_posts("create -p #{privileges[0]} -p #{privileges[1]} " \
-                       "#{groupname}",
+      assert_cmd_posts("create -r #{roles[0]} -r #{roles[1]} #{groupname}",
                        '/api/v2/usergroup',
-                       name: groupname, permissions: privileges)
+                       name: groupname, roleIDs: roles)
     end
   end
 
@@ -44,25 +43,15 @@ class UserGroupEndToEndTest < EndToEndTest
     assert_usage('users')
   end
 
-  def test_permissions
-    assert_repeated_output("Group '#{id}' has no permissions.") do
-      assert_cmd_gets("permissions #{id}", "/api/v2/usergroup/#{id}")
-    end
-
-    assert_abort_on_missing_creds("permissions #{id}")
-    assert_invalid_id("permissions #{invalid_id}")
-    assert_usage('permissions')
-  end
-
   def test_add_user
     assert_repeated_output("Added '#{users[0]}' to '#{id}'.") do
-      assert_cmd_posts("add user #{id} #{users[0]}",
+      assert_cmd_posts("add to #{id} #{users[0]}",
                        "/api/v2/usergroup/#{id}/addUsers",
                        [users[0]].to_json)
     end
 
-    assert_abort_on_missing_creds("add user #{id} #{users[0]}")
-    assert_invalid_id("add user #{invalid_id} #{users[0]}")
+    assert_abort_on_missing_creds("add to #{id} #{users[0]}")
+    assert_invalid_id("add to #{invalid_id} #{users[0]}")
   end
 
   # assert_repeated_output can't cope with line wrapping, and suppressing it
@@ -70,7 +59,7 @@ class UserGroupEndToEndTest < EndToEndTest
   #
   def test_add_multiple_users
     quietly do
-      assert_cmd_posts("add user #{id} #{users[0]} #{users[1]}",
+      assert_cmd_posts("add to #{id} #{users[0]} #{users[1]}",
                        "/api/v2/usergroup/#{id}/addUsers",
                        users.to_json)
     end
@@ -78,43 +67,58 @@ class UserGroupEndToEndTest < EndToEndTest
 
   def test_remove_user
     quietly do
-      assert_cmd_posts("remove user #{id} #{users[0]}",
+      assert_cmd_posts("remove from #{id} #{users[0]}",
                        "/api/v2/usergroup/#{id}/removeUsers",
                        [users[0]].to_json)
     end
 
-    assert_abort_on_missing_creds("remove user #{id} #{users[0]}")
-    assert_invalid_id("remove user #{invalid_id} #{users[0]}")
+    assert_abort_on_missing_creds("remove from #{id} #{users[0]}")
+    assert_invalid_id("remove from #{invalid_id} #{users[0]}")
   end
 
   def test_remove_multiple_users
     quietly do
-      assert_cmd_posts("remove user #{id} #{users[0]} #{users[1]}",
+      assert_cmd_posts("remove from #{id} #{users[0]} #{users[1]}",
                        "/api/v2/usergroup/#{id}/removeUsers",
                        users.to_json)
     end
   end
 
-  def test_grant
-    assert_repeated_output(
-      "Granted '#{privileges[1]}' permission to '#{id}'."
-    ) do
-      assert_cmd_posts("grant #{privileges[1]} to #{id}",
-                       "/api/v2/usergroup/grant/#{privileges[1]}",
-                       [id].to_json)
+  def test_add_role
+    quietly do
+      assert_cmd_posts("add role #{id} #{roles[0]}",
+                       "/api/v2/usergroup/#{id}/addRoles",
+                       [roles[0]].to_json)
     end
 
-    assert_abort_on_missing_creds("grant #{privileges[1]} to #{id}")
-    assert_invalid_id("grant #{privileges[1]} to #{invalid_id}")
+    assert_abort_on_missing_creds("add role #{id} #{roles[0]}")
+    assert_invalid_id("add role #{invalid_id} #{roles[0]}")
   end
 
-  def test_revoke
-    assert_repeated_output(
-      "Revoked '#{privileges[0]}' permission from '#{id}'."
-    ) do
-      assert_cmd_posts("revoke #{privileges[0]} from #{id}",
-                       "/api/v2/usergroup/revoke/#{privileges[0]}",
-                       [id].to_json)
+  def test_add_multiple_roles
+    quietly do
+      assert_cmd_posts("add role #{id} #{roles[0]} #{roles[1]}",
+                       "/api/v2/usergroup/#{id}/addRoles",
+                       roles.to_json)
+    end
+  end
+
+  def test_remove_role
+    quietly do
+      assert_cmd_posts("remove role #{id} #{roles[0]}",
+                       "/api/v2/usergroup/#{id}/removeRoles",
+                       [roles[0]].to_json)
+    end
+
+    assert_abort_on_missing_creds("remove role #{id} #{roles[0]}")
+    assert_invalid_id("remove role #{invalid_id} #{roles[0]}")
+  end
+
+  def test_remove_multiple_roles
+    quietly do
+      assert_cmd_posts("remove role #{id} #{roles[0]} #{roles[1]}",
+                       "/api/v2/usergroup/#{id}/removeRoles",
+                       roles.to_json)
     end
   end
 
@@ -144,11 +148,12 @@ class UserGroupEndToEndTest < EndToEndTest
     'testgroup'
   end
 
-  def privileges
-    %w[alerts_management events_management]
-  end
-
   def users
     %w[someone@somewhere.com other@elsewhere.com]
   end
+
+  def roles
+    %w[01234567-aad4-4302-a94e-9667e1517127
+       abcdefab-abcd-4302-a94e-9667e1517127]
+  end
 end