openbolt 5.4.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0227ddf89cab90885198c2364855b0bb3c08b5949f2f9d5a939abfacd2ae03
-  data.tar.gz: cae73bc345c59488c4359bdd0d34be3fdd4738ad6f389eb17cf3fad6432d199b
+  metadata.gz: c5d6647a2e9293dcfa5e980643d19bb67764ace9cf6832bb0928e82e15ee8f42
+  data.tar.gz: 4731f17b8df92c12cfc582b9952c0c0d19582854aeb9e8cf05193962cff5f542
 SHA512:
-  metadata.gz: 25f6e9c99f924deda4309df4a9f3d5972387055b0ce2137386944ddb7580019786fd45f0d25cbd1148c28eead53d8e47e7da646469a40349deedb3b7ad3a5d8c
-  data.tar.gz: a2c65fdc725c4782c6dc4eef5deb665f14728b046cf747ba4604c3aab3c05cd93c3478d07910461a789d5642f0ddbe064f510bcb8c76c1466646faf7ce382007
+  metadata.gz: d99ea67f58ae861d512f56573fa76c6b14d05f833843c7513697b5d7311c6ef712132a28ebf5919b0a45b51f51d9b4a1cad6261aefb7e85139b00eb2a7be24d1
+  data.tar.gz: 8ff49e9017d8a9a4870e2854a221420aaf1f1750693cd6940ad9f32041093d08a31a756d6584ef85fc26a3506208fceb829f40f6821b0424bcafba1088e68544

data/Puppetfile

@@ -6,12 +6,12 @@ moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
 mod 'puppetlabs-service', '3.1.0'
-mod 'puppet-openvox_bootstrap', '1.3.0'
+mod 'puppet-openvox_bootstrap', '1.4.0'
 mod 'puppetlabs-facts', '1.7.0'
 
 # Other core Puppet modules
-mod 'puppetlabs-inifile', '6.3.1'
-mod 'puppetlabs-apt', '11.2.0'
+mod 'puppetlabs-inifile', '6.4.0'
+mod 'puppetlabs-apt', '11.3.1'
 mod 'puppetlabs-stdlib', '9.7.0'
 mod 'puppetlabs-powershell', '6.1.0'
 mod 'puppetlabs-pwshlib', '2.0.1'
@@ -42,17 +42,16 @@ mod 'puppetlabs-bash_task_helper', '2.2.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'
-mod 'puppetlabs-azure_inventory', '0.5.0'
-mod 'puppetlabs-gcloud_inventory', '0.3.0'
-mod 'puppetlabs-http_request', '0.3.1'
+mod 'puppetlabs-azure_inventory', '0.5.1'
+mod 'puppetlabs-gcloud_inventory', '0.3.1'
+mod 'puppetlabs-http_request', '0.3.2'
 mod 'puppetlabs-pkcs7', '0.1.2'
 mod 'puppetlabs-secure_env_vars', '0.2.0'
-mod 'puppetlabs-terraform', '0.7.1'
-mod 'puppetlabs-vault', '0.4.0'
+mod 'puppetlabs-terraform', '0.7.2'
+mod 'puppetlabs-vault', '0.4.1'
 mod 'puppetlabs-yaml', '0.2.0'
 
 # If we don't list these modules explicitly, r10k will purge them
 mod 'canary', local: true
 mod 'aggregate', local: true
 mod 'puppetdb_fact', local: true
-mod 'puppet_connect', local: true

data/bolt-modules/boltlib/lib/puppet/datatypes/target.rb

@@ -11,7 +11,7 @@
 #   The target's facts. This function does not look up facts for a target and
 #   only returns the facts specified in an `inventory.yaml` file or set on a
 #   target during a plan run. To retrieve facts for a target and set them in
-#   inventory, run the [facts](writing_plans.md#collect-facts-from-targets)
+#   inventory, run the [facts](writing_plans.md#collect-facts-from-the-targets)
 #   plan or [puppetdb_fact](writing_plans.md#collect-facts-from-puppetdb)
 #   plan.
 # @param features
@@ -20,7 +20,7 @@
 #   The target's human-readable name, or its URI if a name was not given.
 # @param plugin_hooks
 #   The target's `plugin_hooks` [configuration
-#   options](bolt_inventory_reference.md#plugin-hooks-1).
+#   options](bolt_inventory_reference.md#plugin_hooks-1).
 # @param resources
 #   The target's resources. This function does not look up resources for a
 #   target and only returns resources set on a target during a plan run.

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

@@ -7,7 +7,7 @@ require 'bolt/error'
 # Using the `facts` function does not automatically collect facts for a target,
 # and will only return facts that are currently set in the inventory. To collect
 # facts from a target and set them in the inventory, run the
-# [facts](writing_plans.md#collect-facts-from-targets) plan or
+# [facts](writing_plans.md#collect-facts-from-the-targets) plan or
 # [puppetdb_fact](writing_plans.md#collect-facts-from-puppetdb) plan.
 Puppet::Functions.create_function(:facts) do
   # @param target A target.

data/lib/bolt/application.rb

@@ -148,10 +148,8 @@ module Bolt
 
     # Show available guides.
     #
-    # @param guides [Hash] A map of topics to paths to guides.
-    # @param outputter [Bolt::Outputter] An outputter instance.
-    # @return [Boolean]
-    #
+    # @return [Hash] A map of topics of guides
+    #   Currently, the map is structured as `:topics => [Array] of guide names`
     def list_guides
       { topics: load_guides.keys }
     end

data/lib/bolt/bolt_option_parser.rb

@@ -13,6 +13,11 @@ module Bolt
                 run_context: %w[concurrency inventoryfile save-rerun cleanup puppetdb],
                 global_config_setters: PROJECT_PATHS + %w[modulepath],
                 transports: %w[transport connect-timeout tty native-ssh ssh-command copy-command],
+                choria: %w[choria-config-file choria-mcollective-certname
+                           choria-ssl-ca choria-ssl-cert choria-ssl-key
+                           choria-collective choria-puppet-environment choria-rpc-timeout
+                           choria-task-timeout choria-command-timeout choria-brokers
+                           choria-broker-timeout],
                 display: %w[format color verbose trace stream],
                 global: %w[help version log-level clear-cache] }.freeze
 
@@ -168,7 +173,7 @@ module Bolt
       when 'task'
         case action
         when 'run'
-          { flags: ACTION_OPTS + %w[params tmpdir noop],
+          { flags: ACTION_OPTS + %w[params tmpdir noop choria-task-agent],
             banner: TASK_RUN_HELP }
         when 'show'
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters] + %w[filter format],
@@ -1095,6 +1100,63 @@ module Bolt
       define('--tmpdir DIR', 'The directory to upload and execute temporary files on the target.') do |tmpdir|
         @options[:tmpdir] = tmpdir
       end
+      define('--choria-task-agent AGENT', %w[bolt_tasks shell],
+             "Which Choria agent to use for task execution (bolt_tasks, shell).",
+             "Defaults to 'bolt_tasks'. Set to 'shell' for tasks not on the Puppet Server.") do |agent|
+        @options[:'task-agent'] = agent
+      end
+      define('--choria-config-file PATH',
+             'Path to a Choria/MCollective client configuration file.') do |path|
+        @options[:'config-file'] = path
+      end
+      define('--choria-mcollective-certname NAME',
+             'Override the MCollective certname for Choria client identity.',
+             'The choria-mcorpc-support library identifies non-root clients',
+             "as '<username>.mcollective', which fails when authenticating",
+             "with a certificate that has a different CN (e.g. the host's",
+             'Puppet cert). Set this to the CN of the certificate being used.') do |name|
+        @options[:'mcollective-certname'] = name
+      end
+      define('--choria-ssl-ca PATH',
+             'CA certificate path for Choria TLS authentication.') do |path|
+        @options[:'ssl-ca'] = path
+      end
+      define('--choria-ssl-cert PATH',
+             'Client certificate path for Choria TLS authentication.') do |path|
+        @options[:'ssl-cert'] = path
+      end
+      define('--choria-ssl-key PATH',
+             'Client private key path for Choria TLS authentication.') do |path|
+        @options[:'ssl-key'] = path
+      end
+      define('--choria-collective NAME',
+             'Choria collective to route messages through.') do |name|
+        @options[:collective] = name
+      end
+      define('--choria-puppet-environment ENV',
+             "Puppet environment for bolt_tasks file downloads (default: 'production').") do |env|
+        @options[:'puppet-environment'] = env
+      end
+      define('--choria-rpc-timeout SECONDS', Integer,
+             'Seconds to wait for replies to individual Choria RPC calls (default: 30).') do |timeout|
+        @options[:'rpc-timeout'] = timeout
+      end
+      define('--choria-task-timeout SECONDS', Integer,
+             'Seconds to wait for task execution to complete (default: 300).') do |timeout|
+        @options[:'task-timeout'] = timeout
+      end
+      define('--choria-command-timeout SECONDS', Integer,
+             'Seconds to wait for commands and scripts to complete (default: 60).') do |timeout|
+        @options[:'command-timeout'] = timeout
+      end
+      define('--choria-brokers BROKERS',
+             'Choria broker addresses in host or host:port format (comma-separated). Port defaults to 4222 if omitted.') do |brokers|
+        @options[:brokers] = brokers.split(',')
+      end
+      define('--choria-broker-timeout SECONDS', Integer,
+             'Seconds to wait for the TCP connection to a Choria broker (default: 30).') do |timeout|
+        @options[:'broker-timeout'] = timeout
+      end
 
       separator "\n#{self.class.colorize(:cyan, 'Module options')}"
       define('--[no-]resolve',

data/lib/bolt/cli.rb

@@ -750,7 +750,7 @@ module Bolt
     # built-in modules are installed.
     #
     private def incomplete_install?
-      builtin_module_list = %w[aggregate canary puppetdb_fact secure_env_vars puppet_connect]
+      builtin_module_list = %w[aggregate canary puppetdb_fact secure_env_vars]
       (Dir.children(Bolt::Config::Modulepath::MODULES_PATH) - builtin_module_list).empty?
     end
 

data/lib/bolt/config/options.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../../bolt/config/transport/choria'
 require_relative '../../bolt/config/transport/docker'
 require_relative '../../bolt/config/transport/jail'
 require_relative '../../bolt/config/transport/local'
@@ -15,6 +16,7 @@ module Bolt
       # Transport config classes. Used to load default transport config which
       # gets passed along to the inventory.
       TRANSPORT_CONFIG = {
+        'choria' => Bolt::Config::Transport::Choria,
         'docker' => Bolt::Config::Transport::Docker,
         'jail'   => Bolt::Config::Transport::Jail,
         'local'  => Bolt::Config::Transport::Local,
@@ -76,6 +78,12 @@ module Bolt
           _example: 120,
           _plugin: true
         },
+        "headers" => {
+          description: "A map of HTTP headers to add to PuppetDB requests.",
+          type: Hash,
+          _example: { "Authorization" => "Bearer <token>" },
+          _plugin: true
+        },
         "key" => {
           description: "The private key for the certificate.",
           type: String,
@@ -428,10 +436,10 @@ module Bolt
           _example: ["myproject", "myproject::foo", "myproject::bar", "myproject::deploy::*"]
         },
         "plugin-hooks" => {
-          description: "A map of [plugin hooks](writing_plugins.md#hooks) and which plugins a hook should use. " \
+          description: "A map of [plugin hooks](writing_plugins.md#plugin-hooks) and which plugins a hook should use. " \
                        "The only configurable plugin hook is `puppet_library`, which can use two possible plugins: " \
                        "[`openvox_bootstrap`](https://github.com/voxpupuli/puppet-openvox_bootstrap#openvox_boostrapinstall) " \
-                       "and [`task`](using_plugins.md#task).",
+                       "and [`task`](supported_plugins.md#task).",
           type: Hash,
           _plugin: true,
           _example: { "puppet_library" => { "plugin" => "openvox_bootstrap", "version" => "1.2.0",
@@ -545,6 +553,12 @@ module Bolt
           _example: "winrm",
           _default: "ssh"
         },
+        "choria" => {
+          description: "A map of configuration options for the choria transport.",
+          type: Hash,
+          _plugin: true,
+          _example: { "config-file" => "/etc/choria/client.conf" }
+        },
         "docker" => {
           description: "A map of configuration options for the docker transport.",
           type: Hash,

data/lib/bolt/config/transport/choria.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
+
+module Bolt
+  class Config
+    module Transport
+      class Choria < Base
+        OPTIONS = %w[
+          cleanup
+          collective
+          command-timeout
+          config-file
+          host
+          interpreters
+          mcollective-certname
+          broker-timeout
+          brokers
+          puppet-environment
+          rpc-timeout
+          ssl-ca
+          ssl-cert
+          ssl-key
+          task-agent
+          task-timeout
+          tmpdir
+        ].sort.freeze
+
+        DEFAULTS = {
+          'cleanup' => true,
+          'command-timeout' => 60,
+          'broker-timeout' => 30,
+          'puppet-environment' => 'production',
+          'rpc-timeout' => 30,
+          'task-timeout' => 300,
+          'tmpdir' => '/tmp'
+        }.freeze
+
+        VALID_AGENTS = %w[bolt_tasks shell].freeze
+
+        private def validate
+          super
+
+          if @config['task-agent'] && !VALID_AGENTS.include?(@config['task-agent'])
+            raise Bolt::ValidationError,
+                  "task-agent must be one of #{VALID_AGENTS.join(', ')}, got '#{@config['task-agent']}'"
+          end
+
+          if @config['tmpdir'] && !absolute_path?(@config['tmpdir'])
+            raise Bolt::ValidationError,
+                  "Choria tmpdir must be an absolute path, got '#{@config['tmpdir']}'"
+          end
+
+          ssl_keys = %w[ssl-ca ssl-cert ssl-key]
+          provided_ssl = ssl_keys.select { |k| @config[k] }
+          if provided_ssl.any? && provided_ssl.length < ssl_keys.length
+            missing = ssl_keys - provided_ssl
+            raise Bolt::ValidationError,
+                  "When overriding Choria SSL settings, all three options must be provided " \
+                  "(ssl-ca, ssl-cert, ssl-key). Missing: #{missing.join(', ')}"
+          end
+
+          @config['interpreters'] = normalize_interpreters(@config['interpreters']) if @config['interpreters']
+        end
+
+        # Accept both POSIX absolute paths (/tmp) and Windows absolute paths (C:\temp).
+        def absolute_path?(path)
+          path.start_with?('/') || path.match?(Bolt::Transport::Choria::WINDOWS_PATH_REGEX)
+        end
+      end
+    end
+  end
+end

data/lib/bolt/config/transport/options.rb

@@ -51,6 +51,56 @@ module Bolt
             _default: true,
             _example: false
           },
+          "task-agent" => {
+            type: String,
+            description: "Which Choria agent to use for task execution. Defaults to 'bolt_tasks' " \
+                         "(downloads task files from a Puppet Server). Set to 'shell' for tasks " \
+                         "not available on the Puppet Server.",
+            _plugin: true,
+            _example: "shell"
+          },
+          "collective" => {
+            type: String,
+            description: "The Choria collective to target. Overrides the main_collective from the Choria " \
+                         "client configuration file.",
+            _plugin: true,
+            _example: "production"
+          },
+          "command-timeout" => {
+            type: Integer,
+            description: "How long to wait in seconds for commands and scripts to complete when using the " \
+                         "Choria transport.",
+            minimum: 1,
+            _plugin: true,
+            _default: 60,
+            _example: 120
+          },
+          "config-file" => {
+            type: String,
+            description: "The path to the Choria or MCollective client configuration file.",
+            _plugin: true,
+            _example: "/etc/choria/client.conf"
+          },
+          "broker-timeout" => {
+            type: Integer,
+            description: "How long to wait in seconds for the initial TCP connection to a Choria broker. " \
+                         "If the connection cannot be made within this time, the operation fails.",
+            minimum: 1,
+            _plugin: true,
+            _default: 30,
+            _example: 60
+          },
+          "rpc-timeout" => {
+            type: Integer,
+            description: "How long to wait in seconds for nodes to respond to an RPC request. " \
+                         "Used for lightweight operations like agent discovery, shell.start, and " \
+                         "shell.list polling. Distinct from command-timeout and task-timeout which " \
+                         "govern the overall duration of commands and tasks.",
+            minimum: 1,
+            _plugin: true,
+            _default: 30,
+            _example: 60
+          },
           "connect-timeout" => {
             type: Integer,
             description: "How long to wait in seconds when establishing connections. Set this value higher if you " \
@@ -225,6 +275,27 @@ module Bolt
             _plugin: true,
             _example: %w[defaults hmac-md5]
           },
+          "mcollective-certname" => {
+            type: String,
+            description: "Override the MCollective certname used for Choria client identity. " \
+                         "The choria-mcorpc-support library identifies non-root clients as " \
+                         "'<username>.mcollective'. Set this when authenticating with a certificate " \
+                         "whose CN differs from that default (e.g. the host's Puppet cert).",
+            _plugin: true,
+            _example: "primary.example.com"
+          },
+          "brokers" => {
+            type: [String, Array],
+            description: "One or more Choria broker addresses in host or host:port format. " \
+                         "Port defaults to 4222 if omitted. Do not use the nats:// prefix. " \
+                         "Overrides the middleware hosts from the Choria client configuration file. " \
+                         "Can be a single string or an array.",
+            items: {
+              type: String
+            },
+            _plugin: true,
+            _example: ["broker1:4222", "broker2:4222"]
+          },
           "native-ssh" => {
             type: [TrueClass, FalseClass],
             description: "This enables the native SSH transport, which shells out to SSH instead of using the " \
@@ -267,6 +338,14 @@ module Bolt
             _plugin: true,
             _example: "jump.example.com"
           },
+          "puppet-environment" => {
+            type: String,
+            description: "The Puppet environment to use when constructing task file URIs for the Choria " \
+                         "bolt_tasks agent.",
+            _plugin: true,
+            _default: "production",
+            _example: "staging"
+          },
           "read-timeout" => {
             type: Integer,
             description: "How long to wait in seconds when making requests to the Orchestrator.",
@@ -343,6 +422,27 @@ module Bolt
             _plugin: true,
             _example: 445
           },
+          "ssl-ca" => {
+            type: String,
+            description: "The path to the CA certificate for Choria TLS connections. Overrides the CA " \
+                         "from the Choria client configuration file.",
+            _plugin: true,
+            _example: "/etc/choria/ssl/ca.pem"
+          },
+          "ssl-cert" => {
+            type: String,
+            description: "The path to the client certificate for Choria TLS connections. Overrides the " \
+                         "certificate from the Choria client configuration file.",
+            _plugin: true,
+            _example: "/etc/choria/ssl/client.pem"
+          },
+          "ssl-key" => {
+            type: String,
+            description: "The path to the client private key for Choria TLS connections. Overrides the " \
+                         "key from the Choria client configuration file.",
+            _plugin: true,
+            _example: "/etc/choria/ssl/client-key.pem"
+          },
           "ssh-command" => {
             type: [Array, String],
             description: "The command and options to use when SSHing. This option is used when you need support for " \
@@ -393,6 +493,14 @@ module Bolt
             _default: "production",
             _example: "development"
           },
+          "task-timeout" => {
+            type: Integer,
+            description: "How long to wait in seconds for tasks to complete when using the Choria transport.",
+            minimum: 1,
+            _plugin: true,
+            _default: 300,
+            _example: 300
+          },
           "tmpdir" => {
             type: String,
             description: "The directory to upload and execute temporary files on the target.",

data/lib/bolt/executor.rb

@@ -13,6 +13,7 @@ require_relative '../bolt/puppetdb'
 require_relative '../bolt/result'
 require_relative '../bolt/result_set'
 # Load transports
+require_relative '../bolt/transport/choria'
 require_relative '../bolt/transport/docker'
 require_relative '../bolt/transport/jail'
 require_relative '../bolt/transport/local'
@@ -24,6 +25,7 @@ require_relative '../bolt/transport/winrm'
 
 module Bolt
   TRANSPORTS = {
+    choria: Bolt::Transport::Choria,
     docker: Bolt::Transport::Docker,
     jail: Bolt::Transport::Jail,
     local: Bolt::Transport::Local,

data/lib/bolt/outputter/human.rb

@@ -486,7 +486,7 @@ module Bolt
       #
       # @param topics [Array] The available topics.
       #
-      def print_topics(topics:, **_kwargs)
+      def print_topics(topics:)
         info = +"#{colorize(:cyan, 'Topics')}\n"
         info << indent(2, topics.join("\n"))
         info << "\n\n#{colorize(:cyan, 'Additional information')}\n"

data/lib/bolt/outputter/json.rb

@@ -122,8 +122,8 @@ module Bolt
       #
       # @param topics [Array] The available topics.
       #
-      def print_topics(**kwargs)
-        print_table(kwargs)
+      def print_topics(topics:)
+        print_table({ topics: topics })
       end
 
       # Print the guide for the specified topic.

data/lib/bolt/outputter/rainbow.rb

@@ -104,7 +104,11 @@ module Bolt
         @stream.puts colorize(:rainbow, guide)
       end
 
-      def print_topics(topics)
+      # Print available guide topics.
+      #
+      # @param topics [Array] The available topics.
+      #
+      def print_topics(topics:)
         content  = String.new("Available topics are:\n")
         content += topics.join("\n")
         content += "\n\nUse `bolt guide <topic>` to view a specific guide."

data/lib/bolt/pal/yaml_plan/transpiler.rb

@@ -22,7 +22,7 @@ module Bolt
 
           plan_object = parse_plan
           param_descriptions = plan_object.parameters.map do |param|
-            str = String.new("# @param #{param.name}")
+            str = "# @param #{param.name}"
             str << " #{param.description}" if param.description
             str
           end.join("\n")

data/lib/bolt/plugin/puppetdb.rb

@@ -5,7 +5,7 @@ module Bolt
     class Puppetdb
       class FactLookupError < Bolt::Error
         def initialize(fact, err = nil)
-          m = String.new("Fact lookup '#{fact}' contains an invalid factname")
+          m = "Fact lookup '#{fact}' contains an invalid factname"
           m << ": #{err}" unless err.nil?
           super(m, 'bolt.plugin/fact-lookup-error')
         end

data/lib/bolt/plugin.rb

@@ -127,7 +127,7 @@ module Bolt
       end
     end
 
-    RUBY_PLUGINS = %w[task prompt env_var puppetdb puppet_connect_data].freeze
+    RUBY_PLUGINS = %w[task prompt env_var puppetdb].freeze
     BUILTIN_PLUGINS = %w[task terraform pkcs7 prompt vault aws_inventory puppetdb azure_inventory
                          yaml env_var gcloud_inventory].freeze
     DEFAULT_PLUGIN_HOOKS = { 'puppet_library' => { 'plugin' => 'openvox_bootstrap', 'stop_service' => true } }.freeze
@@ -255,9 +255,6 @@ module Bolt
       hooks = KNOWN_HOOKS.map { |hook| [hook, {}] }.to_h
 
       @plugins.sort.each do |name, plugin|
-        # Don't show the Puppet Connect plugin for now.
-        next if name == 'puppet_connect_data'
-
         case plugin
         when Bolt::Plugin::Module
           plugin.hook_map.each do |hook, spec|

data/lib/bolt/puppetdb/config.rb

@@ -149,6 +149,14 @@ module Bolt
         @settings['key']
       end
 
+      def headers
+        if @settings['headers'] && !@settings['headers'].is_a?(Hash)
+          raise Bolt::PuppetDBError, "headers must be a Hash"
+        end
+
+        @settings['headers']
+      end
+
       def validate_cert_and_key
         if (@settings['cert'] && !@settings['key']) ||
            (!@settings['cert'] && @settings['key'])

data/lib/bolt/puppetdb/instance.rb

@@ -139,6 +139,7 @@ module Bolt
 
       def headers
         headers = { 'Content-Type' => 'application/json' }
+        headers.merge!(@config.headers) if @config.headers
         headers['X-Authentication'] = @config.token if @config.token
         headers
       end

data/lib/bolt/result_set.rb

@@ -27,7 +27,7 @@ module Bolt
 
     def iterator
       if Object.const_defined?(:Puppet) && Puppet.const_defined?(:Pops) &&
-         self.class.included_modules.include?(Puppet::Pops::Types::Iterable)
+         self.class.include?(Puppet::Pops::Types::Iterable)
         Puppet::Pops::Types::Iterable.on(@results, Bolt::Result)
       else
         raise NotImplementedError, "iterator requires puppet code to be loaded."