simp-beaker-helpers 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249a3f841428c2b28cbe7961183d25344edc726652e3ae5bb66c084e9a30b2d9
-  data.tar.gz: 29fb61f0eb9dd16251d1389dd5b68457b93e3bbd81946e52a153dc82ace40fbd
+  metadata.gz: 7487245f845a8b08a99fb9ff13bc22527ed5438c3ba59d9fcae3f98a7e48851c
+  data.tar.gz: 8870dc7e054399cb22974c5858791389d6a0678985e9a2d332be8ff8f73bb8ae
 SHA512:
-  metadata.gz: d42a18f587b5c613a0ce1d4af8946be6f070e258e1012e8b1811dd63d93caa0fe967205b545ddc3462b87d37d3df58902bb5aca8705528750e08eb80166b80ab
-  data.tar.gz: 5ddf2f564b29b9eb93e8d02c5bb5670d3019cf2ed2950c8083cbbc5d0a29ddca349b5009e1ec81242292af0d80b84149c0afcda54c97dc443cbe1b50584bbc9f
+  metadata.gz: 5254345501682c0657fe99d79616258ddd1126beb2b74cab969f31e4ce31b9f8f670c8981be75246492b60981304519ae8bd29480c7e939ed100f546f2b431f3
+  data.tar.gz: b2e96e3bdd29439ae26ce70916b4a2ddfc34840ff8d9a3ba163c26a33cc3a75a29d0480be786a6890f5c0de92f600c686130e11fb30f31a532bed7af0e0637b8

data/.github/workflows/add_new_issue_to_triage_project.yml

@@ -1,3 +1,37 @@
+# Add newly opened issues and pull requests to the Org Triage board
+# ------------------------------------------------------------------------------
+#             NOTICE: **This file is maintained with puppetsync**
+#
+# This file is updated automatically as part of a puppet module baseline.
+#
+# The next baseline sync will overwrite any local changes to this file!
+#
+# ==============================================================================
+#
+# Board: https://github.com/orgs/simp/projects/11
+#
+# Intake is filtered (simp/puppetsync#97): automated traffic never needs a
+# human to triage it, and letting it in buried the items that do.
+#
+#   * Renovate (and Dependabot, pre-emptively) are matched by actor.
+#   * puppetsync's own sync PRs are matched by the `[puppetsync]` title prefix.
+#     That prefix is a CONVENTION set by the `commit_message` in each sync
+#     config, not something enforced -- a config that drops it would silently
+#     start adding sync PRs to the board again.
+#
+# PRs in general are deliberately NOT filtered: drive-by PRs from outside
+# contributors are exactly what the board must catch.
+#
+# This workflow does not check out any code, which is what makes its use of
+# `pull_request_target` safe. Keep it that way.
+#
+# Labelling (`community` for outside contributions, `needs-attention` for
+# stalled items) is NOT done here: the event payload's `author_association`
+# reports private org members as CONTRIBUTOR, so a per-repo step would mislabel
+# most of the team. It lives in the scheduled org job
+# simp/gha-workflows/.github/workflows/org_reconcile_board_status.yml, which
+# resolves membership from the org member list (simp/puppetsync#98, #99).
+#
 ---
 name: Add new issues to triage project
 
@@ -14,6 +48,14 @@ jobs:
   add-to-project:
     name: Add issue to project
     runs-on: ubuntu-latest
+    # `github.event.pull_request` is null on `issues` events, so the title test
+    # is guarded by event_name rather than relying on startsWith(null, ...)
+    # evaluating false.
+    if: >-
+      github.actor != 'renovate[bot]' &&
+      github.actor != 'dependabot[bot]' &&
+      !(github.event_name == 'pull_request_target' &&
+        startsWith(github.event.pull_request.title, '[puppetsync]'))
     steps:
       - uses: actions/add-to-project@v2
         with:

data/.github/workflows/pr_tests.yml

@@ -36,7 +36,7 @@ jobs:
       - name: "Install Ruby 3.2"
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 4.0.5
+          ruby-version: 4.0.7
           bundler-cache: true
       - run: |
           bundle show

data/.github/workflows/tag_deploy_rubygem.yml

@@ -92,7 +92,7 @@ jobs:
           echo "release_command=$GEM_RELEASE_COMMAND" | tee -a "$GITHUB_OUTPUT"
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 4.0.5
+          ruby-version: 4.0.7
           bundler-cache: true
       - name: Test build the package
         run: "${{ steps.commands.outputs.build_command }}"
@@ -184,7 +184,7 @@ jobs:
           clean: true
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 4.0.5
+          ruby-version: 4.0.7
           bundler-cache: true
       - name: Build RubyGem
         run: |

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 3.1.2 / 2026-09-29
+* Fixed:
+  * Minor changes for rubocop 1.91
+
+### 3.1.1 / 2026-07-03
+* Fixed:
+  * `run_fake_pki_ca_on` now runs `ensure_beaker_ip_on` before collecting
+    the IP addresses embedded in certificate subjectAltNames, so certs match
+    the corrected (Beaker-recorded) addresses on SUTs where the static
+    private-network IP was never applied (e.g. EL10 under Vagrant). Without
+    this, IKE peer IDs no longer match the cert SANs after remediation and
+    strict validators (libreswan 5) reject authentication.
+
 ### 3.1.0 / 2026-07-02
 * Added:
   * `ensure_beaker_ip_on`: detect SUTs whose recorded `host[:ip]` was never

data/Gemfile

@@ -47,8 +47,8 @@ group :system_tests do
 end
 
 group :tests do
-  gem 'rubocop', '~> 1.88.0'
-  gem 'rubocop-performance', '~> 1.26.0'
+  gem 'rubocop', '~> 1.91.0'
+  gem 'rubocop-performance', '~> 1.27.0'
   gem 'rubocop-rake', '~> 0.7.0'
   gem 'rubocop-rspec', '~> 3.10.0'
 end

data/lib/simp/beaker_helpers/version.rb

@@ -4,5 +4,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
-  VERSION = '3.1.0'
+  VERSION = '3.1.2'
 end

data/lib/simp/beaker_helpers.rb

@@ -24,7 +24,7 @@ module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
 
   # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
   def self.tmpname
-    t = Time.new.strftime('%Y%m%d')
+    t = Time.now.strftime('%Y%m%d')
     "simp-beaker-helpers-#{t}-#{$PROCESS_ID}-#{rand(0x100000000).to_s(36)}.tmp"
   end
 
@@ -976,6 +976,13 @@ module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
       # Ensure that all interfaces are active prior to collecting data
       activate_interfaces(host)
 
+      # Ensure the Beaker-recorded IP is actually applied before it is
+      # embedded in certificate subjectAltNames (on EL10 under Vagrant the
+      # static private-network IP is silently never applied and the
+      # interface falls back to DHCP; certs cut from the DHCP address no
+      # longer match the peer IDs once the address is corrected)
+      ensure_beaker_ip_on(host)
+
       networking_fact = pfact_on(host, 'networking')
       if networking_fact && networking_fact['interfaces']
         networking_fact['interfaces'].each_value do |data|

data/spec/acceptance/suites/inspec/00_default_spec.rb

@@ -24,11 +24,10 @@ describe 'Inspec STIG Profile' do
 
             let(:inspec_report_data) { inspec.process_inspec_results }
 
-            # rubocop:disable RSpec/RepeatedDescription
+            # rubocop:disable-next RSpec/RepeatedDescription
             it 'runs inspec' do
               inspec.run
             end
-            # rubocop:enable RSpec/RepeatedDescription
 
             it 'has an inspec report' do
               expect(inspec_report_data).not_to be_nil
@@ -41,11 +40,10 @@ describe 'Inspec STIG Profile' do
               puts inspec_report_data[:report] # rubocop:disable RSpec/Output
             end
           else
-            # rubocop:disable RSpec/RepeatedDescription
+            # rubocop:disable-next RSpec/RepeatedDescription
             it 'runs inspec' do
               skip("No matching profile available at #{profile_path}")
             end
