Merge pull request #657 from bastelfreak/stdlib9

Implement stdlib 9 compatibility

Author: tvpartytonight

.fixtures.yml

@@ -1,8 +1,7 @@
 fixtures:
+  repositories:
+    stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
   forge_modules:
-    stdlib:
-      repo: "puppetlabs/stdlib"
-      ref: "8.4.0"
     inifile:
       repo: "puppetlabs/inifile"
       ref: "5.3.0"
@@ -17,5 +16,3 @@ fixtures:
     facts:
       repo: "puppetlabs/facts"
       ref: "1.4.0"
-  symlinks:
-    puppet_agent: "#{source_dir}"

manifests/params.pp

@@ -43,8 +43,9 @@
   # The `is_pe` fact currently works by echoing out the puppet version
   # and greping for "puppet enterprise". With Puppet 4 and PE 2015.2, there
   # is no longer a "PE Puppet", and so that fact will no longer work.
-  # Instead check for the `is_pe` fact or if a PE provided function is available
-  $_is_pe = (getvar('::is_pe') or is_function_available('pe_compiling_server_version'))
+  # Instead check for the `is_pe` fact or if the `pe_anchor` resource type
+  # provided by the puppet_enterprise module exist.
+  $_is_pe = (getvar('::is_pe') or defined('pe_anchor'))
   if $_is_pe {
     # Calculate the default collection
     $_pe_version = pe_build_version()
@@ -68,17 +69,9 @@
     else {
       $collection = 'puppet8'
     }
-    # The aio puppet-agent version currently installed on the compiling master
-    # (only used in PE)
-    if is_function_available('pe_compiling_server_aio_build') {
-      $master_agent_version = pe_compiling_server_aio_build()
-    } else {
-      $master_agent_version = undef
-    }
   } else {
     $_pe_version = undef
     $pe_repo_dir = undef
-    $master_agent_version = undef
     $collection = 'PC1'
   }
 }

metadata.json

@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 5.1.0 < 9.0.0"
+      "version_requirement": ">= 5.1.0 < 10.0.0"
     },
     {
       "name": "puppetlabs-inifile",

spec/classes/puppet_agent_osfamily_aix_spec.rb

@@ -35,7 +35,6 @@
 
     before(:each) do
       Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) { |_args| '2000.0.0' }
-      Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) { |_args| '1.10.100' }
     end
 
     it { is_expected.to contain_file('/opt/puppetlabs') }
@@ -75,7 +74,6 @@
 
     before(:each) do
       Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) { |_args| '2000.0.0' }
-      Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) { |_args| '1.10.100' }
     end
 
     it {

spec/classes/puppet_agent_osfamily_darwin_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
 
 describe 'puppet_agent' do
-  master_package_version = '1.10.100'
   before(:each) do
     # Need to mock the PE functions
     Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args|
       '2000.0.0'
     end
 
-    Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-      master_package_version
-    end
-
     allow(Puppet::FileSystem).to receive(:exist?).and_call_original
     allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).and_call_original
     allow(Puppet::FileSystem).to receive(:exist?).with('/opt/puppetlabs/puppet/VERSION').and_return true

spec/classes/puppet_agent_osfamily_debian_spec.rb

@@ -38,10 +38,6 @@
       Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args|
         '2000.0.0'
       end
-
-      Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-        package_version
-      end
     end
 
     let(:facts) do

spec/classes/puppet_agent_osfamily_redhat_spec.rb

@@ -168,10 +168,6 @@
         Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args|
           '2000.0.0'
         end
-
-        Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-          '5.5.4'
-        end
       end
 
       let(:facts) do

spec/classes/puppet_agent_osfamily_solaris_spec.rb

@@ -100,10 +100,6 @@ def install_script(ver, arch)
         pe_version
       end
 
-      Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-        package_version
-      end
-
       # Ensure we get a versionable package provider
       pkg = Puppet::Type.type(:package)
       allow(pkg).to receive(:defaultprovider).and_return(pkg.provider(:pkg))
@@ -310,10 +306,6 @@ def install_script(ver, arch)
         Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args|
           pe_version
         end
-
-        Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-          package_version
-        end
       end
 
       let(:facts) do

spec/classes/puppet_agent_osfamily_suse_spec.rb

@@ -222,10 +222,6 @@
       Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue) do |_args|
         '2000.0.0'
       end
-
-      Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-        package_version
-      end
     end
 
     describe 'supported environment' do

spec/classes/puppet_agent_osfamily_windows_spec.rb

@@ -13,10 +13,6 @@
       pe_version
     end
 
-    Puppet::Parser::Functions.newfunction(:pe_compiling_server_aio_build, type: :rvalue) do |_args|
-      package_version
-    end
-
     allow(Puppet::Util).to receive(:absolute_path?).and_call_original
     allow(Puppet::Util).to receive(:absolute_path?).with(version_file).and_return true
     allow(Puppet::FileSystem).to receive(:exist?).and_call_original