From 88c97d8eafaef42ea9bd3e787ae06e070b267818 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albert.vaca@datadoghq.com>
Date: Fri, 23 Apr 2021 12:19:40 +0200
Subject: [PATCH] Fix tool_version being unknown in install_info

---
 manifests/init.pp                  | 2 --
 spec/classes/datadog_agent_spec.rb | 2 +-
 templates/install_info.erb         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 9b51cd046..18fb833db 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -400,8 +400,6 @@
     $local_integrations = $integrations
   }
 
-  $_puppetversion = lookup({ 'name' => '::puppetversion', 'default_value' => 'unknown'})
-
   include datadog_agent::params
   case upcase($log_level) {
     'CRITICAL': { $_loglevel = 'CRITICAL' }
diff --git a/spec/classes/datadog_agent_spec.rb b/spec/classes/datadog_agent_spec.rb
index 3acb89132..a8237d05c 100644
--- a/spec/classes/datadog_agent_spec.rb
+++ b/spec/classes/datadog_agent_spec.rb
@@ -1701,7 +1701,7 @@
           it 'adds an install_info' do
             expect(install_info['install_method']).to match(
               'tool' => 'puppet',
-              'tool_version' => %r{^puppet-(\d+\.\d+\.\d+|unknown)$},
+              'tool_version' => %r{^puppet-unknown$}, # puppetversion is not set in tests, this field has to be tested manually
               'installer_version' => %r{^datadog_module-\d+\.\d+\.\d+$},
             )
           end
diff --git a/templates/install_info.erb b/templates/install_info.erb
index 8036d7db8..fa2c7c254 100644
--- a/templates/install_info.erb
+++ b/templates/install_info.erb
@@ -1,5 +1,5 @@
 ---
 install_method:
   tool: puppet
-  tool_version: puppet-<%= @_puppetversion %>
+  tool_version: puppet-<%= @facts['puppetversion'] or 'unknown' %>
   installer_version: datadog_module-<%= @module_metadata['version'] %>