bolt 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc3f29c5078b142ebcebf3b104d0b8c1deb2357c319f1de58c270062c7db68c
-  data.tar.gz: '083d0c5d89a44757eb875c92d88e4378ea1922921aad4a225f8dda2b3e1cb0d5'
+  metadata.gz: a29df5e9c84d323a9d9b739bff71705573816f077ef68848cf7deb0fba373879
+  data.tar.gz: add9bd7f64f5cc1a61b237421f9973f2d9afe52dcb2fa3f89db1adf94270a93f
 SHA512:
-  metadata.gz: f380074432d77f88c782dd725bc6f835c707de52266fb1c030a0b7490fd06af98b984d6f42bd1a02fde367d573ebf25a7fb1dfe6c5c643f613b8336444fb3f8e
-  data.tar.gz: 70b9128e64a00ee9efab71ad69937b61fcd5ed54c6ee787054942e3b3fd16060e7dd34c23ab10e50b0c02969cc7b8a47f2fc0c25a65a0911144887baf4456fc3
+  metadata.gz: 58002395a520aa67a681c85efe894f98d7fb172eaebf11ddc15719c918d7479335d16ad181873d5ad9cd15a1151eb59551752e4d6f6ecdd5bd1e15335ab7ef83
+  data.tar.gz: 92fbc2af2713bc301e476de777067bca1f9d391c6a538e40e0907a7d7adb821cd8a0b5ba0a9da666b4799a4392bd783d7abcb846993c7f51c1baf923e18a80b8

data/bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb

@@ -37,7 +37,7 @@ Puppet::Functions.create_function(:apply_prep) do
   # Returns true if the target has the puppet-agent feature defined, either from inventory or transport.
   def agent?(target, executor, inventory)
     inventory.features(target).include?('puppet-agent') ||
-      executor.transport(target.protocol).provided_features.include?('puppet-agent')
+      executor.transport(target.transport).provided_features.include?('puppet-agent') || target.remote?
   end
 
   def apply_prep(target_spec)

data/lib/bolt/applicator.rb

@@ -43,25 +43,38 @@ module Bolt
       @custom_facts_task ||= begin
         path = File.join(libexec, 'custom_facts.rb')
         file = { 'name' => 'custom_facts.rb', 'path' => path }
-        metadata = { 'supports_noop' => true, 'input_method' => 'stdin' }
+        metadata = { 'supports_noop' => true, 'input_method' => 'stdin',
+                     'implementations' => [
+                       { 'name' => 'custom_facts.rb' },
+                       { 'name' => 'custom_facts.rb', 'remote' => true }
+                     ] }
         Bolt::Task.new(name: 'apply_helpers::custom_facts', files: [file], metadata: metadata)
       end
     end
 
     def catalog_apply_task
       @catalog_apply_task ||= begin
-        path = File.join(libexec, 'apply_catalog.rb')
-        file = { 'name' => 'apply_catalog.rb', 'path' => path }
-        metadata = { 'supports_noop' => true, 'input_method' => 'stdin' }
-        Bolt::Task.new(name: 'apply_helpers::apply_catalog', files: [file], metadata: metadata)
-      end
+                                path = File.join(libexec, 'apply_catalog.rb')
+                                file = { 'name' => 'apply_catalog.rb', 'path' => path }
+                                metadata = { 'supports_noop' => true, 'input_method' => 'stdin',
+                                             'implementations' => [
+                                               { 'name' => 'apply_catalog.rb' },
+                                               { 'name' => 'apply_catalog.rb', 'remote' => true }
+                                             ] }
+                                Bolt::Task.new(name: 'apply_helpers::apply_catalog', files: [file], metadata: metadata)
+                              end
     end
 
     def query_resources_task
       @query_resources_task ||= begin
         path = File.join(libexec, 'query_resources.rb')
         file = { 'name' => 'query_resources.rb', 'path' => path }
-        metadata = { 'supports_noop' => true, 'input_method' => 'stdin' }
+        metadata = { 'supports_noop' => true, 'input_method' => 'stdin',
+                     'implementations' => [
+                       { 'name' => 'query_resources.rb' },
+                       { 'name' => 'query_resources.rb', 'remote' => true }
+                     ] }
+
         Bolt::Task.new(name: 'apply_helpers::query_resources', files: [file], metadata: metadata)
       end
     end