-            # rubocop:enable RSpec/RepeatedDescription
           end
         end
       end

data/spec/acceptance/suites/offline/00_default_spec.rb

@@ -175,22 +175,20 @@ describe 'Offline mode' do
         on(host, %(#{build_user_cmd} "cd pupmod-simp-at; bundle update"))
       end
 
-      # rubocop:disable RSpec/RepeatedExample
+      # rubocop:disable-next RSpec/RepeatedExample
       it 'runs a network-connected test' do
         on(host, %(#{build_user_cmd} "cd pupmod-simp-at; rake beaker:suites"))
       end
-      # rubocop:enable RSpec/RepeatedExample
 
       it 'disables all internet network traffic via iptables' do
         on(host, %(iptables -I OUTPUT -d `ip route | awk '/default/ {print $3}'`/16 -j ACCEPT))
         on(host, 'iptables -A OUTPUT -j DROP')
       end
 
-      # rubocop:disable RSpec/RepeatedExample
+      # rubocop:disable-next RSpec/RepeatedExample
       xit 'runs a network-disconnected test' do
         on(host, %(#{build_user_cmd} "cd pupmod-simp-at; rake beaker:suites"))
       end
-      # rubocop:enable RSpec/RepeatedExample
     end
   end
 end

data/spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb

@@ -3,72 +3,63 @@ require 'spec_helper_acceptance'
 hosts.each do |host|
   describe 'take a snapshot' do
     context "on #{host}" do
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'creates a file that should be saved' do
         on(host, 'echo "keep" > /root/keep')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
-      # rubocop:disable RSpec/RepeatedExample
+      # rubocop:disable-next RSpec/RepeatedExample
       it 'takes a snapshot' do
         Simp::BeakerHelpers::Snapshot.save(host, 'test')
       end
-      # rubocop:enable RSpec/RepeatedExample
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'creates a file that should be removed' do
         on(host, 'echo "trash" > /root/trash')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'restores a snapshot' do
         Simp::BeakerHelpers::Snapshot.restore(host, 'test')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
       it 'has the keep file' do
         expect(host.file_exist?('/root/keep')).to be true
       end
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'does not have the trash file' do
         expect(host.file_exist?('/root/trash')).to be false
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
       it 'creates a second file that should be saved' do
         on(host, 'echo "keep2" > /root/keep2')
       end
 
-      # rubocop:disable RSpec/RepeatedExample
+      # rubocop:disable-next RSpec/RepeatedExample
       it 'takes a snapshot with the same name' do
         Simp::BeakerHelpers::Snapshot.save(host, 'test')
       end
-      # rubocop:enable RSpec/RepeatedExample
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'creates a file that should be removed' do
         on(host, 'echo "trash" > /root/trash')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'restores a snapshot' do
         Simp::BeakerHelpers::Snapshot.restore(host, 'test')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
       it 'has all keep files' do
         expect(host.file_exist?('/root/keep')).to be true
         expect(host.file_exist?('/root/keep2')).to be true
       end
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'does not have the trash file' do
         expect(host.file_exist?('/root/trash')).to be false
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
       it 'takes a snapshot with a different name' do
         Simp::BeakerHelpers::Snapshot.save(host, 'test2')
@@ -88,11 +79,10 @@ hosts.each do |host|
         Simp::BeakerHelpers::Snapshot.restore_to_base(host)
       end
 
-      # rubocop:disable RSpec/RepeatedExample, RSpec/RepeatedDescription
+      # rubocop:disable-next RSpec/RepeatedExample, RSpec/RepeatedDescription
       it 'creates a file that should be saved' do
         on(host, 'echo "keep" > /root/keep')
       end
-      # rubocop:enable RSpec/RepeatedExample, RSpec/RepeatedDescription
 
       it 'creates a handoff snapshot for further tests' do
         Simp::BeakerHelpers::Snapshot.save(host, 'handoff')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: beaker helper methods for SIMP
 test_files: []