wavefront-cli 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef777d9892feec5a1f016e2a1129826735181bd3ce15a6a83942743606be0e9
-  data.tar.gz: dd49d2872f08535cf2dfe5d0f3780b80cdeea956827acfd817445819de7dcb78
+  metadata.gz: 83528e35b66e2a098928edb63b4f62cf4f730153caf886e8d2132dd8ef870340
+  data.tar.gz: 9a6affc13f2b2fc1c41052abbd25dae47c2412a7bd70b39ec84ab8516ee748fa
 SHA512:
-  metadata.gz: 91ecc6b341a68759e76e5ec95f694873cd9f8b88cd1bae3a40b2a354c9dd9952550f185c43211475fe146f2ab00446c61e364cef02c4bb1921d56f1ff0c173b1
-  data.tar.gz: 881eba75e3660ae2a0550f946c0324337e410340693821f0ce581a62ef6d29ce7fbb6437d97d9ba427ba4fa27a754b61c5ef9d75369885e1be01d62bf2a47d64
+  metadata.gz: 46710487da70d0ea78ec7ba703b608b634a80d8b837b0ac91d0f4b9efad7a36ede6365060eb3f25455f56fbbdfd55b015a92f87c5c684af86e32f77ed00b038e
+  data.tar.gz: d7527a3814e9b2cc8fe1ba1f49fa294122406442e2c5c50ecdafd0f2b6a4a975a2c0c22b74fb01cb5a9379e07977b421d3a526b070714120d2ccfb64f0e59110

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.0.2 (20/06/2019)
+* Allow importing of dashboards which have a URL but not an ID.
+
 ## 4.0.1 (18/06/2019)
 * `update` subcommand has been changed to `set`. (Breaking change.)
 * `import` subcommand now accepts `--update` (`-u`) option, which

data/lib/wavefront-cli/base.rb

@@ -325,7 +325,6 @@ module WavefrontCli
     #   filetype is unknown.
     # @raise pass through any error loading or parsing the file
     #
-    # rubocop:disable Metrics/AbcSize
     def load_file(path)
       return load_from_stdin if path == '-'
 
@@ -333,15 +332,16 @@ module WavefrontCli
 
       raise WavefrontCli::Exception::FileNotFound unless file.exist?
 
-      if file.extname == '.json'
-        JSON.parse(IO.read(file))
-      elsif file.extname == '.yaml' || file.extname == '.yml'
-        YAML.safe_load(IO.read(file))
+      extname = file.extname.downcase
+
+      if extname == '.json'
+        JSON.parse(IO.read(file), symbolize_names: true)
+      elsif %w[.yaml .yml].include?(extname)
+        YAML.safe_load(IO.read(file), symbolize_names: true)
       else
         raise WavefrontCli::Exception::UnsupportedFileFormat
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     # Read STDIN and return a Ruby object, assuming that STDIN is
     # valid JSON or YAML. This is a dumb method, it does no
@@ -383,8 +383,10 @@ module WavefrontCli
       wf.describe(options[:'<id>'])
     end
 
+    # rubocop:disable Metrics/AbcSize
     def do_import
       raw = load_file(options[:'<file>'])
+      raw = preprocess_rawfile(raw) if respond_to?(:preprocess_rawfile)
 
       begin
         prepped = import_to_create(raw)
@@ -399,9 +401,10 @@ module WavefrontCli
         wf.create(prepped)
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def import_update(raw)
-      wf.update(raw['id'], raw, false)
+      wf.update(raw[:id], raw, false)
     end
 
     def do_delete

data/lib/wavefront-cli/controller.rb

@@ -10,7 +10,6 @@ if defined?(DEVELOPMENT)
 end
 
 require 'pathname'
-require 'pp'
 require 'docopt'
 require_relative 'version'
 require_relative 'constants'
@@ -34,7 +33,6 @@ class WavefrontCliController
     @usage = docopt_hash
     cmd, opts = parse_args
     @opts = parse_opts(opts)
-    pp @opts if @opts[:debug]
     cli_class_obj = load_cli_class(cmd, @opts)
     run_command(cli_class_obj)
   end
@@ -144,12 +142,20 @@ class WavefrontCliController
     abort 'Search on non-existent key. Please use a top-level field.'
   rescue StandardError => e
     warn "general error: #{e}"
-    warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+    backtrace_message(e)
     abort
   end
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize
 
+  def backtrace_message(err)
+    if opts[:debug]
+      warn "Backtrace:\n\t#{err.backtrace.join("\n\t")}"
+    else
+      puts "Re-run command with '-D' for backtrace."
+    end
+  end
+
   # @param error [WavefrontCli::Exception::CredentialError]
   #
   def handle_missing_credentials(error)

data/lib/wavefront-cli/dashboard.rb

@@ -53,5 +53,15 @@ module WavefrontCli
       wf.unfavorite(options[:'<id>'])
       do_favs
     end
+
+    # Dashboards are, AFAIK, unique in that they do NOT require an
+    # ID. They can have a URL instead: the two are equivalent. The
+    # easiest workaround for this is to copy the URL to the ID if we
+    # only have the former.
+    #
+    def preprocess_rawfile(raw)
+      raw[:id] = raw[:url] if raw.key?(:url) && !raw.key?(:id)
+      raw
+    end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '4.0.1'.freeze
+WF_CLI_VERSION = '4.0.2'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt