beaker-pe 3.3.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f708fe43bba20734cab90b60ce41be2beeaa37f8abcd06442e675bf457f14d7
-  data.tar.gz: a01ef6d73351dcaa87ce709268d8f1c2416f5731a91d1282cb9521be4144faa1
+  metadata.gz: 67b0404c59865c818eee51a02ce5788f0aef2f5b753a42c9aea792b51e7be236
+  data.tar.gz: a6e7771b5f79635ef39b205eff75079788ebaed1b4fdbac38f241da2092db783
 SHA512:
-  metadata.gz: 30aeb8bac7f4fce50d8dc1ffb07ffb22544914c446836298312ec5aea8b545b60296f248a12ef48c9f4f407367b4d5652e475e42ad13e922f05d8ba6273bde62
-  data.tar.gz: 6b1cf7b6a3950812266b5916a78556470e4df54bbfd1657ad3453cff0c9f5712b6c72331d08b35d84d2c27a8c15a81f9ef6a8beef3ba45e687e3865e9a137c11
+  metadata.gz: 104e1314b325bca84a49450ef3f8934783a7c6b686becacd0a30304af35c1ce360fefaede0545abe8167cd6f528140e999536c5f6f11d4c3a194a88eb95ba28a
+  data.tar.gz: 88f0f6c2b7017e5d92b4af70016b24f2d7adb0529a933132862576bb4e8d3f2b651809d4fa69b7c61bd7aa88ad590db74265700ea9b80f754954efeb34d2d037

data/.github/workflows/testing.yml

@@ -12,6 +12,7 @@ jobs:
       matrix:
         ruby-version:
           - '2.7'
+          - '3.2'
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 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)
+
+**Implemented enhancements:**
+
+- \(PE-40143\) Add ruby 3.2 support [\#285](https://github.com/puppetlabs/beaker-pe/pull/285) ([tvpartytonight](https://github.com/tvpartytonight))
+
 ## [3.3.1](https://github.com/puppetlabs/beaker-pe/tree/3.3.1) (2024-12-05)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.0...3.3.1)

data/Gemfile

@@ -22,6 +22,6 @@ gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 4.3')
 
 gem 'deep_merge'
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

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/options/pe_version_scraper.rb

@@ -17,7 +17,7 @@ module Beaker
       def self.load_pe_version dist_dir, version_file
         version = nil
         begin
-          open("#{dist_dir}/#{version_file}") do |file|
+          URI.open("#{dist_dir}/#{version_file}") do |file|
             while line = file.gets
               if /(\w.*)/ =~ line then
                 version = $1.strip

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.3.1'
+        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
@@ -2061,7 +2080,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs agent on agent hosts' do
       agents = [agent, agent]
-      expect(subject).to receive(:block_on).with(agents, :run_in_parallel => true).twice
+      expect(subject).to receive(:block_on).with(agents, { run_in_parallel: true }).twice
       subject.install_agents_only_on(agents, opts)
     end
 

data/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb

@@ -36,7 +36,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             opts[:pe_client_tools_sha],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
@@ -51,7 +51,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             tag_opts[:pe_client_tools_version],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with("pe-client-tools")
 
@@ -69,7 +69,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             opts[:pe_client_tools_sha],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with('pe-client-tools')
 
@@ -84,7 +84,7 @@ describe ClassPEClientToolsMixedWithPatterns do
             'pe-client-tools',
             tag_opts[:pe_client_tools_version],
             '/tmp/repo_configs',
-            dev_builds_url: 'http://builds.delivery.puppetlabs.net'
+            { dev_builds_url: 'http://builds.delivery.puppetlabs.net' }
           )
           expect(host).to receive(:install_package).with('pe-client-tools')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Puppetlabs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -267,7 +267,6 @@ files:
 - CHANGELOG.md
 - CODEOWNERS
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - PULL_REQUEST_TEMPLATE.md
@@ -308,7 +307,7 @@ homepage: https://github.com/puppetlabs/beaker-pe
 licenses:
 - Apache2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -323,8 +322,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []

data/Gemfile.lock

@@ -1,222 +0,0 @@
-PATH
-  remote: .
-  specs:
-    beaker-pe (3.3.0)
-      beaker (>= 4.0, < 7)
-      beaker-abs
-      beaker-answers (~> 1.0)
-      beaker-puppet (>= 1)
-      beaker-vmpooler (~> 1.0)
-      stringify-hash (~> 0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.3.2)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ansi (1.5.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bcrypt_pbkdf (1.1.0)
-    beaker (4.41.2)
-      beaker-hostgenerator
-      ed25519 (~> 1.0)
-      hocon (~> 1.0)
-      in-parallel (>= 0.1, < 2)
-      inifile (~> 3.0)
-      minitar (~> 0.6)
-      minitest (~> 5.4)
-      net-scp (>= 1.2, < 5.0)
-      net-ssh (>= 5.0)
-      rexml
-      rsync (~> 1.0.9)
-      stringify-hash (~> 0.0)
-      thor (>= 1.0.1, < 2.0)
-    beaker-abs (0.11.0)
-      bcrypt_pbkdf (>= 1.0, < 2.0)
-      beaker (~> 4.0)
-      ed25519 (>= 1.2, < 2.0)
-      vmfloaty (>= 1.0, < 2)
-    beaker-answers (1.0.0)
-      hocon (~> 1.0)
-      require_all (>= 1.3.2, < 3.1.0)
-      stringify-hash (~> 0.0.0)
-    beaker-hostgenerator (2.9.1)
-      deep_merge (~> 1.0)
-    beaker-puppet (2.0.0)
-      beaker (~> 4.1)
-      oga (~> 3.4)
-    beaker-vmpooler (1.4.0)
-      stringify-hash (~> 0.0.0)
-    bigdecimal (3.1.6)
-    coderay (1.1.3)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    daemons (1.4.1)
-    deep_merge (1.2.2)
-    diff-lcs (1.5.1)
-    docile (1.4.0)
-    domain_name (0.6.20240107)
-    drb (2.2.0)
-      ruby2_keywords
-    ed25519 (1.3.0)
-    eventmachine (1.2.7)
-    fakefs (2.5.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    highline (2.0.3)
-    hocon (1.4.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    in-parallel (1.0.1)
-    inifile (3.0.0)
-    iniparser (1.0.1)
-    json (2.7.1)
-    kramdown (2.4.0)
-      rexml
-    logutils (0.6.1)
-    markdown (1.2.0)
-      kramdown (>= 1.5.0)
-      props (>= 1.1.2)
-      textutils (>= 0.10.0)
-    method_source (1.0.0)
-    minitar (0.9)
-    minitest (5.22.2)
-    multipart-post (2.4.0)
-    mutex_m (0.2.0)
-    net-ldap (0.19.0)
-    net-scp (4.0.0)
-      net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.2.1)
-    oga (3.4)
-      ast
-      ruby-ll (~> 2.1)
-    power_assert (2.0.3)
-    props (1.2.0)
-      iniparser (>= 0.1.0)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rack (2.2.8.1)
-    rake (13.1.0)
-    require_all (3.0.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rsync (1.0.9)
-    ruby-ll (2.1.3)
-      ansi
-      ast
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    scooter (4.5.4)
-      beaker
-      faraday
-      faraday-cookie_jar (>= 0.0.7)
-      faraday_middleware (~> 1.2)
-      json
-      net-ldap (~> 0.16)
-      test-unit
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    stringify-hash (0.0.2)
-    test-unit (3.6.1)
-      power_assert
-    textutils (1.4.0)
-      activesupport
-      logutils (>= 0.6.1)
-      props (>= 1.1.2)
-      rubyzip (>= 1.0.0)
-    thin (1.8.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    thor (1.3.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    vmfloaty (1.8.1)
-      commander (>= 4.4.3, < 4.7.0)
-      faraday (~> 1.5, >= 1.5.1)
-    yard (0.9.36)
-
-PLATFORMS
-  aarch64-linux
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  activesupport (~> 7.0)
-  beaker (~> 4.0)
-  beaker-abs (~> 0.8)
-  beaker-pe!
-  beaker-vmpooler (~> 1.3)
-  deep_merge
-  fakefs (~> 2.4, < 2.6.0)
-  markdown
-  pry (~> 0.10)
-  rake (~> 13.1.0)
-  rspec (~> 3.0)
-  rspec-its
-  scooter (~> 4.3)
-  simplecov (= 0.22.0)
-  thin
-  yard
-
-BUNDLED WITH
-   2.4.22