wavefront-sdk 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313adfc6845c757c8ce079ac7cc44a6a4a4979fe37204d3851d837af68496466
-  data.tar.gz: a797317ab7e0c00c10d6231ec3c6db552f973562cc4172b620c98bf6e47af02b
+  metadata.gz: dc630d37510f6a1606b0680c2ea50245f569ac12d2091f8551766d9f9d6021a0
+  data.tar.gz: 8c458655085f9f1fd0ff7b1e2d4a01e4b277f29e500b8ec445705cbefa91b0c8
 SHA512:
-  metadata.gz: e54e07151bf094132e03effce102428d40837605accfd03156426ecca98de7244f618f5fe191783dac6792ce8cf760f43252ea8e24b25c0d7f9b4fadced4e22f
-  data.tar.gz: 487f7dc0c1f06be5a3b743bb97f75ac8a3e6439625d9b46caba07801aa49a279ec8d8a7c0236442496fb1312279c3d6fa263478d58293a227f2c0f8f83a88049
+  metadata.gz: 1450041d4c7877bee9de16e4c8942a80b6bd190f876a69bcdeb2f99afb70171eaa10ebff1db13a6d3519f021e4d0127ba8f8b47942a7626ee80e92fe3185d10e
+  data.tar.gz: 8ae22c21bd7338badc525648d8dac78b18255e1a32fa483ac188d3d4aa39e60b20d01ae93ac05ffe39ffc992c9e5c03c3e26929afd0ab669e02e980cb7d15700

data/HISTORY.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 3.0.1
+## 3.0.2 (06/04/2019)
+* Better handling of non-existent or malformed config files.
+* Look for `~/.wavefront.conf` as well as `~/.wavefront`. Both these
+  fixes are related to findind out that other Wavefront tooling
+  creates `~/.wavefront` as a directory.
+
+## 3.0.1 (05/04/2019)
 * User IDs do not have to be e-mail addresses.
 
 ## 3.0.0 (23/03/2019)

data/lib/wavefront-sdk/core/exception.rb

@@ -8,6 +8,7 @@ module Wavefront
     class EnumerableError < RuntimeError; end
     class InvalidAlertId < RuntimeError; end
     class InvalidAlertSeverity < RuntimeError; end
+    class InvalidConfigFile < RuntimeError; end
     class InvalidCloudIntegrationId < RuntimeError; end
     class InvalidDashboardId < RuntimeError; end
     class InvalidDerivedMetricId < RuntimeError; end

data/lib/wavefront-sdk/credentials.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'inifile'
 require 'map'
+require_relative 'core/exception'
 
 module Wavefront
   # Helper methods to get Wavefront credentials.
@@ -21,6 +22,7 @@ module Wavefront
     # Wavefront. It will look in the following places:
     #
     # ~/.wavefront
+    # ~/.wavefront.conf
     # /etc/wavefront/credentials
     # WAVEFRONT_ENDPOINT and WAVEFRONT_TOKEN environment variables
     #
@@ -71,6 +73,7 @@ module Wavefront
         Array(Pathname.new(opts[:file]))
       else
         [Pathname.new('/etc/wavefront/credentials'),
+         Pathname.new(ENV['HOME']) + '.wavefront.conf',
          Pathname.new(ENV['HOME']) + '.wavefront']
       end
     end
@@ -84,7 +87,7 @@ module Wavefront
       ret = {}
 
       files.each do |f|
-        next unless f.exist?
+        next unless f.exist? && f.file?
         ret = load_profile(f, profile)
         ret[:file] = f
       end
@@ -104,6 +107,8 @@ module Wavefront
       IniFile.load(file)[profile].each_with_object({}) do |(k, v), memo|
         memo[k.to_sym] = v
       end
+    rescue StandardError
+      raise Wavefront::Exception::InvalidConfigFile, file
     end
   end
 end

data/lib/wavefront-sdk/defs/version.rb

@@ -1,4 +1,4 @@
 require 'pathname'
 
-WF_SDK_VERSION = '3.0.1'.freeze
+WF_SDK_VERSION = '3.0.2'.freeze
 WF_SDK_LOCATION = Pathname.new(__FILE__).dirname.parent.parent.parent

data/spec/wavefront-sdk/credentials_spec.rb

@@ -12,8 +12,6 @@ CONF2 = RESOURCE_DIR + 'test2.conf'
 # Test SDK base class end-to-end
 #
 class WavefrontCredentialsTest < MiniTest::Test
-  attr_reader :wf, :wf_noop, :uri_base, :headers
-
   def test_initialize_1
     ENV.delete('WAVEFRONT_ENDPOINT')
     ENV.delete('WAVEFRONT_TOKEN')
@@ -135,10 +133,11 @@ class GibletsTest < MiniTest::Test
   def test_cred_files_no_opts
     x = wf.cred_files
     assert_instance_of(Array, x)
-    assert_equal(x.length, 2)
+    assert_equal(x.length, 3)
     x.each { |p| assert_instance_of(Pathname, p) }
     assert_includes(x, Pathname.new('/etc/wavefront/credentials'))
     assert_includes(x, Pathname.new(ENV['HOME']) + '.wavefront')
+    assert_includes(x, Pathname.new(ENV['HOME']) + '.wavefront.conf')
   end
 
   def test_cred_files_opts
@@ -178,4 +177,21 @@ class GibletsTest < MiniTest::Test
     assert_equal(z[:proxy], 'wavefront.lab')
     assert_equal(z[:endpoint], 'somewhere.wavefront.com')
   end
+
+  def test_load_profile
+    assert_equal({}, wf.load_profile(CONF1, 'nosuchprofile'))
+    assert_instance_of(Hash, wf.load_profile(CONF1, 'default'))
+
+    assert_raises Wavefront::Exception::InvalidConfigFile do
+      wf.load_profile('/no/such/file')
+    end
+
+    assert_raises Wavefront::Exception::InvalidConfigFile do
+      wf.load_profile(RESOURCE_DIR)
+    end
+
+    assert_raises Wavefront::Exception::InvalidConfigFile do
+      wf.load_profile(RESOURCE_DIR + 'malformed.conf')
+    end
+  end
 end

data/spec/wavefront-sdk/resources/malformed.conf

@@ -0,0 +1 @@
+this is not a valid configuration file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -257,6 +257,7 @@ files:
 - spec/wavefront-sdk/query_spec.rb
 - spec/wavefront-sdk/report_spec.rb
 - spec/wavefront-sdk/resources/dummy_points.rb
+- spec/wavefront-sdk/resources/malformed.conf
 - spec/wavefront-sdk/resources/test.conf
 - spec/wavefront-sdk/resources/test2.conf
 - spec/wavefront-sdk/savedsearch_spec.rb
@@ -330,6 +331,7 @@ test_files:
 - spec/wavefront-sdk/query_spec.rb
 - spec/wavefront-sdk/report_spec.rb
 - spec/wavefront-sdk/resources/dummy_points.rb
+- spec/wavefront-sdk/resources/malformed.conf
 - spec/wavefront-sdk/resources/test.conf
 - spec/wavefront-sdk/resources/test2.conf
 - spec/wavefront-sdk/savedsearch_spec.rb