orchestrator_client 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb40acfb0113456ba1b3999c6f9e093d0999501
-  data.tar.gz: 39980ed67308f0dd7c3ae9daf7f9636e78c4d22b
+  metadata.gz: 1655b1aa31a89732df80a7f25e81539f1573e19f
+  data.tar.gz: e543181e950953e5c4a23b1b41ff7ff0086c4c82
 SHA512:
-  metadata.gz: 63087f62bdcfedbb2e49d3e6579d5f047fff242fbd1d8291b84e6efcfe398b3f7e82b72ccd05bac3f423c832dce0b99cbf040954b82b9f97d2d6d65665c1d95c
-  data.tar.gz: 784cf2dd3a28b00cd09b790e0b7a0ee9c70a433c98fc213c4647a706ccba09295b83ba767b4f74dac676cabefb2b6cb51081377987acfe0572547ea726722e87
+  metadata.gz: d0bf2e0130058d42004f2da6ec971f1cb19882d08a7e519d21862b35234ed8ed6118c5c29d04b42c891f445b96c9d324a1242b8702cfff794260c4fdd3f3f1c5
+  data.tar.gz: 717521ef116e26505e8e5aef2410ae7de8474e7290f87f482782a572a143a5bdbfe26396d5930b6b354bc17d6c9bdece5a5d31c0cd1e12c0420592e13491c3ff

data/lib/orchestrator_client.rb

@@ -3,7 +3,6 @@ require 'uri'
 require 'json'
 require 'openssl'
 require 'faraday'
-require 'net/http/persistent'
 
 class OrchestratorClient
   require 'orchestrator_client/error'
@@ -28,8 +27,13 @@ class OrchestratorClient
       f.headers['User-Agent'] = config['User-Agent']
       f.ssl['ca_file'] = config['cacert']
       f.ssl['version'] = :TLSv1_2
-      f.adapter :net_http_persistent, pool_size: 5 do |http|
-        http.idle_timeout = 30
+      # Do not use net-http-persistent on windows
+      if !!File::ALT_SEPARATOR
+        f.adapter :net_http
+      else
+        f.adapter :net_http_persistent, pool_size: 5 do |http|
+          http.idle_timeout = 30
+        end
       end
     end
   end

data/lib/orchestrator_client/config.rb

@@ -63,6 +63,15 @@ class OrchestratorClient::Config
       raise OrchestratorClient::ConfigError.new("'service-url' is required in config")
     end
 
+    begin
+      service_url = URI.parse(config['service-url'])
+      unless service_url.kind_of?(URI::HTTP) || service_url.kind_of?(URI::HTTPS)
+        raise OrchestratorClient::ConfigError.new("'#{config['service-url']}' is an invalid service-url")
+      end
+    rescue URI::InvalidURIError
+      raise OrchestratorClient::ConfigError.new("'#{config['service-url']}' is an invalid service-url")
+    end
+
     if config['cacert'].nil?
       raise  OrchestratorClient::ConfigError.new("'cacert' is required in config")
     end
@@ -80,12 +89,16 @@ class OrchestratorClient::Config
     if @config['token']
       @config['token']
     else
-      token = File.open(config['token-file']) { |f| f.read.strip }
-      if token != URI.escape(token)
-        raise OrchestratorClient::ConfigError.new("'#{config['token-file']}' contains illegal characters")
+      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")
       end
-      @config['token'] = token
-      @config['token']
     end
   end
 

data/lib/orchestrator_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestrator_client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday