beaker-pe 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0d8e3ba1b40ece8b4ce09269696496f8127b94cbd024a561be03c4329eeea8
-  data.tar.gz: efda94caab15d1fe1a46a7529053dc8c46f22a769740ead35be71e3ab57a1eab
+  metadata.gz: 67b0404c59865c818eee51a02ce5788f0aef2f5b753a42c9aea792b51e7be236
+  data.tar.gz: a6e7771b5f79635ef39b205eff75079788ebaed1b4fdbac38f241da2092db783
 SHA512:
-  metadata.gz: 9d5f4990007e80482f754be9733776583188b57065e5ce0dbd0e5db27aeaa20c86351098e7409fae2dc63627ee9094effb1953634096937678c06a24eb788ccc
-  data.tar.gz: d50685bbd3c0dec24a7205b5ad009b91a94cd5b8681680a7660d8c33d045b54f64c3de01a3bbb09e98e2b1d8b7a2cb86b9a5cf56b48f50e3ef58e5cedd2f049a
+  metadata.gz: 104e1314b325bca84a49450ef3f8934783a7c6b686becacd0a30304af35c1ce360fefaede0545abe8167cd6f528140e999536c5f6f11d4c3a194a88eb95ba28a
+  data.tar.gz: 88f0f6c2b7017e5d92b4af70016b24f2d7adb0529a933132862576bb4e8d3f2b651809d4fa69b7c61bd7aa88ad590db74265700ea9b80f754954efeb34d2d037

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.5.0](https://github.com/puppetlabs/beaker-pe/tree/3.5.0) (2025-04-15)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.4.0...3.5.0)
+
+**Implemented enhancements:**
+
+- \(PE-40793\) Follow https->>http redirects [\#287](https://github.com/puppetlabs/beaker-pe/pull/287) ([tvpartytonight](https://github.com/tvpartytonight))
+
 ## [3.4.0](https://github.com/puppetlabs/beaker-pe/tree/3.4.0) (2025-03-12)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.1...3.4.0)

data/lib/beaker-pe/install/pe_utils.rb

@@ -1099,7 +1099,12 @@ module Beaker
 
             onhost_copied_download = File.join(onhost_copy_base, download_file)
             onhost_copied_file = File.join(onhost_copy_base, release_file)
-            fetch_http_file(release_path, download_file, copy_dir_local)
+            download_uri = URI.parse("#{release_path}/#{download_file}")
+            if (redirect = Net::HTTP.start(download_uri.host) { |http| http.head(download_uri.path).response['location'] })
+              fetch_http_file(redirect.chomp("/#{download_file}"), download_file, copy_dir_local)
+            else
+              fetch_http_file(release_path, download_file, copy_dir_local)
+            end
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             if variant == 'windows'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.4.0'
+        STRING = '3.5.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -82,6 +82,25 @@ describe ClassMixedWithDSLInstallUtils do
     subject.logger = logger
   end
 
+  context '#install_puppet_agent_pe_promoted_repo_on' do
+
+    it 'will read a redirect if necessary' do
+      # Only test the function under test attempts to read the redirect; skip
+      # the rest of function by bailing early after that attempt has been verified
+      # by raising this special exception
+      class SpecialRedirectTestException < StandardError
+      end
+      opts[:pe_promoted_builds_url] = 'https://mycooltesturl.com'
+      allow(Net::HTTP).to receive(:start).with('mycooltesturl.com').and_return('http://mycooltesturlredirect.com/puppet-agent-el-9-x86_64.tar.gz')
+      allow(subject).to receive(:fetch_http_file).with('http://mycooltesturlredirect.com', 'puppet-agent-el-9-x86_64.tar.gz', 'tmp/repo_configs/el').and_raise(SpecialRedirectTestException)
+      allow(subject).to receive(:sanitize_opts).and_return(opts)
+
+      test_host = Beaker::Host.create("test", {platform: 'el-9-x86_64'}, opts)
+      test_host['platform'] = Beaker::Platform.new(test_host['platform'])
+      expect{subject.install_puppet_agent_pe_promoted_repo_on([test_host], opts)}.to raise_error(SpecialRedirectTestException)
+    end
+  end
+
   context '#prep_host_for_upgrade' do
 
     it 'sets per host options before global options' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec