wavefront-cli 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bb78ee1f6515f3a168acdedfa89680be010f429a33520e23a6caae252fc42f
-  data.tar.gz: 1e86e9eeb5ea1242443b0cf17eb1fea5c5f3a207c6895ab4102a1f705bf1a5a4
+  metadata.gz: 29567752b0846cf0bc23909151f65a0f023c02437203d97c0957f67c7802693f
+  data.tar.gz: be30496907d30aeb184d0d7cc3204452c79b219254caeb9c6a59785a240cca18
 SHA512:
-  metadata.gz: 01a3a13dbca2192dfb50c375d833ec73115a6c76e31e5fbb0ee42cab3a3f95ea89264e35ebabcb2f34caee642e8e91b74c664d1669d546504cd30f16d364725c
-  data.tar.gz: 1d076d96e1972ceb5d9de355ef1e88e6ea3e68961a911a5a2b691570a337fd8ac3d1cf7fe1d6b4b3c7bacf92ab8741becfb6cbfe4ccb223d363a037d5f219c28
+  metadata.gz: 1e1f43c9ad3a996c71b1c75478344b03d9c751fa0ba1db590f6d79f5ba32db18f7f25a52db23f48173418b69730cba46cc20dcde6a2cc843bec017b3be680a87
+  data.tar.gz: 928a9f2eb6523d26497ae6ac630f0bd070bd73ffea31876c7bee70bfe061216f08c8eb7d30c4d083c2adeaaf41b773a2a59249565ac230a17b56c05ffdcd727a

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.3.1 (2019-09-30)
+* Bugfix `serviceaccount` command.
+
 ## 4.3.0 (2019-09-30)
 * Add `serviceaccount` command.
 * Add `user privileges` command.

data/README.md

@@ -31,7 +31,7 @@ Usage:
 
 Commands:
   alert              view and manage alerts
-  apitoken           view and manage API tokens
+  apitoken           view and your own API tokens
   cloudintegration   view and manage cloud integrations
   config             create and manage local configuration
   dashboard          view and manage dashboards
@@ -45,6 +45,7 @@ Commands:
   proxy              view and manage proxies
   query              run Wavefront queries
   savedsearch        view and manage saved searches
+  serviceaccount     view and manage service accounts
   settings           view and manage system preferences
   source             view and manage source tags and descriptions
   user               view and manage Wavefront users

data/lib/wavefront-cli/commands/serviceaccount.rb

@@ -20,17 +20,17 @@ class WavefrontCommandServiceaccount < WavefrontCommandBase
   def _commands
     ["list #{CMN} [-l] [-O fields]",
      "describe #{CMN} <id>",
-     "create #{CMN} [-I] [-d description] [-m permission...] [-g group...] " \
+     "create #{CMN} [-I] [-d description] [-p permission...] [-g group...] " \
      '[-k usertoken...] <id>',
      "activate #{CMN} <id>",
      "deactivate #{CMN} <id>",
      "dump #{CMN}",
      "groups #{CMN} <id>",
-     "privileges #{CMN} <id>",
+     "permissions #{CMN} <id>",
      "join #{CMN} <id> <group>...",
      "leave #{CMN} <id> <group>...",
-     "grant #{CMN} <privilege> to <id>",
-     "revoke #{CMN} <privilege> from <id>",
+     "grant #{CMN} <permission> to <id>",
+     "revoke #{CMN} <permission> from <id>",
      "set #{CMN} <key=value> <id>",
      "import #{CMN} [-u] <file>",
      "apitoken list #{CMN} [-O fields] <id>",
@@ -50,7 +50,7 @@ class WavefrontCommandServiceaccount < WavefrontCommandBase
      "-u, --update             update an existing #{thing}",
      "-I, --inactive           create an inactive #{thing}",
      "-d, --desc=STRING        description of #{thing}",
-     "-m, --permission=STRING  give #{thing} this permission",
+     "-p, --permission=STRING  give #{thing} this permission",
      "-g, --group=STRING       add #{thing} to this user group",
      '-N, --name=STRING        name of token',
      '-k, --usertoken=STRING   API token']

