Puppet 8 compat

Author: alvagante

CHANGELOG.md

@@ -10,6 +10,7 @@
     -   settings are computed in tp::install and used in tp::install::* defines
 -   get_version and url_replace functions accept an addtional version type paramter
 -   Widened support for variables in tinydata
+-   Removed legacy facts for Puppet 8 compatibility
 
 ## 3.9.1
 

manifests/install.pp

@@ -223,11 +223,13 @@
   $real_version = tp::get_version($ensure,$version,$tp_settings)
   $real_majversion = tp::get_version($ensure,$version,$tp_settings,'major')
   $real_filename = pick(tp::url_replace(pick(getvar("tp_settings.${real_install_method}.file_name"),$app), $real_version, $real_majversion), $app) # lint:ignore:140chars
-  if getvar('tp_settings.release.base_url') {
-    $real_base_url = tp::url_replace(pick(getvar("tp_settings.${real_install_method}.base_url"), $app), $real_version, $real_majversion)
-    $real_url = "${real_base_url}/${real_filename}"
-  } else {
-    tp::fail($on_missing_data, "tp::install::release - ${app} - Missing tinydata: settings.${real_install_method}.base_url") # lint:ignore:140chars
+  if $use_v4 {
+    if getvar('tp_settings.release.base_url') {
+      $real_base_url = tp::url_replace(pick(getvar("tp_settings.${real_install_method}.base_url"), $app), $real_version, $real_majversion)
+      $real_url = "${real_base_url}/${real_filename}"
+    } else {
+      tp::fail($on_missing_data, "tp::install::release - ${app} - Missing tinydata: settings.${real_install_method}.base_url") # lint:ignore:140chars
+    }
   }
 
   $extracted_dir = getvar('tp_settings.release.extracted_dir') ? {
@@ -255,7 +257,7 @@
       }),
       }),
       release => delete_undef_values({
-        base_url    => $real_base_url,
+        base_url    => pick_default($real_base_url),
         file_name   => $real_filename,
         url         => $real_url,
         extracted_dir => $extracted_dir,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "example42-tp",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "author": "example42",
   "summary": "Tiny Puppet",
   "license": "Apache-2.0",

templates/spec/osfamily.epp

@@ -1 +1 @@
-EPP: <%= $osfamily %>
+EPP: <%= $os['family'] %>

templates/spec/osfamily.erb

@@ -1 +1 @@
-ERB: <%= @osfamily %>
+ERB: <%= @os['family'] %>

templates/tp.epp

@@ -31,7 +31,7 @@ TP_TEST_DIR = '<%= $tp_dir %>/test'
 TP_INFO_DIR = '<%= $tp_dir %>/info'
 TP_DEBUG_DIR = '<%= $tp_dir %>/debug'
 
-<% if $osfamily == 'windows' { -%>
+<% if $os['family'] == 'windows' { -%>
 TINYDATA_DIRS = [
   "#{ENV['HOMEPATH']}/.puppetlabs/etc/code/modules/tinydata/data",
   - 'C:/Program Files/Puppet Labs/Puppet/puppet/modules/tinydata/data'
@@ -275,7 +275,7 @@ def desktop_apply(desktop_name,extra_options)
     repo_dirname=File.basename(repo_dir)
     local_modulepath=`puppet config print modulepath`.strip
     if File.exist?("#{repo_dir}/environment.conf")
-<% if $osfamily == 'windows' { -%>
+<% if $os['family']  == 'windows' { -%>
       modulepath="--modulepath #{repo_dir}/site:#{local_modulepath}:C:/ProgramData/PuppetLabs/code/environments/production/modules"
 <% } else { -%>
       modulepath="--modulepath #{repo_dir}/site:#{local_modulepath}:/etc/puppetlabs/code/environments/production/modules"

templates/tp.erb

@@ -27,7 +27,7 @@ TP_TEST_DIR = '<%= @tp_dir %>/test'
 TP_INFO_DIR = '<%= @tp_dir %>/info'
 TP_RUN_INFO_DIR = '<%= @tp_dir %>/run_info'
 
-<% if @osfamily == 'windows' -%>
+<% if @os['family'] == 'windows' -%>
 TINYDATA_DIRS = [
   "#{ENV['HOMEPATH']}/.puppetlabs/etc/code/modules/tinydata/data",
   - 'C:/Program Files/Puppet Labs/Puppet/puppet/modules/tinydata/data'
@@ -255,7 +255,7 @@ def desktop_apply(desktop_name,extra_options)
     repo_dirname=File.basename(repo_dir)
     local_modulepath=`puppet config print modulepath`.strip
     if File.exist?("#{repo_dir}/environment.conf")
-<% if @osfamily == 'windows' -%>
+<% if @os['family'] == 'windows' -%>
       modulepath="--modulepath #{repo_dir}/site:#{local_modulepath}:C:/ProgramData/PuppetLabs/code/environments/production/modules"
 <% else -%>
       modulepath="--modulepath #{repo_dir}/site:#{local_modulepath}:/etc/puppetlabs/code/environments/production/modules"