orchestrator_client 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae1e5ffab2eb4b54664018931e8ea680bf22d405
-  data.tar.gz: bbfc8793e9cb5f2ef057d6c240c787a753f53599
+SHA256:
+  metadata.gz: 8e686e0883d0f22984bcc8f7f10f1b1f98a9824a8439c8e66ce4cb345128a0b3
+  data.tar.gz: 73853c08047115fa0da5792043d8469df480fd5d73e659bb627e7f08e87f5ce2
 SHA512:
-  metadata.gz: 5092e14ce386236cbed58c8e6008e50bdddfd9d8edd73d3f6969c44d266d66b72551669c32d671fee47e16fd6d96abb9f098c1a886f487049e4b8913aefced97
-  data.tar.gz: 766e8b046d39d079632c94747e79b7a32d45d97dcec17a5576bd4e1b39f10064b90912ce0d7b3a7efd13d840f3eb4d3f251764e7f4b32809011f7031958e92fe
+  metadata.gz: c9cb2125237818733cdc737d2a2d427b4759fc64857af085076f80a5a3965152369ea3e38329a31eec9fe73498bf3608be1daa8251a5e63cdc253aa3ff149d5b
+  data.tar.gz: 73546958e6d55201504a8ba6aef5ad15aae51cc40c6b9fafc519c45ea0c09dfa5e0628a9003e6ef68cc3876341409e71c15eefe240795ad5aab33b5360b2810c

data/CODEOWNERS

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

data/Gemfile

@@ -9,4 +9,6 @@ end
 
 group :development do
   gem 'pry'
+  gem 'pry-stack_explorer'
+  gem 'pry-byebug'
 end

data/README.md

@@ -5,7 +5,8 @@ A simple client for interacting with the Orchestration Services API in Puppet En
 
 ## Compatibility
 
-Currently, this client supports the "V1" endpoints shipped as part of Puppet Enterprise 2016.2.
+Currently, this client supports the "V1" endpoints shipped as part of Puppet Enterprise 2016.2 -
+2019.8.4.
 
 ## Installation
 
@@ -26,6 +27,9 @@ 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
+* `read-timeout` - The time to wait before raising a Timeout exception when making HTTP requests.
 
 ### Example
 
@@ -67,10 +71,6 @@ issues](https://github.com/puppetlabs/orchestrator_api-ruby/issues).
 If you are interested in contributing to this project, please see the
 [Contribution Guidelines](CONTRIBUTING.md)
 
-## Authors
-
-Tom Linkin <tom@puppet.com>
-
 ## License
 
 See LICENSE.

data/lib/orchestrator_client.rb

@@ -2,6 +2,7 @@ require 'net/https'
 require 'uri'
 require 'json'
 require 'openssl'
+require 'faraday'
 
 class OrchestratorClient
   require 'orchestrator_client/error'
@@ -11,35 +12,37 @@ 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
+      # 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
+          http.read_timeout = config['read-timeout'] if config['read-timeout']
+        end
+      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 +50,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
 
@@ -53,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
@@ -61,9 +68,20 @@ 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
+
+    validate_file('cacert', config['cacert'])
   end
 
   def config
@@ -75,7 +93,17 @@ class OrchestratorClient::Config
   end
 
   def load_token
-    @config['token'] || File.open(config['token-file']) { |f| f.read }
+    if @config['token']
+      @config['token']
+    else
+      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
 
   def token
@@ -95,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/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.0'.freeze
+  VERSION = '0.5.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.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
-dependencies: []
+date: 2021-01-14 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: []
@@ -17,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CODEOWNERS
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -48,8 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Simple Ruby client library for PE Orchestration Services