data/lib/bolt/version.rb

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

data/libexec/apply_catalog.rb

@@ -48,6 +48,31 @@ begin
     $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
   end
 
+  if (conn_info = args['_target'])
+    unless (type = conn_info['remote-transport'])
+      puts "Cannot execute a catalog for a remote target without knowing it's the remote-transport type."
+      exit 1
+    end
+
+    begin
+      require 'puppet/resource_api/transport'
+    rescue LoadError
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+            "gem version 1.8.0 or greater is required on the proxy target"
+      puts msg
+      exit 1
+    end
+
+    # Transport.connect will modify this hash!
+    transport_conn_info = conn_info.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+    transport = Puppet::ResourceApi::Transport.connect(type, transport_conn_info)
+    Puppet::ResourceApi::Transport.inject_device(type, transport)
+
+    Puppet[:facts_terminus] = :network_device
+    Puppet[:certname] = conn_info['uri']
+  end
+
   # Ensure custom facts are available for provider suitability tests
   facts = Puppet::Node::Facts.indirection.find(SecureRandom.uuid, environment: env)
 
@@ -57,8 +82,11 @@ begin
              Puppet::Transaction::Report.new('apply')
            end
 
-  Puppet.override(current_environment: env,
-                  loaders: Puppet::Pops::Loaders.new(env)) do
+  overrides = { current_environment: env,
+                loaders: Puppet::Pops::Loaders.new(env) }
+  overrides[:network_device] = true if args['_target']
+
+  Puppet.override(overrides) do
     catalog = Puppet::Resource::Catalog.from_data_hash(args['catalog'])
     catalog.environment = env.name.to_s
     catalog.environment_instance = env

data/libexec/custom_facts.rb

@@ -29,7 +29,33 @@ Dir.mktmpdir do |puppet_root|
     $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
   end
 
+  if (conn_info = args['_target'])
+    unless (type = conn_info['remote-transport'])
+      puts "Cannot collect facts for a remote target without knowing the remote-transport type."
+      exit 1
+    end
+
+    begin
+      require 'puppet/resource_api/transport'
+    rescue LoadError
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+            "gem version 1.8.0 or greater is required on the proxy target"
+      puts msg
+      exit 1
+    end
+
+    # Transport.connect will modify this hash!
+    transport_conn_info = conn_info.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+    transport = Puppet::ResourceApi::Transport.connect(type, transport_conn_info)
+    Puppet::ResourceApi::Transport.inject_device(type, transport)
+
+    Puppet[:facts_terminus] = :network_device
+    Puppet[:certname] = conn_info['uri']
+  end
+
   facts = Puppet::Node::Facts.indirection.find(SecureRandom.uuid, environment: env)
+
+  facts.name = facts.values['clientcert']
   puts(facts.values.to_json)
 end
 

data/libexec/query_resources.rb

@@ -36,6 +36,31 @@ Dir.mktmpdir do |puppet_root|
     $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
   end
 
+  if (conn_info = args['_target'])
+    unless (type = conn_info['remote-transport'])
+      puts "Cannot discover resources for a remote target without knowing it's the remote-transport type."
+      exit 1
+    end
+
+    begin
+      require 'puppet/resource_api/transport'
+    rescue LoadError
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+            "gem version 1.8.0 or greater is required on the proxy target"
+      puts msg
+      exit 1
+    end
+
+    # Transport.connect will modify this hash!
+    transport_conn_info = conn_info.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+    transport = Puppet::ResourceApi::Transport.connect(type, transport_conn_info)
+    Puppet::ResourceApi::Transport.inject_device(type, transport)
+
+    Puppet[:facts_terminus] = :network_device
+    Puppet[:certname] = conn_info['uri']
+  end
+
   resources = args['resources'].flat_map do |resource_desc|
     if (match = RESOURCE_INSTANCE.match(resource_desc))
       Puppet::Resource.indirection.find("#{match[1]}/#{match[2]}", environment: env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement