beaker-puppet 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da73693c535ed78cfde43029b2c2c7b0bc3e0d4f
-  data.tar.gz: 4706afb84f74dd8d13cf7d5ad46bb320f5294dad
+  metadata.gz: d322c80a47192acedb35fe134e928ca9fad94f94
+  data.tar.gz: d4dfedaa36a7a51a237388eebee0d8c9e664ee28
 SHA512:
-  metadata.gz: b0a14fb382b29db5da6fb1bdd7b10d7a6437a55b43fe12be2015add2ea9105d14fe989978f276571053eab8b9fdb7e19ff2b5dc6eae6c61fcaba0fc90f1c2ddf
-  data.tar.gz: 318c2814ff69d56716c9451f3cb80e6fd180ff037e02917bde5326b88534c6ca5d1aa26333b34438186b4ad2f2893c15c52eb24206edb61dc712b8273122f77b
+  metadata.gz: 94e08a2ccdd6e9e75f18d28bae39262ab9af24432a65021d07756ececb4651c942ab9069a3243194a25e06cbc9d2ee5c32afd5ca2d63fc0ab540609421e3ebc7
+  data.tar.gz: 3fcb942b149e20a2c46e9cbc2d39f0bc69ff0f4dd734ab52684df47bba1b1f2746d00453a969bd7353cb97c2b255288951cd63277f07d6a442de4b5725beac59

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'timeout'
 require 'inifile'
 require 'resolv'
@@ -47,6 +48,18 @@ module Beaker
         #     running the command.
         #
 
+        # Read a setting from the puppet master config
+        #
+        # @param [Host] host The host
+        # @param [String] setting The setting to read
+        #
+        def puppet_config(host, setting, section: nil)
+          command = "config print #{setting}"
+          command += " --section #{section}" if section
+
+          on(host, puppet(command)).stdout.strip
+        end
+
         # Return the name of the puppet user.
         #
         # @param [Host] host One object that acts like a Beaker::Host
@@ -54,7 +67,7 @@ module Beaker
         # @note This method assumes puppet is installed on the host.
         #
         def puppet_user(host)
-          return host.puppet('master')['user']
+          puppet_config(host, 'user', section: 'master')
         end
 
         # Return the name of the puppet group.
@@ -64,7 +77,7 @@ module Beaker
         # @note This method assumes puppet is installed on the host.
         #
         def puppet_group(host)
-          return host.puppet('master')['group']
+          puppet_config(host, 'group', section: 'master')
         end
 
         # Test Puppet running in a certain run mode with specific options.
@@ -135,10 +148,10 @@ module Beaker
         #                             :master => {:masterlog => '/elswhere'},
         #                             :agent => {:server => 'localhost'} ) do
         #
-        #       ...tests to be ran...
+        #       ...tests to be run...
         #     end
         #
-        def with_puppet_running_on host, conf_opts, testdir = host.tmpdir(File.basename(@path)), &block
+        def with_puppet_running_on(host, conf_opts, testdir = host.tmpdir(File.basename(@path)), &block)
           raise(ArgumentError, "with_puppet_running_on's conf_opts must be a Hash. You provided a #{conf_opts.class}: '#{conf_opts}'") if !conf_opts.kind_of?(Hash)
           cmdline_args = conf_opts[:__commandline_args__]
           service_args = conf_opts[:__service_args__] || {}
@@ -151,8 +164,8 @@ module Beaker
           logger.debug "Setting curl retries to #{curl_retries}"
 
           if options[:is_puppetserver] || host[:is_puppetserver]
-            confdir = host.puppet('master')['confdir']
-            vardir = host.puppet('master')['vardir']
+            confdir = puppet_config(host, 'confdir', section: 'master')
+            vardir = puppet_config(host, 'vardir', section: 'master')
 
             if cmdline_args
               split_args = cmdline_args.split()
@@ -176,7 +189,10 @@ module Beaker
             modify_tk_config(host, puppetserver_conf, puppetserver_opts)
           end
           begin
-            backup_file = backup_the_file(host, host.puppet('master')['confdir'], testdir, 'puppet.conf')
+            backup_file = backup_the_file(host,
+                                          puppet_config(host, 'confdir', section: 'master'),
+                                          testdir,
+                                          'puppet.conf')
             lay_down_new_puppet_conf host, conf_opts, testdir
 
             if host.use_service_scripts? && !service_args[:bypass_service_script]
@@ -250,7 +266,7 @@ module Beaker
 
         # @!visibility private
         def restore_puppet_conf_from_backup( host, backup_file )
-          puppet_conf = host.puppet('master')['config']
+          puppet_conf = puppet_config(host, 'config', section: 'master')
 
           if backup_file
             host.exec( Command.new( "if [ -f '#{backup_file}' ]; then " +
@@ -278,7 +294,7 @@ module Beaker
 
         # @!visibility private
         def stop_puppet_from_source_on( host )
-          pid = host.exec( Command.new('cat `puppet master --configprint pidfile`') ).stdout.chomp
+          pid = host.exec( Command.new('cat `puppet config print --section master pidfile`') ).stdout.chomp
           host.exec( Command.new( "kill #{pid}" ) )
           Timeout.timeout(10) do
             while host.exec( Command.new( "kill -0 #{pid}"), :acceptable_exit_codes => [0,1] ).exit_code == 0 do
@@ -305,7 +321,7 @@ module Beaker
 
         # @!visibility private
         def lay_down_new_puppet_conf( host, configuration_options, testdir )
-          puppetconf_main = host.puppet('master')['config']
+          puppetconf_main = puppet_config(host, 'config', section: 'master')
           puppetconf_filename = File.basename(puppetconf_main)
           puppetconf_test = File.join(testdir, puppetconf_filename)
 
@@ -321,7 +337,7 @@ module Beaker
 
         # @!visibility private
         def puppet_conf_for host, conf_opts
-          puppetconf = host.exec( Command.new( "cat #{host.puppet('master')['config']}" ) ).stdout
+          puppetconf = host.exec( Command.new( "cat #{puppet_config(host, 'config', section: 'master')}" ) ).stdout
           new_conf   = IniFile.new(content: puppetconf).merge( conf_opts )
 
           new_conf
@@ -845,24 +861,15 @@ module Beaker
         # @param [String] name A remote path prefix for the new temp
         # directory. Default value is '/tmp/beaker'
         # @param [String] user The name of user that should own the temp
-        # directory. If no username is specified, use `puppet master
-        # --configprint user` to obtain username from master. Raise RuntimeError
+        # directory. If no username is specified, use `puppet config print user
+        # --section master` to obtain username from master. Raise RuntimeError
         # if this puppet command returns a non-zero exit code.
         #
         # @return [String] Returns the name of the newly-created dir.
         def create_tmpdir_for_user(host, name='/tmp/beaker', user=nil)
-          if not user
-            result = on host, puppet("master --configprint user")
-            if not result.exit_code == 0
-              raise "`puppet master --configprint` failed, check that puppet is installed on #{host} or explicitly pass in a user name."
-            end
-            user = result.stdout.strip
-          end
-
+          user ||= puppet_config(host, 'user', section: 'master')
           create_tmpdir_on(host, name, user)
-
         end
-
       end
     end
   end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 end

data/setup/common/040_ValidateSignCert.rb

@@ -14,7 +14,7 @@ test_name "Validate Sign Cert" do
   step "Clear SSL on all hosts"
   hosts.each do |host|
     ssldir = on(host, puppet('agent --configprint ssldir')).stdout.chomp
-    on(host, "rm -rf '#{ssldir}'")
+    on(host, "rm -rf '#{ssldir}/*'")
   end
 
   step "Master: Start Puppet Master" do
@@ -22,10 +22,6 @@ test_name "Validate Sign Cert" do
       :main => {
         :dns_alt_names => "puppet,#{hostname},#{fqdn}",
       },
-      :__service_args__ => {
-        # apache2 service scripts can't restart if we've removed the ssl dir
-        :bypass_service_script => true,
-      },
     }
     with_puppet_running_on(master, master_opts) do
 

data/spec/beaker-puppet/helpers/puppet_helpers_spec.rb

@@ -43,32 +43,19 @@ describe ClassMixedWithDSLHelpers do
     context 'with no user argument' do
 
       context 'with no path name argument' do
-        context 'without puppet installed on host' do
-          it 'raises an error' do
-            cmd = "the command"
-            allow(result).to receive(:exit_code).and_return(1)
-            expect(Beaker::Command).to receive(:new).with(/puppet master --configprint user/, [], {"ENV"=>{}, :cmdexe=>true}).and_return(cmd)
-            expect(subject).to receive(:on).with(host, cmd).and_return(result)
-            expect{
-              subject.create_tmpdir_for_user host
-            }.to raise_error(RuntimeError, /`puppet master --configprint` failed,/)
-          end
-        end
-        context 'with puppet installed on host' do
-          it 'executes chown once' do
-            cmd = "the command"
-            expect(Beaker::Command).to receive(:new).with(/puppet master --configprint user/, [], {"ENV"=>{}, :cmdexe=>true}).and_return(cmd)
-            expect(subject).to receive(:on).with(host, cmd).and_return(result)
-            expect(subject).to receive(:create_tmpdir_on).with(host, /\/tmp\/beaker/, /puppet/)
-            subject.create_tmpdir_for_user(host)
-          end
+        it 'executes chown once' do
+          cmd = "the command"
+          expect(Beaker::Command).to receive(:new).with(/puppet config print user --section master/, [], {"ENV"=>{}, :cmdexe=>true}).and_return(cmd)
+          expect(subject).to receive(:on).with(host, cmd).and_return(result)
+          expect(subject).to receive(:create_tmpdir_on).with(host, /\/tmp\/beaker/, /puppet/)
+          subject.create_tmpdir_for_user(host)
         end
       end
 
       context 'with path name argument' do
         it 'executes chown once' do
           cmd = "the command"
-          expect(Beaker::Command).to receive(:new).with(/puppet master --configprint user/, [], {"ENV"=>{}, :cmdexe=>true}).and_return(cmd)
+          expect(Beaker::Command).to receive(:new).with(/puppet config print user --section master/, [], {"ENV"=>{}, :cmdexe=>true}).and_return(cmd)
           expect(subject).to receive(:on).with(host, cmd).and_return(result)
           expect(subject).to receive(:create_tmpdir_on).with(host, /\/tmp\/bogus/, /puppet/)
           subject.create_tmpdir_for_user(host, "/tmp/bogus")
@@ -748,11 +735,9 @@ describe ClassMixedWithDSLHelpers do
         stub_post_setup
         allow( subject ).to receive( :options) .and_return( {:is_puppetserver => true})
         allow( subject ).to receive( :modify_tk_config)
-        allow( host ).to receive(:puppet).with( any_args ).and_return({
-          'confdir' => default_confdir,
-          'vardir' => default_vardir,
-          'config' => "#{default_confdir}/puppet.conf"
-        })
+        allow( subject ).to receive(:puppet_config).with(host, 'confdir', anything).and_return(default_confdir)
+        allow( subject ).to receive(:puppet_config).with(host, 'vardir', anything).and_return(default_vardir)
+        allow( subject ).to receive(:puppet_config).with(host, 'config', anything).and_return("#{default_confdir}/puppet.conf")
       end
 
       describe 'when the global option for :is_puppetserver is false' do
@@ -973,7 +958,7 @@ describe ClassMixedWithDSLHelpers do
             execution = 0
             expect do
               subject.with_puppet_running_on(host, {}) do
-                expect(host).to execute_commands_matching(/^puppet master/).exactly(4).times
+                expect(host).to execute_commands_matching(/^puppet master/).once
                 execution += 1
               end
             end.to change { execution }.by(1)
@@ -990,7 +975,7 @@ describe ClassMixedWithDSLHelpers do
             execution = 0
             expect do
               subject.with_puppet_running_on(host, { :restart_when_done => true }) do
-                expect(host).to execute_commands_matching(/^puppet master/).exactly(4).times
+                expect(host).to execute_commands_matching(/^puppet master/).once
                 execution += 1
               end
             end.to change { execution }.by(1)
@@ -1002,19 +987,17 @@ describe ClassMixedWithDSLHelpers do
 
       describe 'backup and restore of puppet.conf' do
         before :each do
-          mock_puppetconf_reader = Object.new
-          allow( mock_puppetconf_reader ).to receive( :[] ).with( 'config' ).and_return( '/root/mock/puppet.conf' )
-          allow( mock_puppetconf_reader ).to receive( :[] ).with( 'confdir' ).and_return( '/root/mock' )
-          allow( host ).to receive( :puppet ).with( any_args ).and_return( mock_puppetconf_reader )
+          allow(subject).to receive(:puppet_config).with(host, 'confdir', anything).and_return('/root/mock')
+          allow(subject).to receive(:puppet_config).with(host, 'config', anything).and_return('/root/mock/puppet.conf')
         end
 
-        let(:original_location) { host.puppet['config'] }
+        let(:original_location) { '/root/mock/puppet.conf' }
         let(:backup_location) {
-          filename = File.basename(host.puppet['config'])
+          filename = File.basename(original_location)
           File.join(tmpdir_path, "#{filename}.bak")
         }
         let(:new_location) {
-          filename = File.basename(host.puppet['config'])
+          filename = File.basename(original_location)
           File.join(tmpdir_path, filename)
         }
 

data/spec/beaker-puppet/install_utils/puppet5_spec.rb

@@ -172,7 +172,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'install an MSI from a URL on Windows' do
       @platform = 'windows'
 
-      expect(subject).to receive(:install_msi_on).with(host, artifact_url)
+      expect(subject).to receive(:generic_install_msi_on).with(host, artifact_url)
 
       subject.install_artifact_on(host, artifact_url, 'project_name')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec