FM-2110 Prep TSQL provider to be released and backport for all existing usage on new expected behavior

Author: Travis Fields

CHANGELOG.md

@@ -1,2 +1,11 @@
-##2014-12-08 - 1.0.0
+##2015-01-xx - 1.1.0
+
+###Summary
+Add sqlserver_tsql provider that to enable users to run sql against a given instance
+
+###Features
+* sqlserver_tsql added
+* Better logging for ::login ::database and ::sp_configure
+
+u#2014-12-08 - 1.0.0
 Initial release

lib/puppet/property/login.rb renamed to lib/puppet/property/sqlserver_login.rb

@@ -0,0 +1,19 @@
+require 'puppet/property'
+
+class Puppet::Property::SqlserverTsql < Puppet::Property
+  desc 'TSQL property that we are going to wrap with a try catch'
+  munge do |value|
+    erb_template = <<-TEMPLATE
+BEGIN TRY
+    #{value}
+END TRY
+BEGIN CATCH
+    DECLARE @msg as VARCHAR(max);
+    SELECT @msg = 'THROW CAUGHT: ' + ERROR_MESSAGE();
+    THROW 51000, @msg, 10
+END CATCH
+    TEMPLATE
+    value = erb_template
+  end
+
+end

lib/puppet/property/sqlserver_tsql.rb

@@ -51,8 +51,12 @@ def self.run_authenticated_sqlcmd(query, opts)
         temp_ps1.write(ps1.result(b))
         temp_ps1.flush
         temp_ps1.close
+        #We want to not fail the exec but fail the overall process once we get the clean result back, otherwise we report the temp file which is meaningless
         result = Puppet::Util::Execution.execute(['powershell.exe', '-noprofile', '-executionpolicy', 'unrestricted', temp_ps1.path], {:failonfail => false}) #We expect some things to fail in order to run as an only if
-        debug("Return result #{result.exitstatus}")
+        debug("Return result #{result}")
+        if opts[:failonfail] && result.match(/ERROR/)
+          fail(result)
+        end
         return result
       ensure
         temp_ps1.close

lib/puppet/provider/sqlserver.rb

@@ -2,19 +2,15 @@
 
 Puppet::Type::type(:sqlserver_tsql).provide(:mssql, :parent => Puppet::Provider::Sqlserver) do
 
-  def run(query)
-    debug("Running resource #{query} against #{resource[:instance]}")
-    result = Puppet::Provider::Sqlserver.run_authenticated_sqlcmd(query, {:instance_name => resource[:instance]})
-    return result
-  end
-
-  def run_check
-    result = self.run(resource[:onlyif])
+  def run(query, opts)
+    debug("Running resource #{query} against #{resource[:instance]} with failonfail set to #{opts[:failonfail]}")
+    opts[:instance_name] = resource[:instance]
+    result = Puppet::Provider::Sqlserver.run_authenticated_sqlcmd(query, opts)
     return result
   end
 
   def run_update
-    result = self.run(resource[:command])
+    result = self.run(resource[:command], {:failonfail => true})
     return result
   end
 

lib/puppet/provider/sqlserver_tsql/mssql.rb

@@ -25,10 +25,12 @@ if (!(Get-Command 'sqlcmd.exe' -ErrorAction SilentlyContinue)){
 
 $result = sqlcmd.exe -i '<%= input_file %>' -h-1 -W -s ',' <% if @instance != 'MSSQLSERVER' %>-S localhost\<%= @instance %><%end%>
     if($result -match "ERROR"){
-        Write-Error -Message ($result | where {$_ -match "ERROR"} | select -First 1)
+    	Write-Host ($result | where {$_ -match "THROW CAUGHT"} | select -First 1)
+        Write-Error -Message ($result | where {$_ -match "THROW CAUGHT"} | select -First 1)
 		exit(10)
     }
 	if($result -match "Incorrect syntax near "){
+		Write-Host ($result | where {$_ -match "Incorrect syntax near"} | select -First 1)
 	    Write-Error -Message ($result | where {$_ -match "Incorrect syntax"} | select -First 1)
 		exit(10)
 	}

lib/puppet/templates/authenticated_query.ps1.erb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'property/login'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'property/sqlserver_login'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/sqlserver/server_helper'))
 
 Puppet::Type::newtype(:sqlserver_features) do

lib/puppet/type/sqlserver_features.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'property/login'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'property/sqlserver_login'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/sqlserver/server_helper'))
 
 Puppet::Type::newtype(:sqlserver_instance) do

lib/puppet/type/sqlserver_instance.rb

@@ -1,4 +1,5 @@
 require 'puppet'
+require 'puppet/property/sqlserver_tsql'
 
 Puppet::Type::newtype(:sqlserver_tsql) do
   newparam :name, :namevar => true
@@ -15,21 +16,23 @@ def self.checks
   end
 
   desc 'command to run against an instance with the authenticated credentials used in sqlserver::config'
-  newparam(:command) do
+  newparam(:command, :parent => Puppet::Property::SqlserverTsql) do
 
   end
 
   desc 'requires the usage of sqlserver::config with the user and password'
   newparam(:instance) do
-
+    munge do |value|
+      value.upcase
+    end
   end
 
   desc 'SQL Query to run and only run if exits with non-zero'
-  newcheck(:onlyif) do
-    # Return true if the command returns 0.
+  newcheck(:onlyif, :parent => Puppet::Property::SqlserverTsql) do
+    #Runs in the event that our TSQL exits with anything other than 0
     def check(value)
       begin
-        output = provider.run(value)
+        output = provider.run(value, :failonfail => false)
       end
       debug("OnlyIf returned exitstatus of #{output.exitstatus}")
       output.exitstatus != 0

lib/puppet/type/sqlserver_tsql.rb

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-sqlserver",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "puppetlabs",
   "summary": "The `sqlserver` module installs and manages MS SQL Server 2012 and 2014 on Windows systems.",
   "license": "PuppetLabs-Enterprise",