data/lib/wavefront-cli/controller.rb

@@ -168,6 +168,8 @@ class WavefrontCliController
     abort "Cannot find user group '#{e.message}'."
   rescue Wavefront::Exception::UnsupportedWriter => e
     abort "Unsupported writer '#{e.message}'."
+  rescue WavefrontCli::Exception::UserError => e
+    abort "User error: #{e.message}."
   rescue WavefrontCli::Exception::ImpossibleSearch
     abort 'Search on non-existent key. Please use a top-level field.'
   rescue StandardError => e

data/lib/wavefront-cli/display/serviceaccount.rb

@@ -12,7 +12,11 @@ module WavefrontDisplay
     end
 
     def do_list_brief
-      multicolumn(:identifier, :description)
+      if data.empty?
+        puts 'You have no service accounts.'
+      else
+        multicolumn(:identifier, :description)
+      end
     end
 
     def do_activate
@@ -34,27 +38,42 @@ module WavefrontDisplay
     alias do_join do_groups
     alias do_leave do_groups
 
-    def do_privileges
+    def do_permissions
       if data[:groups].empty?
-        puts 'Account does not have any Wavefront privileges.'
+        puts 'Account does not have any Wavefront permissions.'
       else
         puts data[:groups]
       end
     end
 
-    alias do_grant do_privileges
-    alias do_revoke do_privileges
+    def do_grant
+      puts format("Granted '%<perm>s' to '%<account>s'.",
+                  perm: options[:'<permission>'], account: options[:'<id>'])
+    end
+
+    def do_revoke
+      puts format("Revoked '%<perm>s' from '%<account>s'.",
+                  perm: options[:'<permission>'], account: options[:'<id>'])
+    end
 
     def do_apitoken_list
       if data.empty?
-        puts 'Account does not have any tokens.'
+        puts 'Account does not have any API tokens.'
       else
         multicolumn(:tokenID, :tokenName)
       end
     end
 
+    def do_apitoken_delete
+      puts format("Deleted API token '#{options[:'<token_id>']}'.")
+    end
+
     def search_identifier_key
       :identifier
     end
+
+    def priority_keys
+      %i[identifier]
+    end
   end
 end

data/lib/wavefront-cli/exception.rb

@@ -27,5 +27,6 @@ module WavefrontCli
     class UnsupportedOperation < RuntimeError; end
     class UnsupportedOutput < RuntimeError; end
     class UserGroupNotFound < RuntimeError; end
+    class UserError < RuntimeError; end
   end
 end

data/lib/wavefront-cli/serviceaccount.rb

@@ -23,7 +23,7 @@ module WavefrontCli
     end
 
     alias do_groups do_describe
-    alias do_privileges do_describe
+    alias do_permissions do_describe
 
     def do_create
       wf_user_id?(options[:'<id>'])
@@ -56,36 +56,36 @@ module WavefrontCli
 
     def do_grant
       cannot_noop!
-      wf_permission?(options[:'<privilege>'])
+      wf_permission?(options[:'<permission>'])
 
-      body = add_priv_to_list(current_state, options[:'<privilege>'])
+      body = add_perm_to_list(current_state, options[:'<permission>'])
       wf.update(options[:'<id>'], body)
     end
 
     def do_revoke
       cannot_noop!
-      wf_permission?(options[:'<privilege>'])
+      wf_permission?(options[:'<permission>'])
 
-      body = remove_priv_from_list(current_state, options[:'<privilege>'])
+      body = remove_perm_from_list(current_state, options[:'<permission>'])
       wf.update(options[:'<id>'], body)
     end
 
     def do_apitoken_list
-      wf_apitoken.list(options[:'<id>'])
+      wf_apitoken.sa_list(options[:'<id>'])
     end
 
     def do_apitoken_create
-      wf_apitoken.create(options[:'<id>'], options[:name])
+      wf_apitoken.sa_create(options[:'<id>'], options[:name])
     end
 
     def do_apitoken_delete
