beaker-puppet 1.22.2 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34853498fbc2455c514d98b08ca269ca9e72d393cb0c4f65fe6c330b50b201a6
-  data.tar.gz: efc883d575d5a87358da4f16f77245a3785e5a1f646a949a0c8935f175027699
+  metadata.gz: 291be3169160fb05d4e9e03f4e18e0d70baa030bee8310919674cc2efb1939bb
+  data.tar.gz: 2db7eda8598a998fba05334c49239a2f3491773dc85b56e02f690e7ed3713439
 SHA512:
-  metadata.gz: f4898dbb5c44ec8cbab0ee7d5cbb506bac7a683dcdf8a02af6b4b453ddd78555ab88e351428b997fa72a67b6f782f1488e93fdf9dbe7a4890302698d79e6e5ae
-  data.tar.gz: 8f1f91a863822aaaa7fe2bea97f9714cbfa9d0fb35c5d4376fdf749513193ca8868a894e199c28c9d102f06b77088ec1c83bbcc8f8b39b936ff21b0ee81ff0fa
+  metadata.gz: c9a231d1ecbfd9935b75e81f792c168cb7069086a1aecdff9bb059c9ff0b1031160316b7cb8fe54575f314334ed8b4d893ab2558560c66b77567836370a4909e
+  data.tar.gz: dd4f7ebe572dc4436bd758ad48e695c287a4b00fdf7074740c251bf9a3cc5f935a9779c3b3aef4b576aa1cef640f9d80a24911538cbc151d85ec3a54a0667b75

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.23.0](https://github.com/voxpupuli/beaker-puppet/tree/1.23.0) (2022-02-23)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.22.2...1.23.0)
+
+**Implemented enhancements:**
+
+- \(maint\) Follow redirects when curling MSI [\#176](https://github.com/voxpupuli/beaker-puppet/pull/176) ([joshcooper](https://github.com/joshcooper))
+- Update agent download from URL logic to handle redirects [\#173](https://github.com/voxpupuli/beaker-puppet/pull/173) ([cthorn42](https://github.com/cthorn42))
+
+**Merged pull requests:**
+
+- Update specs to fix ruby 3 spec failures [\#174](https://github.com/voxpupuli/beaker-puppet/pull/174) ([cthorn42](https://github.com/cthorn42))
+
 ## [1.22.2](https://github.com/voxpupuli/beaker-puppet/tree/1.22.2) (2021-12-31)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.22.1...1.22.2)

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -75,7 +75,7 @@ module Beaker
           # redhat-8-arm64 is provided from amazon
           return true if host.host_hash[:template] == 'redhat-8-arm64' && host.hostname =~ /.puppet.net$/
 
-          result = on(host, %(curl -fI "#{url}"), accept_all_exit_codes: true)
+          result = on(host, %(curl --location -fI "#{url}"), accept_all_exit_codes: true)
           return result.exit_code.zero?
         end
 
@@ -681,7 +681,7 @@ module Beaker
             if host.is_cygwin?
               # NOTE: it is critical that -o be before -O on Windows
               proxy = opts[:package_proxy] ? "-x #{opts[:package_proxy]} " : ''
-              on host, "curl #{proxy}-o \"#{msi_download_path}\" -O #{link}"
+              on host, "curl #{proxy}--location --output \"#{msi_download_path}\" --remote-name #{link}"
 
               #Because the msi installer doesn't add Puppet to the environment path
               #Add both potential paths for simplicity
@@ -761,9 +761,9 @@ module Beaker
                 raise "You need to specify versions for OSX host\n eg. install_puppet({:version => '3.6.2',:facter_version => '2.1.0',:hiera_version  => '1.3.4',})"
               end
 
-              on host, "curl -O #{opts[:mac_download_url]}/puppet-#{puppet_ver}.dmg"
-              on host, "curl -O #{opts[:mac_download_url]}/facter-#{facter_ver}.dmg"
-              on host, "curl -O #{opts[:mac_download_url]}/hiera-#{hiera_ver}.dmg"
+              on host, "curl --location --remote-name #{opts[:mac_download_url]}/puppet-#{puppet_ver}.dmg"
+              on host, "curl --location --remote-name #{opts[:mac_download_url]}/facter-#{facter_ver}.dmg"
+              on host, "curl --location --remote-name #{opts[:mac_download_url]}/hiera-#{hiera_ver}.dmg"
 
               host.install_package("puppet-#{puppet_ver}")
               host.install_package("facter-#{facter_ver}")
@@ -815,7 +815,7 @@ module Beaker
 
             pkg_name = "puppet-agent-#{agent_version}*"
             dmg_name = "puppet-agent-#{agent_version}-1.osx#{version}.dmg"
-            on host, "curl -O #{download_url}/#{dmg_name}"
+            on host, "curl --location --remote-name #{download_url}/#{dmg_name}"
 
             host.install_package(pkg_name)
 
@@ -826,7 +826,7 @@ module Beaker
         # Returns the latest puppet-agent version number from a given url.
         #
         # @param [String] url         URL containing list of puppet-agent packages.
-        #                             Example: https://downloads.puppetlabs.com/mac/10.11/PC1/x86_64
+        #                             Example: https://downloads.puppetlabs.com/mac/puppet7/10.15/x86_64/
         #
         # @return [String] version    puppet-agent version number (e.g. 1.4.1)
         #                             Empty string if none found.
@@ -834,8 +834,20 @@ module Beaker
         def get_latest_puppet_agent_build_from_url(url)
           require 'oga'
           require 'net/http'
-          body = Net::HTTP.get(URI.parse("#{url}/index_by_lastModified_reverse.html"))
-          document = Oga.parse_html(body)
+
+          full_url = "#{url}/index_by_lastModified_reverse.html"
+          response = Net::HTTP.get_response(URI(full_url))
+          counter = 0
+
+          # Redirect following
+          while response.is_a?(Net::HTTPRedirection) && counter < 15
+            response = Net::HTTP.get_response(URI.parse(Net::HTTP.get_response(URI(full_url))['location']))
+            counter = counter + 1
+          end
+
+          raise "The URL for puppet-agent download, #{response.uri}, returned #{response.message} with #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+          document = Oga.parse_html(response.body)
           agents = document.xpath('//a[contains(@href, "puppet-agent")]')
 
           latest_match = agents.shift.attributes[0].value

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.22.2'
+  VERSION = '1.23.0'
 end

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

@@ -174,7 +174,7 @@ describe ClassMixedWithDSLHelpers do
 
       expect( subject ).to receive( :on ).
         with( agent, 'puppet_command',
-              :acceptable_exit_codes => [0] )
+              {:acceptable_exit_codes => [0]} )
 
       subject.apply_manifest_on( agent, 'class { "boo": }')
     end
@@ -189,7 +189,7 @@ describe ClassMixedWithDSLHelpers do
           and_return( 'puppet_command' )
 
         expect( subject ).to receive( :on ).
-          with( host, 'puppet_command', :acceptable_exit_codes => [0] )
+          with( host, 'puppet_command', {:acceptable_exit_codes => [0]} )
       end
 
       result = subject.apply_manifest_on( the_hosts, 'include foobar' )
@@ -209,7 +209,7 @@ describe ClassMixedWithDSLHelpers do
         and_return( 'puppet_command' )
       the_hosts.each do |host|
         allow( subject ).to receive( :on ).
-            with( host, 'puppet_command', :acceptable_exit_codes => [0] )
+          with( host, 'puppet_command', {:acceptable_exit_codes => [0]} )
       end
 
       result = nil
@@ -228,11 +228,11 @@ describe ClassMixedWithDSLHelpers do
         and_return( 'puppet_command' )
       the_hosts.each do |host|
         allow( subject ).to receive( :on ).
-          with( host, 'puppet_command', :acceptable_exit_codes => [0] )
+          with( host, 'puppet_command', {:acceptable_exit_codes => [0]} )
       end
       expect( subject ).to receive( :block_on ).with(
         anything,
-        :run_in_parallel => true
+        {:run_in_parallel => true}
       )
 
       subject.apply_manifest_on( the_hosts, 'include foobar', { :run_in_parallel => true } )
@@ -246,11 +246,11 @@ describe ClassMixedWithDSLHelpers do
 
       expect( subject ).to receive( :on ).
         with( agent, 'puppet_command',
-              :acceptable_exit_codes => [0,2] )
+              {:acceptable_exit_codes => [0,2]} )
 
       subject.apply_manifest_on( agent,
                                 'class { "boo": }',
-                                :catch_failures => true )
+                                {:catch_failures => true} )
     end
     it 'allows acceptable exit codes through :catch_failures' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
@@ -260,12 +260,12 @@ describe ClassMixedWithDSLHelpers do
 
       expect( subject ).to receive( :on ).
         with( agent, 'puppet_command',
-              :acceptable_exit_codes => [4,0,2] )
+             {:acceptable_exit_codes => [4,0,2]} )
 
       subject.apply_manifest_on( agent,
                                 'class { "boo": }',
-                                :acceptable_exit_codes => [4],
-                                :catch_failures => true )
+                                {:acceptable_exit_codes => [4],
+                                 :catch_failures => true} )
     end
     it 'enforces a 0 exit code through :catch_changes' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
