simp-beaker-helpers 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0593bcb8d63201d20046c6799d7a18c1f6ca7f79302f424dc4d976fd7862c5f
-  data.tar.gz: eeb45a788d488c0a12c6b172f9c41bb3e15f592916db72dec843c135f4593470
+  metadata.gz: ccdf0a376a641c3380cf3007e24ad0fcdb09465f98e45fc6bac483eb897a28bf
+  data.tar.gz: d11989a7cc3be493a17ff575b8394a762f180cf4889ca2e223cfccd230ff50b9
 SHA512:
-  metadata.gz: 3616faeb4838f048f575ed0e6764c26f947be7c7e51fa3925080b464bbe363872075427d528f1025ce148f4965abb08aa67211421aaa61063db06ad993e5b0df
-  data.tar.gz: 7611ae390dab78771280651c0101e721a8c2b3abf018d22c59805f146fcbf3db80b1647e00377f4320a0a862a1fc6a21f7a71d77893168393ec232a2aa35d2d0
+  metadata.gz: d06ef5f63eae54bd6889d32b3b53069d6836ac6f8855520f4ce29f151b708e0f5a49167d3aee33cdcb1295930b3ac717a2b9277396d34adaef413e65c29bd2e9
+  data.tar.gz: 2da83080d5daabe72885096d423aa0de6ae1d5b246570f186b86bc8f70842df9c09f1bc79a0f4a9d80c2822b772d0a407ad3c16076c8eaf04262e925aa450f93

data/.rubocop.yml

@@ -0,0 +1,546 @@
+require: rubocop-rspec
+AllCops:
+  TargetRubyVersion: 2.4
+  Include:
+    - ./**/*.rb
+  Exclude:
+    - files/**/*
+    - vendor/**/*
+    - .vendor/**/*
+    - pkg/**/*
+    - spec/fixtures/**/*
+    - Gemfile
+    - Rakefile
+    - Guardfile
+    - Vagrantfile
+Lint/ConditionPosition:
+  Enabled: True
+
+Lint/ElseLayout:
+  Enabled: True
+
+Lint/UnreachableCode:
+  Enabled: True
+
+Lint/UselessComparison:
+  Enabled: True
+
+Lint/EnsureReturn:
+  Enabled: True
+
+Lint/HandleExceptions:
+  Enabled: True
+
+Lint/LiteralAsCondition:
+  Enabled: True
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: True
+
+Lint/LiteralInInterpolation:
+  Enabled: True
+
+Style/HashSyntax:
+  Enabled: False
+
+Style/RedundantReturn:
+  Enabled: True
+
+Layout/EndOfLine:
+  Enabled: False
+
+Lint/AmbiguousOperator:
+  Enabled: True
+
+Lint/AssignmentInCondition:
+  Enabled: True
+
+Layout/SpaceBeforeComment:
+  Enabled: True
+
+Style/AndOr:
+  Enabled: True
+
+Style/RedundantSelf:
+  Enabled: True
+
+Metrics/BlockLength:
+  Enabled: False
+
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: False
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: False
+
+Style/WhileUntilModifier:
+  Enabled: True
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: True
+
+Security/Eval:
+  Enabled: True
+
+Lint/BlockAlignment:
+  Enabled: True
+
+Lint/DefEndAlignment:
+  Enabled: True
+
+Lint/EndAlignment:
+  Enabled: True
+
+Lint/DeprecatedClassMethods:
+  Enabled: True
+
+Lint/Loop:
+  Enabled: True
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: True
+
+Lint/RescueException:
+  Enabled: True
+
+Lint/StringConversionInInterpolation:
+  Enabled: True
+
+Lint/UnusedBlockArgument:
+  Enabled: True
+
+Lint/UnusedMethodArgument:
+  Enabled: True
+
+Lint/UselessAccessModifier:
+  Enabled: True
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Lint/Void:
+  Enabled: True
+
+Layout/AccessModifierIndentation:
+  Enabled: True
+
+Naming/AccessorMethodName:
+  Enabled: True
+
+Style/Alias:
+  Enabled: True
+
+Layout/AlignArray:
+  Enabled: True
+
+Layout/AlignHash:
+  Enabled: True
+
+Layout/AlignParameters:
+  Enabled: True
+
+Metrics/BlockNesting:
+  Enabled: True
+
+Style/AsciiComments:
+  Enabled: True
+
+Style/Attr:
+  Enabled: True
+
+Style/BracesAroundHashParameters:
+  Enabled: True
+
+Style/CaseEquality:
+  Enabled: True
+
+Layout/CaseIndentation:
+  Enabled: True
+
+Style/CharacterLiteral:
+  Enabled: True
+
+Naming/ClassAndModuleCamelCase:
+  Enabled: True
+
+Style/ClassAndModuleChildren:
+  Enabled: False
+
+Style/ClassCheck:
+  Enabled: True
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: False
+
+Style/ClassMethods:
+  Enabled: True
+
+Style/ClassVars:
+  Enabled: True
+
+Style/WhenThen:
+  Enabled: True
+
+Style/WordArray:
+  Enabled: True
+
+Style/UnneededPercentQ:
+  Enabled: True
+
+Layout/Tab:
+  Enabled: True
+
+Layout/SpaceBeforeSemicolon:
+  Enabled: True
+
+Layout/TrailingBlankLines:
+  Enabled: True
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: True
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: True
+
+Layout/SpaceInsideParens:
+  Enabled: True
+
+Layout/LeadingCommentSpace:
+  Enabled: True
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: True
+
+Layout/SpaceAfterColon:
+  Enabled: True
+
+Layout/SpaceAfterComma:
+  Enabled: True
+
+Layout/SpaceAfterMethodName:
+  Enabled: True
+
+Layout/SpaceAfterNot:
+  Enabled: True
+
+Layout/SpaceAfterSemicolon:
+  Enabled: True
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: True
+
+Layout/SpaceAroundOperators:
+  Enabled: True
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: True
+
+Layout/SpaceBeforeComma:
+  Enabled: True
+
+Style/CollectionMethods:
+  Enabled: True
+
+Layout/CommentIndentation:
+  Enabled: True
+
+Style/ColonMethodCall:
+  Enabled: True
+
+Style/CommentAnnotation:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: False
+
+Naming/ConstantName:
+  Enabled: True
+
+Style/Documentation:
+  Enabled: False
+
+Style/DefWithParentheses:
+  Enabled: True
+
+Style/PreferredHashMethods:
+  Enabled: True
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: True
+
+Style/EachWithObject:
+  Enabled: True
+
+Layout/EmptyLineBetweenDefs:
+  Enabled: True
+
+Layout/IndentArray:
+  Enabled: True
+
+Layout/IndentHash:
+  Enabled: True
+
+Layout/IndentationConsistency:
+  Enabled: True
+
+Layout/IndentationWidth:
+  Enabled: True
+
+Layout/EmptyLines:
+  Enabled: True
+
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: True
+
+Style/EmptyLiteral:
+  Enabled: True
+
+# Configuration parameters: AllowURI, URISchemes.
+Layout/TrailingWhitespace:
+  Enabled: True
+
+Metrics/LineLength:
+  Enabled: False
+
+Naming/BinaryOperatorParameterName:
+  Enabled: True
+
+Style/CommandLiteral:
+  EnforcedStyle: percent_x
+  Enabled: True
+
+Style/MethodCallWithoutArgsParentheses:
+  Enabled: True
+
+Style/MethodDefParentheses:
+  Enabled: True
+
+Style/LineEndConcatenation:
+  Enabled: True
+
+Style/StringLiterals:
+  Enabled: True
+
+Style/TrailingCommaInArguments:
+  Enabled: True
+
+Style/TrailingCommaInLiteral:
+  Enabled: True
+
+Style/GlobalVars:
+  Enabled: True
+
+Style/GuardClause:
+  Enabled: True
+
+Style/IfUnlessModifier:
+  Enabled: True
+
+Style/MultilineIfThen:
+  Enabled: True
+
+Style/NegatedIf:
+  Enabled: True
+
+Style/NegatedWhile:
+  Enabled: True
+
+Style/Next:
+  Enabled: True
+
+Style/SingleLineBlockParams:
+  Enabled: True
+
+Style/SingleLineMethods:
+  Enabled: True
+
+Style/SpecialGlobalVars:
+  Enabled: True
+
+Style/TrivialAccessors:
+  Enabled: True
+
+Style/UnlessElse:
+  Enabled: True
+
+Style/VariableInterpolation:
+  Enabled: True
+
+Naming/VariableName:
+  Enabled: True
+
+Style/WhileUntilDo:
+  Enabled: True
+
+Style/EvenOdd:
+  Enabled: True
+
+Naming/FileName:
+  Enabled: True
+
+Style/For:
+  Enabled: True
+
+Style/Lambda:
+  Enabled: True
+
+Naming/MethodName:
+  Enabled: True
+
+Style/MultilineTernaryOperator:
+  Enabled: True
+
+Style/NestedTernaryOperator:
+  Enabled: True
+
+Style/NilComparison:
+  Enabled: True
+
+Style/FormatString:
+  Enabled: True
+
+Style/MultilineBlockChain:
+  Enabled: True
+
+Style/Semicolon:
+  Enabled: True
+
+Style/SignalException:
+  Enabled: True
+
+Style/NonNilCheck:
+  Enabled: True
+
+Style/Not:
+  Enabled: True
+
+Style/NumericLiterals:
+  Enabled: True
+
+Style/OneLineConditional:
+  Enabled: True
+
+Style/ParenthesesAroundCondition:
+  Enabled: True
+
+Style/PercentLiteralDelimiters:
+  Enabled: True
+
+Style/PerlBackrefs:
+  Enabled: True
+
+Naming/PredicateName:
+  Enabled: True
+
+Style/RedundantException:
+  Enabled: True
+
+Style/SelfAssignment:
+  Enabled: True
+
+Style/Proc:
+  Enabled: True
+
+Style/RaiseArgs:
+  Enabled: True
+
+Style/RedundantBegin:
+  Enabled: True
+
+Style/RescueModifier:
+  Enabled: True
+
+# based on https://github.com/voxpupuli/modulesync_config/issues/168
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Enabled: True
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: True
+
+Metrics/ParameterLists:
+  Enabled: False
+
+Lint/RequireParentheses:
+  Enabled: True
+
+Style/ModuleFunction:
+  Enabled: True
+
+Lint/Debugger:
+  Enabled: True
+
+Style/IfWithSemicolon:
+  Enabled: True
+
+Style/Encoding:
+  Enabled: True
+
+Style/BlockDelimiters:
+  Enabled: True
+
+Layout/MultilineBlockLayout:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
+  Enabled: False
+
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
+  Enabled: False
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Layout/ClosingParenthesisIndentation:
+  Enabled: True
+
+# RSpec
+
+RSpec/BeforeAfterAll:
+  Exclude:
+    - spec/acceptance/**/*
+
+# We don't use rspec in this way
+RSpec/DescribeClass:
+  Enabled: False
+
+# Example length is not necessarily an indicator of code quality
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/NamedSubject:
+  Enabled: False
+
+# disabled for now since they cause a lot of issues
+# these issues aren't easy to fix
+RSpec/RepeatedDescription:
+  Enabled: False
+
+RSpec/NestedGroups:
+  Enabled: False
+
+# this is broken on ruby1.9
+Layout/IndentHeredoc:
+  Enabled: False
+
+# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
+Security/YAMLLoad:
+  Enabled: false
+
+# This affects hiera interpolation, as well as some configs that we push.
+Style/FormatStringToken:
+  Enabled: false
+
+# This is useful, but sometimes a little too picky about where unit tests files
+# are located.
+RSpec/FilePath:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.10.0 / 2018-01-23
+* Add support for Puppet 5
+  * Note: you need to set 'puppet_collection' to 'puppet5' to test Puppet 5 and
+    'aio' (or leave it out) to test Puppet less than 5
+* Fix support for passing the 'ALL' suite to run all suites
+* Updates per Rubocop
+
+* Ensure that `rsync` is not used once `fips` is enabled on the SUT
+  * If `fips` is enabled on the SUT, but not the running host, rsync
+    connections have a high likelihood of failing
+
 ### 1.9.0 / 2018-01-01
 * Ensure that all host IP addresses get added to the internally generated PKI
   keys as subjectAltNames. Kubernetes needs this and it does not hurt to have

data/Gemfile

@@ -13,10 +13,11 @@ gem 'bundler'
 gem 'rake'
 
 group :system_tests do
-  gem 'pry'
   gem 'beaker'
   gem 'beaker-rspec'
   gem 'net-ssh'
-  gem 'puppetlabs_spec_helper'
   gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 4.0')
+  gem 'puppetlabs_spec_helper'
+  gem 'rubocop'
+  gem 'rubocop-rspec'
 end

data/files/puppet-agent-versions.yaml

@@ -5,6 +5,9 @@
 #
 version_mappings:
   '5.0.0': '5.0.0'
+  '4.10.7': '1.10.7'
+  '4.10.6': '1.10.6'
+  '4.10.5': '1.10.5'
   '4.10.4': '1.10.4'
   '4.10.3': '1.10.3'
   '4.10.2': '1.10.2'

data/lib/simp/beaker_helpers.rb

@@ -11,14 +11,22 @@ module Simp::BeakerHelpers
   # oldest system that we support.
   DEFAULT_PUPPET_AGENT_VERSION = '1.7.1'
 
+  # We can't cache this because it may change during a run
+  def fips_enabled(sut)
+    return on( sut,
+              'cat /proc/sys/crypto/fips_enabled 2>/dev/null',
+              :accept_all_exit_codes => true
+             ).output.strip == '1'
+  end
+
   # Figure out the best method to copy files to a host and use it
   #
   # Will create the directories leading up to the target if they don't exist
   def copy_to(sut, src, dest, opts={})
