Skip to content

Commit 683098e

Browse files
author
tphoney
committed
(MODULES-8600) add DQC to sqlserver_features
1 parent 6f04ba6 commit 683098e

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

lib/puppet/type/sqlserver_features.rb

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

spec/acceptance/z_last_sqlserver_features_spec.rb

+15-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def ensure_sql_features(features, ensure_val = 'present')
3333
end
3434

3535
context 'can install' do
36-
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
36+
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
3737

3838
before(:all) do
3939
remove_sql_features(host, {:features => features, :version => sql_version})
@@ -58,7 +58,7 @@ def ensure_sql_features(features, ensure_val = 'present')
5858

5959
context 'can remove' do
6060

61-
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
61+
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
6262

6363
before(:all) do
6464
ensure_sql_features(features)
@@ -85,11 +85,11 @@ def ensure_sql_features(features, ensure_val = 'present')
8585

8686
context 'can remove independent feature' do
8787
if sql_version == '2016'
88-
all_possible_features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
89-
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
88+
all_possible_features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
89+
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
9090
else
91-
all_possible_features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS']
92-
features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS']
91+
all_possible_features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'DQC']
92+
features = ['BC', 'Conn', 'SSMS', 'ADV_SSMS', 'SDK', 'IS', 'MDS', 'DQC']
9393
end
9494

9595
before(:all) do
@@ -156,6 +156,14 @@ def ensure_sql_features(features, ensure_val = 'present')
156156
expect(r.stdout).not_to match(/Master Data Services/)
157157
end
158158
end
159+
160+
it "'DQC'", :tier_low => true do
161+
ensure_sql_features(features - ['DQC'])
162+
163+
validate_sql_install(host, {:version => sql_version}) do |r|
164+
expect(r.stdout).not_to match(/Data Quality Client/)
165+
end
166+
end
159167
end
160168

161169
context 'with negative test cases' do
@@ -200,7 +208,7 @@ def bind_and_apply_failing_manifest(features, ensure_val = 'present')
200208

201209
context 'can install' do
202210

203-
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS']
211+
features = ['BC', 'Conn', 'SDK', 'IS', 'MDS', 'DQC']
204212

205213
before(:all) do
206214
puppet_version = (on host, puppet('--version')).stdout.chomp

0 commit comments

Comments
 (0)