wavefront-cli 4.2.1 → 4.3.0

data/lib/wavefront-cli/output/yaml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontOutput

data/lib/wavefront-cli/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli
@@ -14,16 +16,26 @@ module WavefrontCli
       wf.rename(options[:'<id>'], options[:'<name>'])
     end
 
+    def do_delete
+      smart_delete
+    end
+
     def do_versions
-      raw = wf.list(0, :all).response.items.map do |i|
+      raw = wf.list(0, :all)
+      exit if options[:noop]
+
+      version_info(raw).sort_by { |p| Gem::Version.new(p[:version]) }.reverse
+    end
+
+    def version_info(raw)
+      raw.response.items.map do |i|
         { id: i.id, version: i.version, name: i.name }
       end
-
-      raw.sort_by { |p| Gem::Version.new(p[:version]) }.reverse
     end
 
     def extra_validation
       return unless options[:'<name>']
+
       begin
         wf_string?(options[:'<name>'])
       rescue Wavefront::Exception::InvalidString

data/lib/wavefront-cli/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wavefront-sdk/support/mixins'
 require_relative 'base'
 
@@ -31,7 +33,7 @@ module WavefrontCli
     end
 
     def do_run
-      alias_key = format('q_%s', options[:'<alias>']).to_sym
+      alias_key = format('q_%<alias>s', alias: options[:'<alias>']).to_sym
       query = all_aliases.fetch(alias_key, nil)
 
       unless query
@@ -51,17 +53,16 @@ module WavefrontCli
     #
     # rubocop:disable Metrics/AbcSize
     def q_opts
-      ret = { autoEvents:             options[:events],
-              i:                      options[:inclusive],
-              summarization:          options[:summarize] || 'mean',
-              listMode:               true,
-              strict:                 true,
-              includeObsoleteMetrics: options[:obsolete],
-              sorted:                 true }
-
-      ret[:n] = options[:name] if options[:name]
-      ret[:p] = options[:points] if options[:points]
-      ret
+      { autoEvents: options[:events],
+        i: options[:inclusive],
+        summarization: options[:summarize] || 'mean',
+        listMode: true,
+        strict: true,
+        includeObsoleteMetrics: options[:obsolete],
+        sorted: true }.tap do |o|
+          o[:n] = options[:name] if options[:name]
+          o[:p] = options[:points] if options[:points]
+        end
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -103,6 +104,7 @@ module WavefrontCli
 
     def extra_validation
       return unless options[:granularity]
+
       begin
         wf_granularity?(options[:granularity])
       rescue Wavefront::Exception::InvalidGranularity

data/lib/wavefront-cli/savedsearch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli

