beaker 4.30.0 → 4.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f1cace175ace50c7737ff2962cd6f7bddb7037cb7e9fe8ecc638d4acdc088a7
-  data.tar.gz: 81d573163a08a3b7a2d0b63039a2e41202c70fc9c3909247b8f897b2ed84016b
+  metadata.gz: bc022311d195fb3d0b0ff1b9b957272379e6adc5aadb1dfb30e77d89a912872d
+  data.tar.gz: be60dbf2c333ea695d3e6d8b4b8fd5dc6811acbe6489e17cf924b08f24c79b05
 SHA512:
-  metadata.gz: 6a8506c9f3f460f1e64cb35ea4abd992c284b64b3d9f28c914186e8a8c35d59aa30ff0c15f8d7069b8b789c9b69b47c8234045b2eb5aad6cacc53b455dc10ae4
-  data.tar.gz: 22edf3d35e3d9c5c38b3eb2dc925e73dd355ceec5e3a60614190fc66f2010776f05dafd0b6d7fff792d17b0c3b8c2e4768d6baba1213457f195c426f9eeebf6f
+  metadata.gz: '0287d90c4f88b325f104eb4dd36ad8d75f26f070c2851d4bec00c364ee3150fc706902667ecd14f1e127cd5e4030d8a418ce0dccbe9a6ec9f58dbdd08a81a1de'
+  data.tar.gz: 8db6cc489d03e57bf25f373cd20dbc1c99b3d1eebbd7108191bd133e3152f61b8333a8f24667f7ed24c29ba4f29242bfaa5c016c24d380a11c24cb0c3207d942

data/.github/workflows/release.yml

@@ -1,8 +1,9 @@
 name: Release
 
 on:
-  create:
-    ref_type: tag
+  push:
+    tags:
+      - '*'
 
 jobs:
   release:

data/CHANGELOG.md

@@ -1,6 +1,44 @@
 # Changelog
 
-## [4.30.0](https://github.com/voxpupuli/beaker/compare/4.29.1...4.30.0) (2021-07-21)
+## [4.34.0](https://github.com/voxpupuli/beaker/tree/4.34.0) (2022-01-27)
+
+### Added
+
+- Extract a host_packages method from validate_host ([#1729](https://github.com/voxpupuli/beaker/pull/1729))
+- Reduce duplication in ssh_permit_user_environment ([#1728](https://github.com/voxpupuli/beaker/pull/1728))
+
+### Fixed
+
+- Do not install curl on EL9 ([#1728](https://github.com/voxpupuli/beaker/pull/1732))
+- Drop old Ruby 1.8 compatibility code ([#1728](https://github.com/voxpupuli/beaker/pull/1730))
+
+## [4.33.0](https://github.com/voxpupuli/beaker/tree/4.33.0) (2022-01-21)
+
+### Added
+
+- Add ed25519 as runtime dependency ([#1726](https://github.com/voxpupuli/beaker/pull/1726))
+
+## [4.32.0](https://github.com/voxpupuli/beaker/tree/4.32.0) (2021-12-06)
+
+### Fixed
+
+- Arch Linux: install net-tools and openssh ([#1722](https://github.com/voxpupuli/beaker/pull/1722))
+
+### Added
+
+- Initial EL9 support ([#1719](https://github.com/voxpupuli/beaker/pull/1719))
+
+## [4.31.0](https://github.com/voxpupuli/beaker/tree/4.31.0) (2021-11-02)
+
+### Fixed
+
+- (BKR-1690) Fix localhost logging ([#1691](https://github.com/voxpupuli/beaker/pull/1691))
+
+### Added
+
+- Made fips_check? more generally applicable ([#1717]https://github.com/voxpupuli/beaker/pull/1717))
+
+## [4.30.0](https://github.com/voxpupuli/beaker/tree/4.30.0) (2021-07-21)
 
 ### Fixed
 

data/HISTORY.md

@@ -1,4 +1,14 @@
-## [4.30.0](https://github.com/voxpupuli/beaker/compare/4.29.1...4.30.0) (2021-07-21)
+## [4.31.0](https://github.com/voxpupuli/beaker/tree/4.31.0) (2021-11-02)
+
+### Fixed
+
+- (BKR-1690) Fix localhost logging ([#1691](https://github.com/voxpupuli/beaker/pull/1691))
+
+### Added
+
+- Made fips_check? more generally applicable ([#1717]https://github.com/voxpupuli/beaker/pull/1717))
+
+## [4.30.0](https://github.com/voxpupuli/beaker/tree/4.30.0) (2021-07-21)
 
 ### Fixed
 

data/beaker.gemspec

@@ -26,12 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '~> 1.0'
   s.add_development_dependency 'rake', '~> 13.0'
 
-  # Provisioner dependencies - needed for acceptance tests
-  # TODO: figure out how to remove these
-  s.add_development_dependency 'beaker-aws', '~> 0.1'
-  s.add_development_dependency 'beaker-abs', '>= 0.4'
-  s.add_development_dependency 'beaker-vmpooler', '~> 1.0'
-
   # Documentation dependencies
   s.add_development_dependency 'yard', '~> 0.9.11'
 
@@ -45,6 +39,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'net-ssh', '>= 5.0'
+  s.add_runtime_dependency 'ed25519', '~> 1.0' # net-ssh compatibility with ed25519 keys
   s.add_runtime_dependency 'net-scp', '>= 1.2', '< 4.0'
   s.add_runtime_dependency 'inifile', '~> 3.0'
 

data/lib/beaker/host/unix/exec.rb

@@ -302,29 +302,11 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /debian|ubuntu|cumulus|huaweios|archlinux/
+    when /debian|ubuntu|cumulus|huaweios|archlinux|el-|centos|fedora|redhat|oracle|scientific|eos|opensuse|sles|solaris/
       directory = tmpdir()
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
       exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'] =~ /ubuntu-20.04/
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /el-|centos|fedora|redhat|oracle|scientific|eos/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /opensuse|sles/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /solaris/
-      # kept solaris here because refactoring it into its own Host module
-      # conflicts with the solaris hypervisor that already exists
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
     else

data/lib/beaker/host.rb

@@ -211,13 +211,8 @@ module Beaker
     end
 
     # Returns true if the host is running in FIPS mode.
-    #
-    # We currently only test FIPS mode on Redhat 7. Other detection
-    # modes should be added here if we expand FIPS support to other
-    # platforms.
     def fips_mode?
-      case self['platform']
-      when /el-7/
+      if self.file_exist?('/proc/sys/crypto/fips_enabled')
         begin
           execute("cat /proc/sys/crypto/fips_enabled") == "1"
         rescue Beaker::Host::CommandFailure

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,11 +13,12 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     RHEL8_PACKAGES = ['curl', 'chrony']
+    RHEL9_PACKAGES = ['chrony']
     FEDORA_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
-    ARCHLINUX_PACKAGES = ['curl', 'ntp']
+    ARCHLINUX_PACKAGES = ['curl', 'ntp', 'net-tools', 'openssh']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
@@ -53,7 +54,7 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-          when host['platform'] =~ /el-8|fedora/
+          when host['platform'] =~ /el-[89]|fedora/
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
           when host['platform'] =~ /opensuse-|sles-/
             ntp_command = "sntp #{ntp_server}"
@@ -101,42 +102,58 @@ module Beaker
     def validate_host host, opts
       logger = opts[:logger]
       block_on host do |host|
-        case
-        when host['platform'] =~ /el-8/
-          check_and_install_packages_if_needed(host, RHEL8_PACKAGES)
-        when host['platform'] =~ /sles-10/
-          check_and_install_packages_if_needed(host, SLES10_PACKAGES)
-        when host['platform'] =~ /opensuse|sles-/
-          check_and_install_packages_if_needed(host, SLES_PACKAGES)
-        when host['platform'] =~ /debian/
-          check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
-        when host['platform'] =~ /cumulus/
-          check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
-        when (host['platform'] =~ /windows/ and host.is_cygwin?)
-          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
-          check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
-        when (host['platform'] =~ /windows/ and not host.is_cygwin?)
-          check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
-        when host['platform'] =~ /freebsd/
-          check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
-        when host['platform'] =~ /openbsd/
-          check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
-        when host['platform'] =~ /solaris-10/
-          check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
-        when host['platform'] =~ /solaris-1[1-9]/
-          check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
-        when host['platform'] =~ /archlinux/
-          check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
-        when host['platform'] =~ /fedora/
-          check_and_install_packages_if_needed(host, FEDORA_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|opensuse-|sles-|osx-|cumulus|f5-|netscaler|cisco_/
-          check_and_install_packages_if_needed(host, UNIX_PACKAGES)
-        end
+        check_and_install_packages_if_needed(host, host_packages(host))
       end
     rescue => e
       report_and_raise(logger, e, "validate")
     end
 
+    # Return a list of packages that should be present.
+    #
+    # @param [Host] host A host return the packages for
+    # @return [Array<String>] A list of packages to install
+    def host_packages(host)
+      case host['platform']
+      when /el-8/
+        RHEL8_PACKAGES
+      when /el-9/
+        RHEL9_PACKAGES
+      when /sles-10/
+        SLES10_PACKAGES
+      when /opensuse|sles-/
+        SLES_PACKAGES
+      when /debian/
+        DEBIAN_PACKAGES
+      when /cumulus/
+        CUMULUS_PACKAGES
+      when /windows/
+        if host.is_cygwin?
+          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
+          WINDOWS_PACKAGES
+        else
+          PSWINDOWS_PACKAGES
+        end
+      when /freebsd/
+        FREEBSD_PACKAGES
+      when /openbsd/
+        OPENBSD_PACKAGES
+      when /solaris-10/
+        SOLARIS10_PACKAGES
+      when /solaris-1[1-9]/
+        SOLARIS11_PACKAGES
+      when /archlinux/
+        ARCHLINUX_PACKAGES
+      when /fedora/
+        FEDORA_PACKAGES
+      else
+        if host['platform'] !~ /aix|solaris|osx-|f5-|netscaler|cisco_/
+          UNIX_PACKAGES
+        else
+          []
+        end
+      end
+    end
+
     # Installs the given packages if they aren't already on a host
     #
     # @param [Host] host Host to act on
@@ -452,7 +469,7 @@ module Beaker
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|centos-8|el-8|redhat-8|fedora-(1[4-9]|2[0-9]|3[0-9])/
+        elsif host['platform'] =~ /arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})

data/lib/beaker/local_connection.rb

@@ -53,9 +53,12 @@ module Beaker
           result.stdout << std_out
           result.stderr << std_err
           result.exit_code = status.exitstatus
+          @logger.info(result.stdout) unless result.stdout.empty?
+          @logger.info(result.stderr) unless result.stderr.empty?
         end
       rescue => e
         result.stderr << e.inspect
+        @logger.info(result.stderr)
         result.exit_code = 1
       end
 

data/lib/beaker/platform.rb

@@ -130,14 +130,5 @@ module Beaker
     def with_version_number
       [@variant, @version, @arch].join('-')
     end
-
-    if RUBY_VERSION =~ /^1\.9/
-      def init_with(coder)
-        coder.map.each do |ivar, value|
-          instance_variable_set("@#{ivar}", value)
-        end
-        replace("#{@variant}-#{@version}-#{@arch}")
-      end
-    end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.30.0'
+    STRING = '4.34.0'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -489,9 +489,9 @@ describe Beaker do
     end
 
     it 'skips validation on cisco hosts' do
-      @platform = 'cisco_nexus-7-x86_64'
-      expect( subject ).to receive( :check_and_install_packages_if_needed ).never
-      subject.validate_host(hosts, options)
+      host = make_host('cisco-7', { stdout: stdout, platform: 'cisco_nexus-7-x86_64' })
+      expect( subject ).to receive( :check_and_install_packages_if_needed ).with(host, []).once
+      subject.validate_host(host, options)
     end
   end
 

data/spec/beaker/host_spec.rb

@@ -832,21 +832,29 @@ module Beaker
     end
 
     describe "#fips_mode?" do
-      it 'returns false on non-el7 hosts' do
+      it 'returns false on non-linux hosts' do
         @platform = 'windows'
+        expect(host).to receive(:file_exist?).with('/proc/sys/crypto/fips_enabled').and_return(false)
         expect(host.fips_mode?).to be false
       end
 
-      it 'returns true when the `fips_enabled` file is present and contains "1"' do
-        @platform = 'el-7'
-        expect(host).to receive(:execute).with("cat /proc/sys/crypto/fips_enabled").and_return("1")
-        expect(host.fips_mode?).to be true
-      end
+      platforms = ['el-7', 'el-8', 'centos']
 
-      it 'returns false when the `fips_enabled` file is present and contains "0"' do
-        @platform = 'el-7'
-        expect(host).to receive(:execute).with("cat /proc/sys/crypto/fips_enabled").and_return("0")
-        expect(host.fips_mode?).to be false
+      platforms.each do |platform|
+        context "on #{platform}" do
+          it 'returns true when the `fips_enabled` file is present and contains "1"' do
+            @platform = platform
+            expect(host).to receive(:file_exist?).with('/proc/sys/crypto/fips_enabled').and_return(true)
+            expect(host).to receive(:execute).with("cat /proc/sys/crypto/fips_enabled").and_return("1")
+            expect(host.fips_mode?).to be true
+          end
+
+          it 'returns false when the `fips_enabled` file is present and contains "0"' do
+            @platform = platform
+            expect(host).to receive(:execute).with("cat /proc/sys/crypto/fips_enabled").and_return("0")
+            expect(host.fips_mode?).to be false
+          end
+        end
       end
     end
   end

data/spec/beaker/logger_spec.rb

@@ -17,12 +17,7 @@ module Beaker
         expect( logger.convert(valid_utf8) ).to be === valid_utf8
       end
       it 'strips out invalid utf-8 characters' do
-        #this is 1.9 behavior only
-        if RUBY_VERSION.to_f >= 1.9
-          expect( logger.convert(invalid_utf8) ).to be === valid_utf8
-        else
-          pending "not supported in ruby 1.8 (using #{RUBY_VERSION})"
-        end
+        expect( logger.convert(invalid_utf8) ).to be === valid_utf8
       end
       it 'supports frozen strings' do
         valid_utf8.freeze

data/spec/beaker/platform_spec.rb

@@ -145,7 +145,7 @@ module Beaker
       end
     end
 
-    context 'round tripping from yaml', if: RUBY_VERSION =~ /^1\.9/ do
+    context 'round tripping from yaml' do
       before do
         @name = 'ubuntu-14.04-x86_64'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.30.0
+  version: 4.34.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,48 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-abs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: beaker-vmpooler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -704,7 +676,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!