-      wf_apitoken.delete(options[:'<id>'], options[:'<token_id>'])
+      wf_apitoken.sa_delete(options[:'<id>'], options[:'<token_id>'])
     end
 
     def do_apitoken_rename
-      wf_apitoken.rename(options[:'<id>'],
-                         options[:'<token_id>'],
-                         options[:'<name>'])
+      wf_apitoken.sa_rename(options[:'<id>'],
+                            options[:'<token_id>'],
+                            options[:'<name>'])
     end
 
     def extra_validation
@@ -101,27 +101,36 @@ module WavefrontCli
     private
 
     def current_state
-      wf.describe(options[:'<id>']).response
+      resp = wf.describe(options[:'<id>'])
+
+      return resp.response if resp.ok?
+
+      if resp.status.code == 404
+        raise WavefrontCli::Exception::UserError,
+              "Cannot find service account '#{options[:'<id>']}'"
+      end
+
+      raise resp.status.message
     end
 
-    def add_priv_to_list(state, priv)
-      if state[:groups].include?(priv)
-        ok_exit(format("'%<account>s' already has the '%<priv>s' privilege.",
+    def add_perm_to_list(state, perm)
+      if state[:groups].include?(perm)
+        ok_exit(format("'%<account>s' already has the '%<perm>s' permission.",
                        account: options[:'<id>'],
-                       priv: priv))
+                       perm: perm))
       end
 
-      { groups: state[:groups].push(priv), userGroups: user_group_ids(state) }
+      { groups: state[:groups].push(perm), userGroups: user_group_ids(state) }
     end
 
-    def remove_priv_from_list(state, priv)
-      unless state[:groups].include?(priv)
-        ok_exit(format("'%<account>s' does not have the '%<priv>s' privilege.",
+    def remove_perm_from_list(state, perm)
+      unless state[:groups].include?(perm)
+        ok_exit(format("'%<account>s' does not have the '%<perm>s' permission.",
                        account: options[:'<id>'],
-                       priv: priv))
+                       perm: perm))
       end
 
-      { groups: state[:groups].reject { |g| g == options[:'<privilege>'] },
+      { groups: state[:groups].reject { |g| g == options[:'<permission>'] },
         userGroups: user_group_ids(state) }
     end
 

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '4.3.0'
+WF_CLI_VERSION = '4.3.1'

data/spec/wavefront-cli/serviceaccount_spec.rb

@@ -41,20 +41,20 @@ class ServiceAccountEndToEndTest < EndToEndTest
     assert_abort_on_missing_creds("groups #{id}")
   end
 
-  def test_privileges
+  def test_permissions
     quietly do
-      assert_cmd_gets("privileges #{id}", "/api/v2/#{api_path}/#{id}")
+      assert_cmd_gets("permissions #{id}", "/api/v2/#{api_path}/#{id}")
     end
 
-    assert_invalid_id("privileges #{invalid_id}")
-    assert_usage('privileges')
+    assert_invalid_id("permissions #{invalid_id}")
+    assert_usage('permissions')
 
     assert_noop(
-      "privileges #{id}",
+      "permissions #{id}",
       "uri: GET https://default.wavefront.com/api/v2/#{api_path}/#{id}"
     )
 
-    assert_abort_on_missing_creds("privileges #{id}")
+    assert_abort_on_missing_creds("permissions #{id}")
   end
 
   def test_activate
@@ -143,7 +143,7 @@ class ServiceAccountEndToEndTest < EndToEndTest
 
   def test_create_account_with_permissions
     quietly do
-      assert_cmd_posts("create -m #{permissions[0]} -m #{permissions[1]} #{id}",
+      assert_cmd_posts("create -p #{permissions[0]} -p #{permissions[1]} #{id}",
                        '/api/v2/account/serviceaccount',
                        identifier: id,
                        active: true,
@@ -160,7 +160,7 @@ class ServiceAccountEndToEndTest < EndToEndTest
 
   def test_create_invalid_permission
     assert_exits_with('Unable to run command. Invalid permission.',
-                      "create -m 123456 #{id}")
+                      "create -p 123456 #{id}")
   end
 
   def test_create_invalid_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Robert Fisher