orchestrator_client 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544692bcfb8a25aa745a2b8b6d04bb3dfc5d9aea
-  data.tar.gz: 3d478262f860e470b6a759fb898b1f049bb268c8
+  metadata.gz: edb40acfb0113456ba1b3999c6f9e093d0999501
+  data.tar.gz: 39980ed67308f0dd7c3ae9daf7f9636e78c4d22b
 SHA512:
-  metadata.gz: 0b9ebba6fd6d909f0c85e7ee3b18b74a32cf338f3fc493732024accc045c56d21cc0aac648ad51adaf14d3de7ee0023d851525cff4f42da9ef5a333a871f848b
-  data.tar.gz: 2b2e156ad03c89a559c34df15be723bb0e0d69021ed0721737fbfce857524d3ddc6ce22d2d0f29a616adcee85614d5416bc0ea86b6b87aa8e7bbde2498ce7060
+  metadata.gz: 63087f62bdcfedbb2e49d3e6579d5f047fff242fbd1d8291b84e6efcfe398b3f7e82b72ccd05bac3f423c832dce0b99cbf040954b82b9f97d2d6d65665c1d95c
+  data.tar.gz: 784cf2dd3a28b00cd09b790e0b7a0ee9c70a433c98fc213c4647a706ccba09295b83ba767b4f74dac676cabefb2b6cb51081377987acfe0572547ea726722e87

data/README.md

@@ -26,6 +26,8 @@ expected to be at `~/.puppetlabs/token` which is the default location used by
 * `token-file`- Path to a file with the RBAC token in it (defaults to `~/.puppetlabs/token`)
 * `token` - Pass directly the RBAC token, if specified the token will be used instead of a token from file.
 * `User-Agent`- Set `User-Agent` header for HTTP requests. Defaults to `OrchestratorRubyClient/[VERSION]`
+* `job-poll-interval`- Set the default amount of time to sleep when polling in Orchestrator::Job#wait and #each\_event
+* `job-poll-timeout`- Set the default maximum amount of time to wait in Orchestrator::Job#wait
 
 ### Example
 

data/lib/orchestrator_client.rb

@@ -2,6 +2,8 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'openssl'
+require 'faraday'
+require 'net/http/persistent'
 
 class OrchestratorClient
   require 'orchestrator_client/error'
@@ -11,35 +13,31 @@ class OrchestratorClient
   require 'orchestrator_client/config'
 
   attr_accessor :config
+  attr_reader :http
 
   def initialize(overrides, load_files=false)
     @config = Config.new(overrides, load_files)
     @config.validate
+    @http = create_http(config.root_url)
   end
 
-  def make_uri(path)
-    URI.parse("#{config.root_url}#{path}")
-  end
-
-  def create_http(uri)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.ssl_version = :TLSv1_2
-    http.ca_file = config['cacert']
-    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    http
+  def create_http(root_url)
+    Faraday.new(url: root_url) do |f|
+      f.headers['Content-Type'] = 'application/json'
+      f.headers['X-Authentication'] = config.token
+      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
+      end
+    end
   end
 
   def get(location)
-    uri = make_uri(location)
-    https = create_http(uri)
-    req = Net::HTTP::Get.new(uri)
-    req['Content-Type'] = "application/json"
-    req['User-Agent'] = @config['User-Agent']
-    req.add_field('X-Authentication', @config.token)
-    res = https.request(req)
+    res = http.get(location)
 
-    if res.code != "200"
+    if res.status != 200
       raise OrchestratorClient::ApiError.make_error_from_response(res)
     end
 
@@ -47,17 +45,9 @@ class OrchestratorClient
   end
 
   def post(location, body)
-    uri = make_uri(location)
-    https = create_http(uri)
-
-    req = Net::HTTP::Post.new(uri)
-    req['Content-Type'] = "application/json"
-    req['User-Agent'] = @config['User-Agent']
-    req.add_field('X-Authentication', @config.token)
-    req.body = body.to_json
-    res = https.request(req)
+    res = http.post(location, body.to_json)
 
-    unless Set.new(["202", "200"]).include? res.code
+    unless Set.new([202, 200]).include? res.status
       raise OrchestratorClient::ApiError.make_error_from_response(res)
     end
 

data/lib/orchestrator_client/config.rb

@@ -35,7 +35,9 @@ class OrchestratorClient::Config
   def defaults
     { 'cacert' => cacert,
       'token-file' => File.join(user_root, 'token'),
-      'User-Agent' => "OrchestratorRubyClient/#{OrchestratorClient::VERSION}"
+      'User-Agent' => "OrchestratorRubyClient/#{OrchestratorClient::VERSION}",
+      'job-poll-interval' => 1,
+      'job-poll-timeout' => 1000,
     }
   end
 
@@ -75,7 +77,16 @@ class OrchestratorClient::Config
   end
 
   def load_token
-    @config['token'] || File.open(config['token-file']) { |f| f.read.strip }
+    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")
+      end
+      @config['token'] = token
+      @config['token']
+    end
   end
 
   def token

data/lib/orchestrator_client/error.rb

@@ -17,7 +17,7 @@ class OrchestratorClient::ApiError < RuntimeError
     rescue
       return OrchestratorClient::BadResponse.new("Response body was not valid JSON: #{res.body}")
     end
-    code = res.code
+    code = res.status
 
     case data['kind']
     when 'puppetlabs.validators/validation-error'

data/lib/orchestrator_client/job.rb

@@ -16,6 +16,8 @@ class OrchestratorClient::Job
 
   def initialize(client, options = {}, type=:deploy)
     @client = client
+    @poll_interval = options.delete(:_poll_interval) || client.config['job-poll-interval']
+    @poll_timeout = options.delete(:_poll_timeout) || client.config['job-poll-timeout']
     @options = options
     @type = type
   end
@@ -71,7 +73,7 @@ class OrchestratorClient::Job
       events = @client.jobs.events(@job_name)
       start = events['next-events']['event']
       if events['items'].empty?
-        sleep 1
+        sleep @poll_interval
       else
         events['items'].each do |event|
           finished = true if DONE_EVENTS.include?(event['type'])
@@ -81,15 +83,15 @@ class OrchestratorClient::Job
     end
   end
 
-  def wait(timeout=1000)
+  def wait(timeout=@poll_timeout)
     counter = 0
     while counter < timeout
       get_details
       if DONE_STATES.include?(details['state'])
         return report
       end
-      sleep 1
-      counter += 1
+      sleep @poll_interval
+      counter += @poll_interval
     end
   end
 end

data/lib/orchestrator_client/version.rb

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

data/orchestrator_client.gemspec

@@ -14,4 +14,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/puppetlabs/orchestrator_client-ruby'
   s.license       = "Apache-2.0"
   s.require_paths = ["lib"]
+
+  s.add_dependency 'faraday'
+  s.add_dependency 'net-http-persistent'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: orchestrator_client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
-dependencies: []
+date: 2019-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: info@puppetlabs.com
 executables: []