Skip to content

Commit decdffb

Browse files
committed
(FM-3940) Puppet 4.3.0 missing param validation fix
The commit that added the empty parameter check to the compiler was released in 4.3.0 - puppetlabs/puppet@8c4a634 Specifically https://github.com/puppetlabs/puppet/blob/42681420d93b984ca06073494bc1b4d70acf4e5e/lib/puppet/pops/types/type_mismatch_describer.rb#L150-L154 is where the check is at. This overrides the check at https://github.com/puppetlabs/puppet/blob/42681420d93b984ca06073494bc1b4d70acf4e5e/lib/puppet/resource.rb#L480 where it passes the previous error message (the puppet sha is latest stable as of this commit). Further constrain the specs to switch at version 4.3.0.
1 parent 356a305 commit decdffb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spec/defines/config_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
:admin_user => 'sa',
2525
} }
2626

27-
if Puppet.version < '4.0.0'
27+
if Puppet.version < '4.3.0'
2828
let(:error_message) { /Must pass admin_pass to Sqlserver::Config/ }
2929
else
3030
let(:error_message) { /expects a value for parameter 'admin_pass'/ }
@@ -43,7 +43,7 @@
4343
} }
4444

4545

46-
if Puppet.version < '4.0.0'
46+
if Puppet.version < '4.3.0'
4747
let(:error_message) { /Must pass admin_user to Sqlserver::Config/ }
4848
else
4949
let(:error_message) { /expects a value for parameter 'admin_user'/ }

spec/defines/login/permissions_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
} }
1515
let(:raise_error_check) { 'Login must be between 1 and 128 characters' }
1616
describe 'missing' do
17-
if Puppet.version < '4.0.0'
17+
if Puppet.version < '4.3.0'
1818
let(:raise_error_check) { 'Must pass login to Sqlserver::Login::Permissions[myTitle]' }
1919
else
2020
let(:raise_error_check) { "expects a value for parameter 'login'" }

spec/defines/user/permissions_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
} }
1616
let(:raise_error_check) { 'User must be between 1 and 128 characters' }
1717
describe 'missing' do
18-
if Puppet.version < '4.0.0'
18+
if Puppet.version < '4.3.0'
1919
let(:raise_error_check) { 'Must pass user to Sqlserver::User::Permissions[myTitle]' }
2020
else
2121
let(:raise_error_check) { "expects a value for parameter 'user'" }

0 commit comments

Comments
 (0)