orchestrator_client 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1655b1aa31a89732df80a7f25e81539f1573e19f
-  data.tar.gz: e543181e950953e5c4a23b1b41ff7ff0086c4c82
+  metadata.gz: d179d85c7b1f2e913b992219e730f1fbe8af33c0
+  data.tar.gz: ca300a02de26f8669081e5a182e87177334498d7
 SHA512:
-  metadata.gz: d0bf2e0130058d42004f2da6ec971f1cb19882d08a7e519d21862b35234ed8ed6118c5c29d04b42c891f445b96c9d324a1242b8702cfff794260c4fdd3f3f1c5
-  data.tar.gz: 717521ef116e26505e8e5aef2410ae7de8474e7290f87f482782a572a143a5bdbfe26396d5930b6b354bc17d6c9bdece5a5d31c0cd1e12c0420592e13491c3ff
+  metadata.gz: 59fe35d43fac64ba909f69b253ec7cf446d63442e2857c203c5a7235fd4c53b5f15bba11f9096e9dfa7b2243cab833ba3886c1a574da10acdb21474f963e9d24
+  data.tar.gz: 05f262caf8791aab7b4883180a54bcec71c2b8bd799778e57a9262ff61115de9d6145e2c2b19e30db323880f094fa16ec614c0e668871f9098c199ade6d4b261

data/CODEOWNERS

@@ -0,0 +1,2 @@
+# Default to Bolt team
+* @puppetlabs/bolt

data/lib/orchestrator_client/config.rb

@@ -55,7 +55,12 @@ class OrchestratorClient::Config
       end
     end
 
-    config.merge(@overrides)
+    config.merge!(@overrides)
+
+    %w[token-file cacert].each do |f|
+      config[f] = File.expand_path(config[f]) if config[f]
+    end
+    config
   end
 
   def validate
@@ -75,6 +80,8 @@ class OrchestratorClient::Config
     if config['cacert'].nil?
       raise  OrchestratorClient::ConfigError.new("'cacert' is required in config")
     end
+
+    validate_file('cacert', config['cacert'])
   end
 
   def config
@@ -89,16 +96,13 @@ class OrchestratorClient::Config
     if @config['token']
       @config['token']
     else
-      begin
-        token = File.open(config['token-file']) { |f| f.read.strip }
-        if token != URI.escape(token)
-          raise OrchestratorClient::ConfigError.new("token-file '#{config['token-file']}' contains illegal characters")
-        end
-        @config['token'] = token
-        @config['token']
-      rescue Errno::ENOENT
-        raise OrchestratorClient::ConfigError.new("token-file '#{config['token-file']}' is unreadable")
+      validate_file('token-file', config['token-file'])
+      token = File.open(config['token-file']) { |f| f.read.strip }
+      if token != URI.escape(token)
+        raise OrchestratorClient::ConfigError.new("token-file '#{config['token-file']}' contains illegal characters")
       end
+      @config['token'] = token
+      @config['token']
     end
   end
 
@@ -119,4 +123,15 @@ class OrchestratorClient::Config
   def [](key)
     @config[key]
   end
+
+  def validate_file(type, path)
+    stat = File.stat(path)
+    if !stat.readable?
+      OrchestratorClient::ConfigError.new("#{type} '#{path}' is unreadable")
+    elsif !stat.file?
+      OrchestratorClient::ConfigError.new("#{type} '#{path}' is not a file")
+    end
+  rescue Errno::ENOENT
+    raise OrchestratorClient::ConfigError.new("#{type} '#{path}' does not exist")
+  end
 end

data/lib/orchestrator_client/version.rb

@@ -1,3 +1,3 @@
 class OrchestratorClient
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestrator_client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CODEOWNERS
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE