Merge pull request #2891 from beechtom/bug/r10k-action

(maint) Pass required param to r10k Puppetfile installer
puppetlabs · Jun 17, 2021 · 43c4d09 · 43c4d09
2 parents b21201b + 21b33d8
commit 43c4d09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/bolt/module_installer/installer.rb b/lib/bolt/module_installer/installer.rb
@@ -30,7 +30,7 @@ def install(path, moduledir)
 
         settings = R10K::Settings.global_settings.evaluate(@config)
         R10K::Initializers::GlobalInitializer.new(settings).call
-        install_action = R10K::Action::Puppetfile::Install.new(r10k_opts, nil)
+        install_action = R10K::Action::Puppetfile::Install.new(r10k_opts, nil, {})
 
         # Override the r10k logger with a proxy to our own logger
         R10K::Logging.instance_variable_set(:@outputter, Bolt::R10KLogProxy.new)

diff --git a/spec/bolt/cli_spec.rb b/spec/bolt/cli_spec.rb
@@ -2416,7 +2416,7 @@ def stub_config(file_content = {})
         expect(R10K::Action::Puppetfile::Install).to receive(:new)
           .with({ root: File.dirname(puppetfile),
                   puppetfile: puppetfile.to_s,
-                  moduledir: project.managed_moduledir.to_s }, nil)
+                  moduledir: project.managed_moduledir.to_s }, nil, {})
 
         allow(action_stub).to receive(:call).and_return(true)