@@ -276,13 +276,13 @@ describe ClassMixedWithDSLHelpers do
       expect( subject ).to receive( :on ).with(
         agent,
         'puppet_command',
-        :acceptable_exit_codes => [0]
+        {:acceptable_exit_codes => [0]}
       )
 
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :catch_changes => true
+        {:catch_changes => true}
       )
     end
     it 'enforces a 2 exit code through :expect_changes' do
@@ -294,13 +294,13 @@ describe ClassMixedWithDSLHelpers do
       expect( subject ).to receive( :on ).with(
         agent,
         'puppet_command',
-        :acceptable_exit_codes => [2]
+        {:acceptable_exit_codes => [2]}
       )
 
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :expect_changes => true
+        {:expect_changes => true}
       )
     end
     it 'enforces exit codes through :expect_failures' do
@@ -312,13 +312,13 @@ describe ClassMixedWithDSLHelpers do
       expect( subject ).to receive( :on ).with(
         agent,
         'puppet_command',
-        :acceptable_exit_codes => [1,4,6]
+        {:acceptable_exit_codes => [1,4,6]}
       )
 
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :expect_failures => true
+        {:expect_failures => true}
       )
     end
     it 'enforces exit codes through :expect_failures' do
@@ -341,14 +341,14 @@ describe ClassMixedWithDSLHelpers do
       expect( subject ).to receive( :on ).with(
         agent,
         'puppet_command',
-        :acceptable_exit_codes => [1,2,3,4,5,6]
+        {:acceptable_exit_codes => [1,2,3,4,5,6]}
       )
 
       subject.apply_manifest_on(
         agent,
         'class { "boo": }',
-        :acceptable_exit_codes => (1..5),
-        :expect_failures       => true
+        {:acceptable_exit_codes => (1..5),
+         :expect_failures       => true}
       )
     end
 

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

@@ -341,7 +341,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs puppet on cygwin windows' do
       allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost, "curl --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
       expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
       expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
 
@@ -350,7 +350,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs puppet on cygwin windows via proxy' do
       allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl -x https://proxy.com -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost, "curl -x https://proxy.com --location --output \"#{win_temp}\\puppet-3.7.1-x64.msi\" --remote-name http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
       expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
       expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
 

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

@@ -99,7 +99,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect_version_log_called
       expect( subject ).to receive( :create_install_msi_batch_on ).with(
           anything, anything,
-          'PUPPET_AGENT_STARTUP_MODE' => 'Manual')
+          {'PUPPET_AGENT_STARTUP_MODE' => 'Manual'})
       subject.install_msi_on(hosts, msi_path, {})
     end
 
@@ -112,7 +112,7 @@ describe ClassMixedWithDSLInstallUtils do
       value = 'Automatic'
       expect( subject ).to receive( :create_install_msi_batch_on ).with(
           anything, anything,
-          'PUPPET_AGENT_STARTUP_MODE' => value)
+          {'PUPPET_AGENT_STARTUP_MODE' => value})
       subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => value})
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.23.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec