Skip to content

Commit eeae11d

Browse files
authored
Merge pull request #394 from ekohl/autorequire-db
Autorequire mongodb_database for mongodb_user
2 parents 9df1bea + 6a74ac9 commit eeae11d

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

lib/puppet/type/mongodb_user.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ def insync?(_is)
8888
'mongodb'
8989
end
9090

91+
autorequire(:mongodb_database) do
92+
self[:database]
93+
end
94+
9195
validate do
9296
if self[:password_hash].nil? && self[:password].nil? && provider.password.nil? && provider.password_hash.nil?
9397
err("Either 'password_hash' or 'password' should be provided")

manifests/db.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
username => $user,
4040
database => $db_name,
4141
roles => $roles,
42-
require => Mongodb_database[$db_name],
4342
}
4443

4544
}

spec/defines/db_spec.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
end
1515

1616
it 'contains mongodb_user with mongodb_database requirement' do
17-
is_expected.to contain_mongodb_user('User testuser on db testdb').with('username' => 'testuser',
18-
'database' => 'testdb',
19-
'require' => 'Mongodb_database[testdb]')
17+
is_expected.to contain_mongodb_user('User testuser on db testdb'). \
18+
with_username('testuser'). \
19+
with_database('testdb'). \
20+
that_requires('Mongodb_database[testdb]')
2021
end
2122

2223
it 'contains mongodb_user with proper roles' do
@@ -53,9 +54,10 @@
5354
end
5455

5556
it 'contains mongodb_user with mongodb_database requirement' do
56-
is_expected.to contain_mongodb_user('User testuser on db testdb').with('username' => 'testuser',
57-
'database' => 'testdb',
58-
'require' => 'Mongodb_database[testdb]')
57+
is_expected.to contain_mongodb_user('User testuser on db testdb'). \
58+
with_username('testuser'). \
59+
with_database('testdb'). \
60+
that_requires('Mongodb_database[testdb]')
5961
end
6062

6163
it 'contains mongodb_user with proper roles' do

0 commit comments

Comments
 (0)