data/lib/wavefront-cli/serviceaccount.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+require 'wavefront-sdk/apitoken'
+
+module WavefrontCli
+  #
+  # CLI coverage for the v2 'serviceaccount' API.
+  #
+  class ServiceAccount < WavefrontCli::Base
+    attr_reader :wf_apitoken
+
+    def post_initialize(_options)
+      @wf_apitoken = Wavefront::ApiToken.new(mk_creds, mk_opts)
+    end
+
+    def do_list
+      wf.list
+    end
+
+    def do_describe
+      wf.describe(options[:'<id>'])
+    end
+
+    alias do_groups do_describe
+    alias do_privileges do_describe
+
+    def do_create
+      wf_user_id?(options[:'<id>'])
+      wf.create(user_body)
+    end
+
+    def do_activate
+      wf.activate(options[:'<id>'])
+    end
+
+    def do_deactivate
+      wf.deactivate(options[:'<id>'])
+    end
+
+    def do_join
+      cannot_noop!
+      options[:'<group>'].each { |g| wf_usergroup_id?(g) }
+
+      body = add_groups_to_list(current_state, options[:'<group>'])
+      wf.update(options[:'<id>'], body)
+    end
+
+    def do_leave
+      cannot_noop!
+      options[:'<group>'].each { |g| wf_usergroup_id?(g) }
+
+      body = remove_groups_from_list(current_state, options[:'<group>'])
+      wf.update(options[:'<id>'], body)
+    end
+
+    def do_grant
+      cannot_noop!
+      wf_permission?(options[:'<privilege>'])
+
+      body = add_priv_to_list(current_state, options[:'<privilege>'])
+      wf.update(options[:'<id>'], body)
+    end
+
+    def do_revoke
+      cannot_noop!
+      wf_permission?(options[:'<privilege>'])
+
+      body = remove_priv_from_list(current_state, options[:'<privilege>'])
+      wf.update(options[:'<id>'], body)
+    end
+
+    def do_apitoken_list
+      wf_apitoken.list(options[:'<id>'])
+    end
+
+    def do_apitoken_create
+      wf_apitoken.create(options[:'<id>'], options[:name])
+    end
+
+    def do_apitoken_delete
+      wf_apitoken.delete(options[:'<id>'], options[:'<token_id>'])
+    end
+
+    def do_apitoken_rename
+      wf_apitoken.rename(options[:'<id>'],
+                         options[:'<token_id>'],
+                         options[:'<name>'])
+    end
+
+    def extra_validation
+      validate_groups
+      validate_tokens
+      validate_perms
+    end
+
+    def validator_exception
+      Wavefront::Exception::InvalidServiceAccountId
+    end
+
+    private
+
+    def current_state
+      wf.describe(options[:'<id>']).response
+    end
+
+    def add_priv_to_list(state, priv)
+      if state[:groups].include?(priv)
+        ok_exit(format("'%<account>s' already has the '%<priv>s' privilege.",
+                       account: options[:'<id>'],
+                       priv: priv))
+      end
+
+      { groups: state[:groups].push(priv), 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.",
+                       account: options[:'<id>'],
+                       priv: priv))
+      end
+
+      { groups: state[:groups].reject { |g| g == options[:'<privilege>'] },
+        userGroups: user_group_ids(state) }
+    end
+
+    def add_groups_to_list(state, groups)
+      { userGroups: (user_group_ids(state) + groups).uniq }
+    end
+
+    def remove_groups_from_list(state, groups)
+      { userGroups: (user_group_ids(state) - groups) }
+    end
+
+    # The API gives us an array of group objects, but expects back an array
+    # only of their IDs
+    #
+    def user_group_ids(state)
+      state[:userGroups].map { |g| g[:id] }
+    end
+
+    def active_account?
+      !options[:inactive]
+    end
+
+    def user_body
+      { identifier: options[:'<id>'],
+        active: active_account?,
+        groups: options[:permission],
+        tokens: options[:usertoken],
+        userGroups: options[:group] }.tap do |b|
+          b[:description] = options[:desc] if options[:desc]
+        end
+    end
+
+    def item_dump_call
+      wf.list.response
+    end
+
+    def validate_groups
+      options[:group].each { |g| wf_usergroup_id?(g) }
+    rescue Wavefront::Exception::InvalidUserGroupId => e
+      raise e, 'Invalid usergroup ID'
+    end
+
+    def validate_tokens
+      options[:usertoken].each { |t| wf_apitoken_id?(t) }
+    rescue Wavefront::Exception::InvalidApiTokenId => e
+      raise e, 'Invalid API token'
+    end
+
+    def validate_perms
+      options[:permission].each { |p| wf_permission?(p) }
+    rescue Wavefront::Exception::InvalidPermission => e
+      raise e, 'Invalid permission'
+    end
+  end
+end

data/lib/wavefront-cli/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli

data/lib/wavefront-cli/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 require_relative 'command_mixins/tag'
 

data/lib/wavefront-cli/stdlib/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Extensions to stdlib's Array
 #
 class Array
@@ -6,6 +8,7 @@ class Array
   #
   def max_length
     return 0 if empty?
+
     map(&:to_s).map(&:length).max
   end
 

data/lib/wavefront-cli/stdlib/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Extensions to the String class to help with formatting.
 #
 class String
