(CONT-237) - Remove legacy code (pre v6)

Author: chelnak

lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -66,7 +66,7 @@ def verify_contents(subject, title, expected_lines)
     c.formatter = 'RSpec::Github::Formatter'
   end
 
-  c.environmentpath = spec_path if Puppet.version.to_f >= 4.0
+  c.environmentpath = spec_path
   c.module_path = module_path
   c.manifest_dir = File.join(fixture_path, 'manifests')
   c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'
@@ -78,12 +78,7 @@ def verify_contents(subject, title, expected_lines)
       Puppet.features.stubs(:root?).returns(true)
     end
 
-    # stringify_facts and trusted_node_data were removed in puppet4
-    if Puppet.version.to_f < 4.0
-      Puppet.settings[:stringify_facts] = false if ENV['STRINGIFY_FACTS'] == 'no'
-      Puppet.settings[:trusted_node_data] = true if ENV['TRUSTED_NODE_DATA'] == 'yes'
-    end
-    Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes' || (Puppet.version.to_f >= 4.0 && ENV['STRICT_VARIABLES'] != 'no')
+    Puppet.settings[:strict_variables] = true if ENV['STRICT_VARIABLES'] == 'yes' || ENV['STRICT_VARIABLES'] != 'no'
     Puppet.settings[:ordering] = ENV['ORDERING'] if ENV['ORDERING']
   end
 end

lib/puppetlabs_spec_helper/puppet_spec_helper.rb

@@ -51,83 +51,6 @@
   # Continue gracefully
 end
 
-# This is just a utility class to allow us to isolate the various version-specific
-# branches of initialization logic into methods without polluting the global namespace.#
-class Puppet::PuppetSpecInitializer
-  # This method is for initializing puppet state for testing for older versions
-  # of puppet that do not support the new TestHelper API.  As you can see,
-  # this involves explicitly modifying global variables, directly manipulating
-  # Puppet's Settings singleton object, and other fun implementation details
-  # that code external to puppet should really never know about.
-  def self.initialize_via_fallback_compatibility(config)
-    warn('Warning: you appear to be using an older version of puppet; spec_helper will use fallback compatibility mode.')
-    config.before :all do
-      # nothing to do for now
-    end
-
-    config.after :all do
-      # nothing to do for now
-    end
-
-    config.before :each do
-      # these globals are set by Application
-      $puppet_application_mode = nil # rubocop:disable Style/GlobalVars
-      $puppet_application_name = nil # rubocop:disable Style/GlobalVars
-
-      # REVISIT: I think this conceals other bad tests, but I don't have time to
-      # fully diagnose those right now.  When you read this, please come tell me
-      # I suck for letting this float. --daniel 2011-04-21
-      Signal.stubs(:trap)
-
-      # Set the confdir and vardir to gibberish so that tests
-      # have to be correctly mocked.
-      Puppet[:confdir] = '/dev/null'
-      Puppet[:vardir] = '/dev/null'
-
-      # Avoid opening ports to the outside world
-      Puppet.settings[:bindaddress] = '127.0.0.1'
-    end
-
-    config.after :each do
-      Puppet.settings.clear
-
-      Puppet::Node::Environment.clear
-      Puppet::Util::Storage.clear
-      Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? 'ExecutionStub'
-
-      PuppetlabsSpec::Files.cleanup
-    end
-  end
-end
-
-# JJM Hack to make the stdlib tests run in Puppet 2.6 (See puppet commit cf183534)
-unless Puppet.constants.include? 'Test'
-  module Puppet::Test
-    # This is a stub class to allow the stdlib tests to run in Puppet 2.6
-    # This class will be removed in another commit.
-    class LogCollector
-      def initialize(logs)
-        @logs = logs
-      end
-
-      def <<(value)
-        @logs << value
-      end
-    end
-  end
-  Puppet::Util::Log.newdesttype :log_collector do
-    match 'Puppet::Test::LogCollector'
-
-    def initialize(messages)
-      @messages = messages
-    end
-
-    def handle(msg)
-      @messages << msg
-    end
-  end
-end
-
 # And here is where we do the main rspec configuration / setup.
 RSpec.configure do |config|
   # Detect whether the module is overriding the choice of mocking framework

lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -122,22 +122,10 @@
 
 desc 'Build puppet module package'
 task :build do
-  if Gem::Specification.find_by_name('puppet').version < Gem::Version.new('6.0.0')
-    Rake::Task['build:pmt'].invoke
-  else
-    Rake::Task['build:pdk'].invoke
-  end
+  Rake::Task['build:pdk'].invoke
 end
 
 namespace :build do
-  desc 'Build Puppet module package with PMT (Puppet < 6.0.0 only)'
-  task :pmt do
-    require 'puppet/face'
-
-    pmod = Puppet::Face['module', :current]
-    pmod.build('./')
-  end
-
   desc 'Build Puppet module with PDK'
   task :pdk do
     require 'pdk/util'
@@ -204,9 +192,6 @@
 PuppetSyntax.exclude_paths << 'vendor/**/*'
 PuppetSyntax.exclude_paths << '.vendor/**/*'
 PuppetSyntax.exclude_paths << 'plans/**/*'
-if Puppet.version.to_f < 4.0
-  PuppetSyntax.exclude_paths << 'types/**/*'
-end
 
 desc 'Check syntax of Ruby files and call :syntax and :metadata_lint'
 task :validate do
@@ -254,7 +239,7 @@
   # If the branch is a release branch we append an 'r' into the new_version,
   # this is due to the release branch buildID conflicting with main branch when trying to push to the staging forge.
   # More info can be found at https://tickets.puppetlabs.com/browse/FM-6170
-  new_version = if (build = (ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER']))
+  new_version = if (build = ENV['BUILD_NUMBER'])
                   if branch.eql? 'release'
                     '%s-%s%04d-%s' % [version, 'r', build, sha] # legacy support code # rubocop:disable Style/FormatStringToken
                   else