simp-beaker-helpers 1.19.3 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eede146380997a5256ef8fc379350b7b2b44e5a4a1156e5a14f13a5be0d396d
-  data.tar.gz: 31345b9736832c517f96e327dd18ddaca39c9eb72b0d94b9b56e83344f83d645
+  metadata.gz: 0a44635bd8cc4cc1a091769b42837b03e7711e280ce4e81a261614ff95ca0241
+  data.tar.gz: afbf39be4623d4abb203efcf4215d931cba9366ee1252658918d382d5e6191fd
 SHA512:
-  metadata.gz: 89e30957c049a514d97f58e99f2668682fa956e7a43a7414e69dff18d58f9af2f7ac2bf715ba72af97ffe6cdf93630dc3eeb68a45096b07adad069a907abaa93
-  data.tar.gz: 004cf046d60282beeecc534f39b45d4398cf4b35bccc0b9e46a6cdddf260cd2fd222ebb796e66e10f6cd9e518b7b806584716ccc0eb8734ff2c00181a3a53748
+  metadata.gz: e2e6e7bf750cb1b75240583efa6ae766981fe82be3fcfa59e498198285c97901569fd4a17857328497b54c55fbc098504883b1be9b5239db2809ba8a3c80ed90
+  data.tar.gz: 20ad194cabcf61d8489efb238ff5d9590c76c3d6e2ea850431d2a51b7295720bf75a8deb48b752c942e0fe0ca8322e5591cf5b2718d69c6a88d923165661c65c

data/.gitignore

@@ -1,3 +1,4 @@
+.fips_fixtures.yml
 *.gem
 *.swp
 Gemfile.lock

data/.gitlab-ci.yml

@@ -97,28 +97,25 @@ variables:
   changes:
     - .gitlab-ci.yml
     - .fixtures.yml
+    - .rspec
+    - metadata.json
     - "spec/spec_helper.rb"
-    - "spec/{classes,unit,defines,type_aliases,types,hosts}/**/*.rb"
-    - "{manifests,files,types}/**/*"
-    - "templates/*.{erb,epp}"
-    - "lib/**/*"
+    - "spec/{classes,unit,defines,type_aliases,types,hosts,lib}/**/*.rb"
+    - "{SIMP,data,manifests,files,types,lib}/**/*"
+    - "templates/**/*.{erb,epp}"
     - "Gemfile"
-    - "SIMP/**/*"
-    - "data/**/*"
   exists:
-    - "spec/{classes,unit,defines,type_aliases,types,hosts}/**/*_spec.rb"
+    - "spec/{classes,unit,defines,type_aliases,types,hosts,lib}/**/*_spec.rb"
 
 .relevant_file_conditions_trigger_acceptance_tests: &relevant_file_conditions_trigger_acceptance_tests
   changes:
     - .gitlab-ci.yml
+    - .fixtures.yml
     - "spec/spec_helper_acceptance.rb"
     - "spec/acceptance/**/*"
-    - "{manifests,files,types}/**/*"
-    - "templates/*.{erb,epp}"
-    - "lib/**/*"
+    - "{SIMP,data,manifests,files,types,lib}/**/*"
+    - "templates/**/*.{erb,epp}"
     - "Gemfile"
-    - "SIMP/**/*"
-    - "data/**/*"
   exists:
     - "spec/acceptance/**/*_spec.rb"
 
@@ -286,21 +283,14 @@ variables:
 pup5-unit:
   <<: *pup_5
   <<: *unit_tests
-  <<: *with_SIMP_SPEC_MATRIX_LEVEL_2
 
 pup6-unit:
   <<: *pup_6
   <<: *unit_tests
-  <<: *with_SIMP_SPEC_MATRIX_LEVEL_2
-
-pup6.18.0-unit:
-  <<: *pup_6_18_0
-  <<: *unit_tests
 
 pup7-unit:
   <<: *pup_7
   <<: *unit_tests
-  <<: *with_SIMP_SPEC_MATRIX_LEVEL_2
 
 # ------------------------------------------------------------------------------
 #             NOTICE: **This file is maintained with puppetsync**
@@ -312,6 +302,26 @@ pup7-unit:
 # Repo-specific content
 # ==============================================================================
 
+#=======================================================================
+# Packaging test
+
+pup5-pkg:
+  <<: *pup_5
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
+
+pup6-pkg:
+  <<: *pup_6
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
+
+pup7-pkg:
+  <<: *pup_7
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
 
 #=======================================================================
 # Acceptance tests

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.19.4 / 2021-01-05
+* Fixed:
+  * Only return a default empty string when `pfact_on` finds a `nil` value
+    * Added an acceptance test to validate this
+  * Ensure that we start with `facter -p` for `facter` < 4.0 and continue to
+      `puppet facts` otherwise
+  * Updated the Rakefile to skip symlinks in chmods which fixes the ability to
+    build gems
+
 ### 1.19.3 / 2021-01-01
 * Fixed:
   * Ensure that `pfact_on` can handle fact dot notation

data/Rakefile

@@ -30,7 +30,7 @@ task :chmod do
   gemspec = File.expand_path( "#{@package}.gemspec", @rakefile_dir ).strip
   spec = Gem::Specification::load( gemspec )
   spec.files.each do |file|
-    FileUtils.chmod 'go=r', file
+    FileUtils.chmod 'go=r', file unless File.symlink?(file)
   end
 end
 

data/lib/simp/beaker_helpers.rb

@@ -118,12 +118,31 @@ module Simp::BeakerHelpers
   def pfact_on(sut, fact_name)
     require 'ostruct'
 
+    # If puppet is not installed, there are no puppet facts to fetch
     if sut.which('puppet').empty?
       fact_on(sut, fact_name, :silent => true)
     else
-      facts_json = on(sut,'puppet facts find garbage_xxx', :silent => true).stdout
-      facts      = JSON.parse(facts_json, object_class: OpenStruct).values
-      facts.dig(*(fact_name.split('.'))) || ''
+      facts_json = nil
+      begin
+        cmd_output = on(sut, 'facter -p --json', :silent => true)
+
+        # Facter 4+
+        raise('skip facter -p') if (cmd_output.stderr =~ /no longer supported/)
+
+        facts = JSON.parse(cmd_output.stdout, object_class: OpenStruct)
+      rescue StandardError
+        # If *anything* fails, we need to fall back to `puppet facts`
+
+        facts_json = on(sut, 'puppet facts find garbage_xxx', :silent => true).stdout
+        facts = JSON.parse(facts_json, object_class: OpenStruct).values
+      end
+
+      found_fact = facts.dig(*(fact_name.split('.')))
+
+      # Fall back to the behavior in fact_on
+      found_fact = '' if found_fact.nil?
+
+      return found_fact
     end
   end
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.19.3'
+  VERSION = '1.19.4'
 end

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -29,4 +29,12 @@ context 'after copy_fixture_modules_to( hosts )' do
       expect(pfact_on(master, 'os.release.foo')).to eq ''
     end
   end
+
+  describe "pfact_on(master,'fips_enabled')" do
+    expected = (ENV['BEAKER_fips'] == 'yes')
+
+    it 'should return false' do
+      expect(pfact_on(master, 'fips_enabled')).to eq expected
+    end
+  end
 end

data/spec/acceptance/suites/default/nodesets

@@ -0,0 +1 @@
+../../nodesets

data/spec/acceptance/suites/fips_from_fixtures/nodesets

@@ -0,0 +1 @@
+../../nodesets

data/spec/acceptance/suites/snapshot/nodesets

@@ -0,0 +1 @@
+../../nodesets

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -103,8 +103,21 @@ describe 'Simp::BeakerHelpers' do
     end
 
     it 'uses defaults when no environment variables are set' do
-      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
-      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
+
+      # Prevent namespace pollution
+      pipe_out,pipe_in = IO.pipe
+      fork do
+        pipe_out.close
+        require 'puppet'
+        pipe_in.write(Puppet.version)
+      end
+      pipe_in.close
+
+      expected_version = pipe_out.gets
+      expected_major_version = expected_version.split('.').first
+
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(expected_version)
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq("puppet#{expected_major_version}")
       expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.19.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -192,11 +192,13 @@ files:
 - spec/acceptance/suites/default/enable_fips_spec.rb
 - spec/acceptance/suites/default/fixture_modules_spec.rb
 - spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
+- spec/acceptance/suites/default/nodesets
 - spec/acceptance/suites/default/pki_tests_spec.rb
 - spec/acceptance/suites/default/set_hieradata_on_spec.rb
 - spec/acceptance/suites/default/write_hieradata_to_spec.rb
 - spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
 - spec/acceptance/suites/fips_from_fixtures/metadata.yml
+- spec/acceptance/suites/fips_from_fixtures/nodesets
 - spec/acceptance/suites/offline/00_default_spec.rb
 - spec/acceptance/suites/offline/README
 - spec/acceptance/suites/offline/nodesets/default.yml
@@ -204,6 +206,7 @@ files:
 - spec/acceptance/suites/puppet_collections/metadata.yml
 - spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
 - spec/acceptance/suites/snapshot/10_general_usage_spec.rb
+- spec/acceptance/suites/snapshot/nodesets
 - spec/acceptance/suites/windows/00_default_spec.rb
 - spec/acceptance/suites/windows/metadata.yml
 - spec/acceptance/suites/windows/nodesets/default.yml
@@ -242,11 +245,13 @@ test_files:
 - spec/acceptance/suites/default/enable_fips_spec.rb
 - spec/acceptance/suites/default/fixture_modules_spec.rb
 - spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
+- spec/acceptance/suites/default/nodesets
 - spec/acceptance/suites/default/pki_tests_spec.rb
 - spec/acceptance/suites/default/set_hieradata_on_spec.rb
 - spec/acceptance/suites/default/write_hieradata_to_spec.rb
 - spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
 - spec/acceptance/suites/fips_from_fixtures/metadata.yml
+- spec/acceptance/suites/fips_from_fixtures/nodesets
 - spec/acceptance/suites/offline/00_default_spec.rb
 - spec/acceptance/suites/offline/README
 - spec/acceptance/suites/offline/nodesets/default.yml
@@ -254,6 +259,7 @@ test_files:
 - spec/acceptance/suites/puppet_collections/metadata.yml
 - spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
 - spec/acceptance/suites/snapshot/10_general_usage_spec.rb
+- spec/acceptance/suites/snapshot/nodesets
 - spec/acceptance/suites/windows/00_default_spec.rb
 - spec/acceptance/suites/windows/metadata.yml
 - spec/acceptance/suites/windows/nodesets/default.yml