Merge pull request #285 from RandomNoun7/tickets/master/MODULES-8438-Install-2019

(MODULES-8438) Install 2019

Author: Iristyle

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## Added
+
+- Add support for installing and managing SQL 2019 instances ([MODULES-8438](https://tickets.puppetlabs.com/browse/MODULES-8438))
+
 ## [2.2.0] - 2018-12-3
 
 ### Added

README.md

@@ -20,7 +20,7 @@
 
 ## Overview
 
-The sqlserver module installs and manages Microsoft SQL Server 2012, 2014, 2016 and 2017 on Windows systems.
+The sqlserver module installs and manages Microsoft SQL Server 2012, 2014, 2016, 2017, 2019 on Windows systems.
 
 ## Module Description
 
@@ -392,15 +392,15 @@ Default: `undef`.
 
 ##### `polybase_svc_account`
 
-**Applicable only if the POLYBASE feature for SQL Server 2016 is being installed.**
+**Applicable only if the POLYBASE feature for SQL Server 2016 or above is being installed.**
 
 Specifies a domain or system account for the Polybase Engine service.
 
 Valid options: a string specifying an existing username.
 
 ##### `polybase_svc_password`
 
-**Applicable only if the POLYBASE feature for SQL Server 2016 is being installed.**
+**Applicable only if the POLYBASE feature for SQL Server 2016 or above is being installed.**
 
 Specifies the password for the Polybase Engine service
 
@@ -1068,9 +1068,9 @@ Terminology differs somewhat between various database systems; please refer to t
 
 ## Limitations
 
-SQL 2017 detection support has been added. This support is limited to functionality already present for other versions. No new SQL 2017 specific functionality has been added in this release.
+SQL 2017 and 2019 detection support has been added. This support is limited to functionality already present for other versions. No new SQL 2017 or above specific functionality has been added in this release.
 
-This module can manage only a single version of SQL Server on a given host (one and only one of SQL Server 2012, 2014 or 2016). The module is able to manage multiple SQL Server instances of the same version.
+This module can manage only a single version of SQL Server on a given host (one and only one of SQL Server 2012, 2014, 2016, 2017, or 2019). The module is able to manage multiple SQL Server instances of the same version.
 
 This module cannot manage the SQL Server Native Client SDK (also known as SNAC_SDK). The SQL Server installation media can install the SDK, but it is not able to uninstall the SDK. Note that the 'sqlserver_features' fact detects the presence of the SDK.
 

lib/puppet/provider/sqlserver_features/mssql.rb

@@ -122,10 +122,11 @@ def create
       warn "Uninstalling all sql server features not tied into an instance because an empty array was passed, please use ensure absent instead."
       destroy
     else
+
       instance_version = PuppetX::Sqlserver::ServerHelper.sql_version_from_install_source(@resource[:source])
       Puppet.debug("Installation source detected as version #{instance_version}") unless instance_version.nil?
 
-      installNet35(@resource[:windows_feature_source]) unless instance_version == SQL_2016
+      installNet35(@resource[:windows_feature_source]) unless [SQL_2016, SQL_2017, SQL_2019].include? instance_version
 
       debug "Installing features #{@resource[:features]}"
       add_features(@resource[:features])

lib/puppet/provider/sqlserver_instance/mssql.rb

@@ -101,7 +101,7 @@ def create
       instance_version = PuppetX::Sqlserver::ServerHelper.sql_version_from_install_source(@resource[:source])
       Puppet.debug("Installation source detected as version #{instance_version}") unless instance_version.nil?
 
-      installNet35(@resource[:windows_feature_source]) unless instance_version == SQL_2016
+      installNet35(@resource[:windows_feature_source]) unless [SQL_2016, SQL_2017, SQL_2019].include? instance_version
 
       add_features(@resource[:features])
     end

lib/puppet/type/sqlserver_instance.rb

@@ -110,12 +110,12 @@
   end
 
   newparam(:polybase_svc_account, :parent => Puppet::Property::SqlserverLogin) do
-    desc 'The account used by the Polybase Engine service. Only applicable for SQL Server 2016.'
+    desc 'The account used by the Polybase Engine service. Only applicable for SQL Server 2016+.'
 
   end
 
   newparam(:polybase_svc_password) do
-    desc 'The password for the Polybase Engine service account. Only applicable for SQL Server 2016.'
+    desc 'The password for the Polybase Engine service account. Only applicable for SQL Server 2016+.'
 
   end
 

lib/puppet_x/sqlserver/features.rb

@@ -4,8 +4,9 @@
 SQL_2014 ||= 'SQL_2014'
 SQL_2016 ||= 'SQL_2016'
 SQL_2017 ||= 'SQL_2017'
+SQL_2019 ||= 'SQL_2019'
 
-ALL_SQL_VERSIONS ||= [SQL_2012, SQL_2014, SQL_2016, SQL_2017]
+ALL_SQL_VERSIONS ||= [SQL_2012, SQL_2014, SQL_2016, SQL_2017, SQL_2019]
 
 module PuppetX
   module Sqlserver
@@ -32,6 +33,10 @@ class Features
         SQL_2017 => {
           :major_version => 14,
           :registry_path => '140',
+        },
+        SQL_2019 => {
+          :major_version => 15,
+          :registry_path => '150',
         }
       }
 

lib/puppet_x/sqlserver/server_helper.rb

@@ -42,6 +42,8 @@ def self.sql_version_from_install_source(source_dir)
         ver = content.match('"(.+)"')
         return nil if ver.nil?
 
+        return SQL_2019 if ver[1].start_with?('15.')
+        return SQL_2017 if ver[1].start_with?('14.')
         return SQL_2016 if ver[1].start_with?('13.')
         return SQL_2014 if ver[1].start_with?('12.')
         return SQL_2012 if ver[1].start_with?('11.')

metadata.json

@@ -2,7 +2,7 @@
   "name": "puppetlabs-sqlserver",
   "version": "2.2.0",
   "author": "Puppet Inc",
-  "summary": "The `sqlserver` module installs and manages MS SQL Server 2012, 2014, 2016 and 2017 on Windows systems.",
+  "summary": "The `sqlserver` module installs and manages MS SQL Server 2012, 2014, 2016, 2017, and 2019 on Windows systems.",
   "license": "proprietary",
   "source": "https://github.com/puppetlabs/puppetlabs-sqlserver",
   "project_page": "https://github.com/puppetlabs/puppetlabs-sqlserver",
@@ -38,6 +38,7 @@
     "sql2014",
     "sql2016",
     "sql2017",
+    "sql2019",
     "tsql",
     "database"
   ],

spec/spec_helper_acceptance.rb

@@ -11,6 +11,7 @@
 WIN_ISO_ROOT = "http://int-resources.ops.puppetlabs.net/ISO/Windows/2012"
 WIN_2012R2_ISO = "en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso"
 QA_RESOURCE_ROOT = "http://int-resources.ops.puppetlabs.net/QA_resources/microsoft_sql/iso/"
+SQL_2019_ISO = "en_sql_server_2019_developer_x64_CTP2.iso"
 SQL_2016_ISO = "en_sql_server_2016_enterprise_with_service_pack_1_x64_dvd_9542382.iso"
 SQL_2014_ISO = "SQLServer2014-x64-ENU.iso"
 SQL_2012_ISO = "SQLServer2012SP1-FullSlipstream-ENU-x64.iso"