-    unless @has_rsync
+    unless fips_enabled(sut) || @has_rsync
       %x{which rsync 2>/dev/null}.strip
 
-      @has_rsync = $?.success?
+      @has_rsync = !$?.nil? && $?.success?
     end
 
     sut.mkdir_p(File.dirname(dest))
@@ -695,12 +703,22 @@ done
   # Replacement for `install_puppet` in spec_helper_acceptance.rb
   def install_puppet
     puppet_install_type = ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
-    puppet_agent_version = (
-      ENV.fetch('PUPPET_INSTALL_VERSION', nil) ||
-      latest_puppet_agent_version_for(ENV.fetch('PUPPET_VERSION',nil)) ||
-      DEFAULT_PUPPET_AGENT_VERSION
-    )
+
+    puppet_agent_version = ENV.fetch('PUPPET_INSTALL_VERSION', nil)
+
+    unless puppet_agent_version
+      if host.options['puppet_collection'] && host.options['puppet_collection'] =~ /puppet(\d+)/
+        puppet_agent_version = latest_puppet_agent_version_for($1)
+      else
+        puppet_agent_version = (
+          latest_puppet_agent_version_for(ENV.fetch('PUPPET_VERSION',nil)) ||
+          DEFAULT_PUPPET_AGENT_VERSION
+        )
+      end
+    end
+
     require 'beaker/puppet_install_helper'
+
     run_puppet_install_helper(puppet_install_type,  puppet_agent_version)
   end
 end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/lib/simp/rake/beaker.rb

@@ -117,7 +117,7 @@ module Simp::Rake
 
           raise("Error: Suites Directory at '#{suite_basedir}'!") unless File.directory?(suite_basedir)
 
-          if suite
+          if suite && (suite != 'ALL')
             unless File.directory?(File.join(suite_basedir, suite))
               STDERR.puts("Error: Could not find suite '#{suite}'")
               STDERR.puts("Available Suites:")
@@ -139,7 +139,8 @@ module Simp::Rake
           end
 
           suites = Hash.new
-          if suite
+
+          if suite && (suite != 'ALL')
             suites[suite] = Hash.new
             # If a suite was set, make sure it runs.
             suites[suite]['default_run'] = true
@@ -147,6 +148,10 @@ module Simp::Rake
             Dir.glob(File.join(suite_basedir,'*')) do |file|
               if File.directory?(file)
                 suites[File.basename(file)] = Hash.new
+
+                if suite == 'ALL'
+                  suites[File.basename(file)]['default_run'] = true
+                end
               end
             end
           end

data/simp-beaker-helpers.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
   s.add_runtime_dependency 'beaker', '~> 3.14'
+  s.add_runtime_dependency 'beaker-puppet', '~> 0.8.0'
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.6'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")

data/spec/acceptance/check_puppet_version_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper_acceptance'
+
+hosts.each do |host|
+  describe 'make sure puppet version is valid' do
+    context "on #{host}" do
+      puppet_collection = host.options[:puppet_collection]
+
+      client_puppet_version = on(host, 'puppet --version').output.strip
+
+      if puppet_collection =~ /puppet(\d+)/
+        puppet_collection_version = $1
+
+        it "should be running puppet version #{puppet_collection_version}" do
+          expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
+        end
+      else
+        it 'should not be running puppet 5+' do
+          expect(client_puppet_version.split('.').first).to be < '5'
+        end
+      end
+    end
+  end
+end

data/spec/acceptance/nodesets/puppet5.yml

@@ -0,0 +1,23 @@
+HOSTS:
+  server-el7:
+    roles:
+      - server
+      - default
+      - master
+      - el7
+    platform:   el-7-x86_64
+    box:        centos/7
+    hypervisor: vagrant
+
+  server-el6:
+    roles:
+      - el6
+    platform:   el-6-x86_64
+    box:        centos/6
+    hypervisor: vagrant
+
+CONFIG:
+  log_level: verbose
+  type:      aio
+  puppet_collection: puppet5
+  vagrant_memsize: 256

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: beaker-puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: beaker-puppet_install_helper
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +63,7 @@ files:
 - ".fixtures.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -66,9 +81,11 @@ files:
 - lib/simp/beaker_helpers/version.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
+- spec/acceptance/check_puppet_version_spec.rb
 - spec/acceptance/enable_fips_spec.rb
 - spec/acceptance/fixture_modules_spec.rb
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/puppet5.yml
 - spec/acceptance/pki_tests_spec.rb
 - spec/acceptance/set_hieradata_on_spec.rb
 - spec/acceptance/write_hieradata_to_spec.rb