bolt 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8356c3c6f44472186a0239d157a58c84f9cbb80ce9d37ee5e41287383e3c967
-  data.tar.gz: 348ee76cf7498279bdedd126ecd538f2186518f904eb65e74747b9d5c560eada
+  metadata.gz: ba000a9935f93ebac58dc466b10dc06da8ca5468c9d2d531d2b1067154dd90f1
+  data.tar.gz: 202b98a6d9f6d50dc6864f519a711c4e66a24dab5e16130231164b4c127ea82a
 SHA512:
-  metadata.gz: 1789b9c294a1968c391d68edf3bfc8a1f3f9647ec3331ec3c192b721886c3406b6bd91ff1fd932315efa189c395106bf650e55c0975b3a3cde1c3db0c645147b
-  data.tar.gz: 6e5c7b4a944725d382b8aec9a2b7c003a58a8328c7a093276fe281d01563a3ee011ee4e2035b1530bab7a1b5d566f87f45659ee5d7c4cad5cf2a70356e6f3384
+  metadata.gz: e76933cea7a2b3fd3ee860dd21a938b860892559578c2b494647da0c24308102d81c592c230ee22e676ab5b843db77e38b349b41dff5cfb75bbe7c498ee1e023
+  data.tar.gz: df316bb99de15abb03b2d885f6a46e2a45e8649baea5745f8c9efc7b95cc874b9322a616c0fca7020cac9fb4748ec5d5577f3415833c56ad85e766fcd9bd6bfd

data/Puppetfile

@@ -31,7 +31,7 @@ mod 'puppetlabs-ruby_plugin_helper', '0.1.0'
 
 # Plugin modules
 mod 'puppetlabs-azure_inventory', '0.3.0'
-mod 'puppetlabs-terraform', '0.4.0'
+mod 'puppetlabs-terraform', '0.5.0'
 mod 'puppetlabs-vault', '0.3.0'
 mod 'puppetlabs-aws_inventory', '0.5.0'
 mod 'puppetlabs-yaml', '0.2.0'

data/lib/bolt/plugin/puppetdb.rb

@@ -11,7 +11,7 @@ module Bolt
         end
       end
 
-      TEMPLATE_OPTS = %w[uri name config].freeze
+      TEMPLATE_OPTS = %w[alias config facts features name uri vars].freeze
       PLUGIN_OPTS = %w[_plugin query target_mapping].freeze
 
       def initialize(pdb_client)
@@ -83,10 +83,14 @@ module Bolt
       def resolve_facts(config, certname, target_data)
         Bolt::Util.walk_vals(config) do |value|
           if value.is_a?(String)
-            data = target_data&.detect { |d| d['path'] == fact_path(value) }
-            warn_missing_fact(certname, value) if data.nil?
-            # If there's no fact data this will be nil
-            data&.fetch('value', nil)
+            if value == 'certname'
+              certname
+            else
+              data = target_data&.detect { |d| d['path'] == fact_path(value) }
+              warn_missing_fact(certname, value) if data.nil?
+              # If there's no fact data this will be nil
+              data&.fetch('value', nil)
+            end
           elsif value.is_a?(Array) || value.is_a?(Hash)
             value
           else

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/lib/bolt_server/transport_app.rb

@@ -57,12 +57,19 @@ module BoltServer
     end
 
     def scrub_stack_trace(result)
-      if result.dig(:result, '_error', 'details', 'stack_trace')
-        result[:result]['_error']['details'].reject! { |k| k == 'stack_trace' }
+      if result.dig(:value, '_error', 'details', 'stack_trace')
+        result[:value]['_error']['details'].reject! { |k| k == 'stack_trace' }
       end
       result
     end
 
+    def error_result(error)
+      {
+        'status' => 'failure',
+        'value' => { '_error' => error.to_h }
+      }
+    end
+
     def validate_schema(schema, body)
       schema_error = JSON::Validator.fully_validate(schema, body)
       if schema_error.any?
@@ -280,7 +287,7 @@ module BoltServer
       body = JSON.parse(request.body.read)
 
       error = validate_schema(@schemas["transport-ssh"], body)
-      return [400, error.to_json] unless error.nil?
+      return [400, error_result(error).to_json] unless error.nil?
 
       targets = (body['targets'] || [body['target']]).map do |target|
         make_ssh_target(target)
@@ -320,7 +327,7 @@ module BoltServer
       body = JSON.parse(request.body.read)
 
       error = validate_schema(@schemas["transport-winrm"], body)
-      return [400, error.to_json] unless error.nil?
+      return [400, error_result(error).to_json] unless error.nil?
 
       targets = (body['targets'] || [body['target']]).map do |target|
         make_winrm_target(target)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable