Merge pull request #313 from tphoney/MODULES-8600

(MODULES-8600) add DQC to sqlserver_features

Author: RandomNoun7

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## Fixed
+
+- Add DQC to sqlserver_features feature attribute ([MODULES-8600](https://tickets.puppetlabs.com/browse/MODULES-8600))
+
 ## [2.5.0] - 2019-03-26
 
 ## Added

README.md

@@ -289,7 +289,7 @@ Default: 'present'.
 
 *Required.*
 
-Specifies one or more features to manage. Valid options: 'BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'BOL', 'DREPLAY_CTLR', 'DREPLAY_CLT'.
+Specifies one or more features to manage. Valid options: 'BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'BOL', 'DREPLAY_CTLR', 'DREPLAY_CLT', 'DQC'.
 
 The 'Tools' value for this setting is deprecated. Specify 'BC', 'SSMS', 'ADV_SSMS', 'Conn', and 'SDK' explicitly.
 

lib/puppet/type/sqlserver_features.rb

@@ -37,7 +37,7 @@
   newproperty(:features, :array_matching => :all) do
     desc 'Specifies features to install, uninstall, or upgrade. The list of top-level features include
          BC, Conn, SSMS, ADV_SSMS, SDK, IS and MDS.'
-    newvalues(:Tools, :BC, :Conn, :SSMS, :ADV_SSMS, :SDK, :IS, :MDS, :BOL, :DREPLAY_CTLR, :DREPLAY_CLT)
+    newvalues(:Tools, :BC, :Conn, :SSMS, :ADV_SSMS, :SDK, :IS, :MDS, :BOL, :DREPLAY_CTLR, :DREPLAY_CLT, :DQC)
     munge do |value|
       if PuppetX::Sqlserver::ServerHelper.is_super_feature(value)
         Puppet.deprecation_warning("Using #{value} is deprecated for features in sql_features resources")

spec/acceptance/z_last_sqlserver_features_spec.rb

@@ -33,7 +33,7 @@ def ensure_sql_features(features, ensure_val = 'present')
   end
 
   context 'can install' do
-    features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
+    features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
 
     before(:all) do
       remove_sql_features(host, {:features => features, :version => sql_version})
@@ -58,7 +58,7 @@ def ensure_sql_features(features, ensure_val = 'present')
 
   context 'can remove' do
 
-    features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
+    features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
 
     before(:all) do
       ensure_sql_features(features)
@@ -85,11 +85,11 @@ def ensure_sql_features(features, ensure_val = 'present')
 
   context 'can remove independent feature' do
     if sql_version == '2016'
-      all_possible_features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
-      features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
+      all_possible_features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
+      features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
     else
-      all_possible_features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS']
-      features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS']
+      all_possible_features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'DQC']
+      features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'DQC']
     end
 
     before(:all) do
@@ -156,6 +156,14 @@ def ensure_sql_features(features, ensure_val = 'present')
         expect(r.stdout).not_to match(/Master Data Services/)
       end
     end
+
+    it "'DQC'", :tier_low => true do
+      ensure_sql_features(features - ['DQC'])
+
+      validate_sql_install(host, {:version => sql_version}) do |r|
+        expect(r.stdout).not_to match(/Data Quality Client/)
+      end
+    end
   end
 
   context 'with negative test cases' do
@@ -200,7 +208,7 @@ def bind_and_apply_failing_manifest(features, ensure_val = 'present')
 
     context 'can install' do
 
-      features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
+      features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
 
       before(:all) do
         puppet_version = (on host, puppet('--version')).stdout.chomp