@@ -32,26 +34,23 @@ class String
   # @param prefix [String] prepended to every line
   # @return [String] the folded line
   #
-  # rubocop:disable Metrics/AbcSize
   def fold(twidth = TW, indent = 10, prefix = '')
     chunks = gsub(/default: /, 'default:^').scan_line(twidth - 8)
-    first_line = format("%s%s\n", prefix, chunks.shift)
+    first_line = format("%<padding>s%<text>s\n",
+                        padding: prefix,
+                        text: chunks.shift)
 
     return first_line.restored if chunks.empty?
 
-    rest = chunks.join(' ').scan_line(twidth - indent - 5).map do |l|
-      prefix + ' ' * indent + l
-    end
-
-    (first_line + rest.join("\n") + "\n").restored
+    rest = indent_folded_lines(chunks, twidth, indent, prefix)
+    (first_line + rest.join("\n")).restored
   end
-  # rubocop:enable Metrics/AbcSize
 
   # We use a carat as a temporary whitespace character to avoid
   # undesirable line breaking. This puts it back
   #
   def restored
-    tr('^', ' ')
+    tr('^', ' ').chomp("\n")
   end
 
   # Fold long value lines in two-column output. The returned string
@@ -95,8 +94,15 @@ class String
   #
   def to_snake
     gsub(/(.)([A-Z])/) do
-      Regexp.last_match[1] + '_' +
-        Regexp.last_match[2].downcase
+      Regexp.last_match[1] + '_' + Regexp.last_match[2].downcase
+    end
+  end
+
+  private
+
+  def indent_folded_lines(chunks, twidth, indent, prefix)
+    chunks.join(' ').scan_line(twidth - indent - 5).map do |line|
+      prefix + ' ' * indent + line
     end
   end
 end

data/lib/wavefront-cli/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli
@@ -19,6 +21,7 @@ module WavefrontCli
     end
 
     alias do_groups do_describe
+    alias do_privileges do_describe
 
     def do_join
       wf.add_groups_to_user(options[:'<id>'], options[:'<group>'])
@@ -43,8 +46,7 @@ module WavefrontCli
 
     def import_to_create(raw)
       { emailAddress: raw['items']['identifier'],
-        groups:       raw['items']['groups'] }.tap do |r|
-
+        groups: raw['items']['groups'] }.tap do |r|
         if raw['items'].key?('userGroups')
           r['userGroups'] = raw['items']['userGroups'].map { |g| g['id'] }
         end
@@ -55,8 +57,8 @@ module WavefrontCli
     #
     def user_body
       { emailAddress: options[:'<id>'],
-        groups:       options[:permission],
-        userGroups:   options[:group] }
+        groups: options[:permission],
+        userGroups: options[:group] }
     end
 
     # Because of the way docopt works, we have to call the user ID
@@ -73,5 +75,9 @@ module WavefrontCli
     rescue Wavefront::Exception::InvalidUserId
       abort failed_validation_message(user)
     end
+
+    def item_dump_call
+      wf.list.response.items
+    end
   end
 end

data/lib/wavefront-cli/usergroup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli
@@ -13,7 +15,7 @@ module WavefrontCli
     alias do_permissions do_describe
 
     def do_create
-      wf.create(name:        options[:'<name>'],
+      wf.create(name: options[:'<name>'],
                 permissions: options[:permission])
     end
 
@@ -35,7 +37,7 @@ module WavefrontCli
 
     def import_to_create(raw)
       raw['emailAddress'] = raw['identifier']
-      raw.delete_if { |k, _v| k == 'customer' || k == 'identifier' }
+      raw.delete_if { |k, _v| %w[customer identifier].include?(k) }
     end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1,3 @@
-WF_CLI_VERSION = '4.2.1'.freeze
+# frozen_string_literal: true
+
+WF_CLI_VERSION = '4.3.0'

data/lib/wavefront-cli/webhook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'base'
 
 module WavefrontCli