diff options
author | Lance Albertson <lance@osuosl.org> | 2021-03-15 11:02:30 -0700 |
---|---|---|
committer | Lance Albertson <lance@osuosl.org> | 2021-03-15 11:14:04 -0700 |
commit | 6b1ab6a151e1ad01a9d004a21bde31530bdbee6e (patch) | |
tree | 8151cea0243cbb6b2642183efc7253c6580d8f20 | |
parent | da33fa94d97f68cb971aa09fb2fb455b4ab1d5bf (diff) | |
download | chef-6b1ab6a151e1ad01a9d004a21bde31530bdbee6e.tar.gz |
Fix users_manage usage in kitchen-tests
The use of data bags in the users cookbook was removed in 6.0.0 [1]. This
applies the recommended workaround and allow the integration tests to pass.
[1] https://github.com/sous-chefs/users/blob/master/CHANGELOG.md#600---2021-03-12
Signed-off-by: Lance Albertson <lance@osuosl.org>
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 3 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 4 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/windows.rb | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index 7f72c0b76a..cd8c9c4d27 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -44,8 +44,11 @@ resolver_config "/etc/resolv.conf" do search [ "chef.io" ] end +users_from_databag = search("users", "*:*") + users_manage "sysadmin" do group_id 2300 + users users_from_databag action [:create] end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index a724c4882c..02fe196a7e 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -28,15 +28,19 @@ resolver_config "/etc/resolv.conf" do search [ "chef.io" ] end +users_from_databag = search("users", "*:*") + users_manage "remove sysadmin" do group_name "sysadmin" group_id 2300 + users users_from_databag action [:remove] end users_manage "create sysadmin" do group_name "sysadmin" group_id 2300 + users users_from_databag action [:create] end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb index 7eeb4ef5be..1f00d4ea7e 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb @@ -66,9 +66,12 @@ windows_audit_policy "Update Some Advanced Audit Policies to No Auditing" do failure false end +users_from_databag = search("users", "*:*") + users_manage "remove sysadmin" do group_name "sysadmin" group_id 2300 + users users_from_databag action [:remove] end @@ -76,6 +79,7 @@ end users_manage "create sysadmin" do group_name "sysadmin" group_id 2300 + users users_from_databag action [:create] end |