(MODULES-8439) Fix sqlserver_instances custom fact (#314)

(MODULES-8439) Fix sqlserver_instances custom fact
puppetlabs · May 30, 2019 · d5b7731 · d5b7731
2 parents 693c254 + 046369b
commit d5b7731
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## Fixed
 
 - Add DQC to sqlserver_features feature attribute ([MODULES-8600](https://tickets.puppetlabs.com/browse/MODULES-8600))
+- Fix sqlserver_instances fact fails when registry contains uninstalled instances ([MODULES-8439](https://tickets.puppetlabs.com/browse/MODULES-8439))
 
 ## [2.5.0] - 2019-03-26
 

diff --git a/lib/puppet_x/sqlserver/features.rb b/lib/puppet_x/sqlserver/features.rb
@@ -86,14 +86,16 @@ def self.get_reg_instance_info(friendly_version)
             open(HKLM, "#{instance_root}\\#{instance_type}", KEY_READ | KEY64) do |instance|
               each_value(instance) do |short_name, _, long_name|
                 root = "Software\\Microsoft\\Microsoft SQL Server\\#{long_name}"
-                discovered[short_name] ||= {
-                  'name' => short_name,
-                  'reg_root' => [],
-                  'version' => open(HKLM, "#{root}\\MSSQLServer\\CurrentVersion", KEY_READ | KEY64) { |r| values(r)['CurrentVersion'] },
-                  'version_friendly' => friendly_version
-                }
-
-                discovered[short_name]['reg_root'].push(root)
+                if key_exists?("#{root}\\MSSQLServer\\CurrentVersion")
+                  discovered[short_name] ||= {
+                    'name' => short_name,
+                    'reg_root' => [],
+                    'version' => open(HKLM, "#{root}\\MSSQLServer\\CurrentVersion", KEY_READ | KEY64) { |r| values(r)['CurrentVersion'] },
+                    'version_friendly' => friendly_version
+                  }
+
+                  discovered[short_name]['reg_root'].push(root)
+                end
               end
             end
           end