(FM-2790) Return SQL installations as Facter facts

 - Fact 'sqlserver_installs' contains all detailed installation information
 - Fact 'sqlserver_instance_names' contains all instance names
   segregated by SQL version
 - run_discovery_script method has been completely removed in favor
   of leveraging Facts

 - note that to make the output compatible with Facter, the Ruby symbols
   used in the hashes returned from PuppetX::Sqlserver::Features have
   all been changed to bare strings

Author: Iristyle

lib/facter/sqlserver_installs.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'puppet_x/sqlserver/features'))
+
+Facter.add(:sqlserver_installs) do
+  confine :osfamily => :windows
+
+  setcode do
+    PuppetX::Sqlserver::Features.get_installations
+  end
+end

lib/facter/sqlserver_instance_names.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'puppet_x/sqlserver/features'))
+
+Facter.add(:sqlserver_instance_names) do
+  confine :osfamily => :windows
+
+  setcode do
+    PuppetX::Sqlserver::Features.get_instance_names
+  end
+end

lib/puppet/provider/sqlserver.rb

@@ -39,13 +39,6 @@ def not_nil_and_not_empty?(obj)
     !obj.nil? and !obj.empty?
   end
 
-  def self.run_discovery_script
-    installs = PuppetX::Sqlserver::Features.get_installations
-    return installs[SQL_2014] if !installs[SQL_2014].empty?
-
-    installs[SQL_2012]
-  end
-
   def self.run_install_dot_net
     install_dot_net = <<-DOTNET
 Install-WindowsFeature  NET-Framework-Core

lib/puppet/provider/sqlserver_features/mssql.rb

@@ -8,14 +8,15 @@
 Puppet::Type::type(:sqlserver_features).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
   def self.instances
     instances = []
-    result = Puppet::Provider::Sqlserver.run_discovery_script
+    result = Facter.value(:sqlserver_installs)
     debug "Parsing result #{result}"
-    if !result[:features].empty?
+    result = !result[SQL_2014].empty? ? result[SQL_2014] : result[SQL_2012]
+    if !result['features'].empty?
       existing_instance = {:name => "Generic Features",
                            :ensure => :present,
                            :features =>
                              PuppetX::Sqlserver::ServerHelper.translate_features(
-                               result[:features]).sort!
+                               result['features']).sort!
       }
       debug "Parsed features = #{existing_instance[:features]}"
 

lib/puppet/provider/sqlserver_instance/mssql.rb

@@ -9,14 +9,15 @@
 Puppet::Type::type(:sqlserver_instance).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
   def self.instances
     instances = []
-    result = Puppet::Provider::Sqlserver.run_discovery_script
+    result = Facter.value(:sqlserver_installs)
     debug "Parsing result #{result}"
-    result.keys.reject { |key| key == :features }.each do |instance_name|
+    result = !result[SQL_2014].empty? ? result[SQL_2014] : result[SQL_2012]
+    result.keys.reject { |key| key == 'features' }.each do |instance_name|
         existing_instance = {:name => instance_name,
                              :ensure => :present,
                              :features =>
                                PuppetX::Sqlserver::ServerHelper.translate_features(
-                                 result[instance_name][:features]).sort!
+                                 result[instance_name]['features']).sort!
         }
         instance = new(existing_instance)
         instances << instance

lib/puppet_x/sqlserver/features.rb

@@ -89,11 +89,11 @@ def self.get_sql_property_values(version, instance_name, property_name)
 
       def self.get_wmi_instance_info(version, instance_name)
         {
-          :name => instance_name,
-          :version_friendly => version,
-          :version => get_sql_property_values(version, instance_name, 'VERSION').first,
+          'name' => instance_name,
+          'version_friendly' => version,
+          'version' => get_sql_property_values(version, instance_name, 'VERSION').first,
           # typically Software\Microsoft\Microsoft SQL Server\MSSQL11.MSSQLSERVER
-          :reg_root => get_sql_property_values(version, instance_name, 'REGROOT').first,
+          'reg_root' => get_sql_property_values(version, instance_name, 'REGROOT').first,
         }
       end
 
@@ -153,11 +153,11 @@ def self.get_shared_features(version, reg_root)
       #   "SQL_2012" => {},
       #   "SQL_2014" => {
       #     "MSSQLSERVER" => {
-      #       :name => "MSSQLSERVER",
-      #       :version_friendly => "SQL_2014",
-      #       :version => "12.0.2000.8",
-      #       :reg_root => "Software\\Microsoft\\Microsoft SQL Server\\MSSQL12.MSSQLSERVER",
-      #       :features => [
+      #       "name" => "MSSQLSERVER",
+      #       "version_friendly" => "SQL_2014",
+      #       "version" => "12.0.2000.8",
+      #       "reg_root" => "Software\\Microsoft\\Microsoft SQL Server\\MSSQL12.MSSQLSERVER",
+      #       "features" => [
       #         "SQL Server Replication",
       #         "Database Engine Services",
       #         "Full-Text and Semantic Extractions for Search",
@@ -166,7 +166,7 @@ def self.get_shared_features(version, reg_root)
       #         "Reporting Services - Native"
       #       ]
       #     },
-      #     :features => [
+      #     "features" => [
       #       "Client Tools Connectivity",
       #       "Client Tools SDK",
       #       "Master Data Services",
@@ -183,7 +183,7 @@ def self.get_installations
             instances = instance_names
               .map { |name| [ name, get_instance_info(version, name) ] }
 
-            instances.push([:features, get_shared_features(version, SQL_REG_ROOT)])
+            instances.push(['features', get_shared_features(version, SQL_REG_ROOT)])
 
             [ version, Hash[instances] ]
           end
@@ -207,11 +207,11 @@ def self.get_instance_names
       # returns a hash containing instance details
       #
       # {
-      #   :name => "MSSQLSERVER2",
-      #   :version_friendly => "SQL_2014",
-      #   :version => "12.0.2000.8",
-      #   :reg_root => "Software\\Microsoft\\Microsoft SQL Server\\MSSQL12.MSSQLSERVER2",
-      #   :features => [
+      #   "name" => "MSSQLSERVER2",
+      #   "version_friendly" => "SQL_2014",
+      #   "version" => "12.0.2000.8",
+      #   "reg_root" => "Software\\Microsoft\\Microsoft SQL Server\\MSSQL12.MSSQLSERVER2",
+      #   "features" => [
       #     "SQLServer Replication",
       #     "Database Engine Services",
       #     "Full-Text and Semantic Extractions for Search",
@@ -222,8 +222,8 @@ def self.get_instance_names
       # }
       def self.get_instance_info(version = SQL_2012, instance_name)
         sql_instance = get_wmi_instance_info(version, instance_name)
-        feats = get_instance_features(sql_instance[:reg_root], sql_instance[:name])
-        sql_instance.merge({:features => feats})
+        feats = get_instance_features(sql_instance['reg_root'], sql_instance['name'])
+        sql_instance.merge({'features' => feats})
       end
     end
   end

spec/acceptance/sqlserver_features_spec.rb

@@ -241,9 +241,8 @@ def bind_and_apply_failing_manifest(host, features, ensure_val = 'present')
       features = ['Tools', 'BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS']
 
       before(:all) do
-        # this assumes that only default MSSQLSERVER has been installed so far
-        # be careful about running tests out of sequence
-        remove_sql_instances(host, {:version => version, :instance_names => ['MSSQLSERVER']})
+        names = eval(fact_on(host, 'sqlserver_instance_names')).values.flatten
+        remove_sql_instances(host, {:version => version, :instance_names => names})
       end
 
       after(:all) do