chef 16.3.45 → 16.4.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/chef-universal-mingw32.gemspec +0 -1
- data/lib/chef/action_collection.rb +4 -0
- data/lib/chef/api_client/registration.rb +8 -8
- data/lib/chef/application.rb +6 -1
- data/lib/chef/application/apply.rb +5 -5
- data/lib/chef/application/base.rb +2 -0
- data/lib/chef/application/client.rb +3 -0
- data/lib/chef/application/windows_service.rb +27 -27
- data/lib/chef/chef_class.rb +0 -1
- data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
- data/lib/chef/client.rb +11 -11
- data/lib/chef/data_collector/run_end_message.rb +11 -1
- data/lib/chef/dsl/platform_introspection.rb +8 -8
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
- data/lib/chef/environment.rb +2 -2
- data/lib/chef/exceptions.rb +1 -1
- data/lib/chef/file_content_management/tempfile.rb +9 -9
- data/lib/chef/http.rb +2 -1
- data/lib/chef/json_compat.rb +1 -1
- data/lib/chef/knife/bootstrap.rb +2 -2
- data/lib/chef/knife/cookbook_download.rb +1 -1
- data/lib/chef/knife/cookbook_metadata.rb +1 -1
- data/lib/chef/knife/cookbook_upload.rb +23 -23
- data/lib/chef/knife/core/generic_presenter.rb +1 -1
- data/lib/chef/knife/core/hashed_command_loader.rb +2 -2
- data/lib/chef/knife/core/windows_bootstrap_context.rb +32 -24
- data/lib/chef/knife/delete.rb +15 -15
- data/lib/chef/knife/exec.rb +2 -2
- data/lib/chef/knife/ssh.rb +6 -6
- data/lib/chef/knife/xargs.rb +19 -19
- data/lib/chef/knife/yaml_convert.rb +1 -1
- data/lib/chef/mixin/checksum.rb +0 -1
- data/lib/chef/mixin/deep_merge.rb +35 -6
- data/lib/chef/mixin/openssl_helper.rb +3 -1
- data/lib/chef/mixin/shell_out.rb +1 -1
- data/lib/chef/mixin/which.rb +1 -1
- data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
- data/lib/chef/node/attribute.rb +2 -4
- data/lib/chef/platform/service_helpers.rb +1 -1
- data/lib/chef/property.rb +1 -1
- data/lib/chef/provider/cron/unix.rb +0 -2
- data/lib/chef/provider/git.rb +5 -5
- data/lib/chef/provider/group.rb +0 -2
- data/lib/chef/provider/group/suse.rb +5 -5
- data/lib/chef/provider/ifconfig.rb +1 -4
- data/lib/chef/provider/mount.rb +0 -2
- data/lib/chef/provider/package.rb +0 -2
- data/lib/chef/provider/package/rubygems.rb +1 -1
- data/lib/chef/provider/package/snap.rb +1 -1
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
- data/lib/chef/provider/powershell_script.rb +21 -5
- data/lib/chef/provider/route.rb +1 -1
- data/lib/chef/provider/service/arch.rb +1 -1
- data/lib/chef/provider/service/debian.rb +1 -1
- data/lib/chef/provider/service/gentoo.rb +2 -2
- data/lib/chef/provider/service/macosx.rb +2 -2
- data/lib/chef/provider/service/openbsd.rb +1 -4
- data/lib/chef/provider/service/redhat.rb +2 -2
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +10 -10
- data/lib/chef/provider/systemd_unit.rb +0 -2
- data/lib/chef/provider/template/content.rb +1 -0
- data/lib/chef/provider/user/dscl.rb +2 -2
- data/lib/chef/provider/user/mac.rb +9 -9
- data/lib/chef/provider/windows_task.rb +0 -3
- data/lib/chef/provider/zypper_repository.rb +0 -1
- data/lib/chef/providers.rb +0 -1
- data/lib/chef/recipe.rb +1 -1
- data/lib/chef/resource.rb +6 -10
- data/lib/chef/resource/apt_repository.rb +1 -10
- data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
- data/lib/chef/resource/chef_vault_secret.rb +13 -13
- data/lib/chef/resource/execute.rb +2 -3
- data/lib/chef/resource/homebrew_update.rb +2 -2
- data/lib/chef/resource/openssl_dhparam.rb +2 -0
- data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
- data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
- data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
- data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
- data/lib/chef/resource/openssl_x509_certificate.rb +24 -21
- data/lib/chef/resource/openssl_x509_crl.rb +2 -0
- data/lib/chef/resource/openssl_x509_request.rb +23 -20
- data/lib/chef/resource/osx_profile.rb +227 -5
- data/lib/chef/resource/powershell_package_source.rb +1 -1
- data/lib/chef/resource/powershell_script.rb +24 -30
- data/lib/chef/resource/sudo.rb +1 -1
- data/lib/chef/resource/sysctl.rb +5 -5
- data/lib/chef/resource/windows_ad_join.rb +2 -0
- data/lib/chef/resource/windows_audit_policy.rb +3 -0
- data/lib/chef/resource/windows_auto_run.rb +2 -0
- data/lib/chef/resource/windows_certificate.rb +2 -0
- data/lib/chef/resource/windows_dfs_folder.rb +2 -0
- data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
- data/lib/chef/resource/windows_dfs_server.rb +2 -0
- data/lib/chef/resource/windows_dns_record.rb +10 -7
- data/lib/chef/resource/windows_dns_zone.rb +12 -7
- data/lib/chef/resource/windows_feature.rb +2 -0
- data/lib/chef/resource/windows_feature_dism.rb +10 -0
- data/lib/chef/resource/windows_feature_powershell.rb +14 -2
- data/lib/chef/resource/windows_firewall_profile.rb +4 -2
- data/lib/chef/resource/windows_firewall_rule.rb +5 -3
- data/lib/chef/resource/windows_font.rb +3 -1
- data/lib/chef/resource/windows_pagefile.rb +4 -0
- data/lib/chef/resource/windows_printer.rb +17 -18
- data/lib/chef/resource/windows_printer_port.rb +14 -13
- data/lib/chef/resource/windows_security_policy.rb +2 -0
- data/lib/chef/resource/windows_share.rb +5 -3
- data/lib/chef/resource/windows_shortcut.rb +2 -0
- data/lib/chef/resource/windows_uac.rb +2 -0
- data/lib/chef/resource/windows_user_privilege.rb +2 -0
- data/lib/chef/resource/windows_workgroup.rb +2 -3
- data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
- data/lib/chef/role.rb +2 -2
- data/lib/chef/run_context/cookbook_compiler.rb +20 -20
- data/lib/chef/run_status.rb +2 -6
- data/lib/chef/shell.rb +1 -1
- data/lib/chef/util/backup.rb +1 -1
- data/lib/chef/util/diff.rb +11 -11
- data/lib/chef/util/powershell/cmdlet.rb +1 -1
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/file.rb +2 -2
- data/lib/chef/win32/file/version_info.rb +5 -5
- data/spec/data/ssl/chef-rspec.cert +15 -15
- data/spec/functional/resource/aixinit_service_spec.rb +7 -7
- data/spec/functional/resource/bff_spec.rb +2 -2
- data/spec/functional/resource/cookbook_file_spec.rb +1 -1
- data/spec/functional/resource/dsc_resource_spec.rb +1 -1
- data/spec/functional/resource/dsc_script_spec.rb +0 -1
- data/spec/functional/resource/group_spec.rb +6 -6
- data/spec/functional/resource/insserv_spec.rb +4 -4
- data/spec/functional/resource/link_spec.rb +20 -20
- data/spec/functional/resource/powershell_script_spec.rb +4 -4
- data/spec/functional/resource/rpm_spec.rb +2 -2
- data/spec/functional/resource/windows_certificate_spec.rb +3 -3
- data/spec/functional/resource/windows_font_spec.rb +49 -0
- data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
- data/spec/functional/run_lock_spec.rb +24 -24
- data/spec/functional/win32/registry_spec.rb +8 -8
- data/spec/functional/win32/service_manager_spec.rb +1 -1
- data/spec/integration/knife/common_options_spec.rb +12 -12
- data/spec/integration/knife/config_get_profile_spec.rb +69 -68
- data/spec/integration/knife/config_get_spec.rb +126 -125
- data/spec/integration/knife/config_list_profiles_spec.rb +181 -180
- data/spec/integration/knife/config_use_profile_spec.rb +110 -109
- data/spec/integration/knife/diff_spec.rb +3 -1
- data/spec/integration/knife/download_spec.rb +3 -1
- data/spec/integration/knife/serve_spec.rb +5 -5
- data/spec/integration/knife/upload_spec.rb +3 -1
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
- data/spec/spec_helper.rb +6 -6
- data/spec/support/platform_helpers.rb +9 -9
- data/spec/support/platforms/win32/spec_service.rb +1 -1
- data/spec/support/shared/functional/directory_resource.rb +1 -1
- data/spec/support/shared/functional/execute_resource.rb +1 -1
- data/spec/support/shared/functional/file_resource.rb +20 -20
- data/spec/support/shared/functional/win32_service.rb +1 -1
- data/spec/support/shared/functional/windows_script.rb +3 -3
- data/spec/support/shared/integration/integration_helper.rb +22 -52
- data/spec/support/shared/unit/script_resource.rb +6 -20
- data/spec/support/shared/unit/windows_script_resource.rb +15 -28
- data/spec/unit/data_collector_spec.rb +22 -0
- data/spec/unit/environment_spec.rb +7 -7
- data/spec/unit/knife/bootstrap_spec.rb +14 -14
- data/spec/unit/knife/cookbook_download_spec.rb +4 -4
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
- data/spec/unit/knife/supermarket_share_spec.rb +1 -1
- data/spec/unit/mixin/template_spec.rb +30 -30
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
- data/spec/unit/node/immutable_collections_spec.rb +6 -2
- data/spec/unit/node_spec.rb +5 -5
- data/spec/unit/provider/powershell_script_spec.rb +11 -4
- data/spec/unit/provider/remote_directory_spec.rb +9 -9
- data/spec/unit/provider/service/arch_service_spec.rb +3 -2
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
- data/spec/unit/provider/service/macosx_spec.rb +3 -3
- data/spec/unit/provider/service/redhat_spec.rb +2 -2
- data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
- data/spec/unit/provider_resolver_spec.rb +6 -6
- data/spec/unit/resource/batch_spec.rb +6 -6
- data/spec/unit/resource/execute_spec.rb +113 -118
- data/spec/unit/resource/osx_profile_spec.rb +233 -0
- data/spec/unit/resource/powershell_script_spec.rb +11 -29
- data/spec/unit/resource/script_spec.rb +6 -1
- data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
- data/spec/unit/role_spec.rb +11 -11
- data/tasks/rspec.rb +1 -1
- metadata +7 -8
- data/lib/chef/provider/osx_profile.rb +0 -255
- data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -58,4 +58,237 @@ describe Chef::Resource::OsxProfile do
|
|
58
58
|
resource.profile test_profile
|
59
59
|
expect(resource.profile).to be_a(Hash)
|
60
60
|
end
|
61
|
+
|
62
|
+
let(:shell_out_success) do
|
63
|
+
double("shell_out", exitstatus: 0, error?: false)
|
64
|
+
end
|
65
|
+
|
66
|
+
describe "action_create" do
|
67
|
+
let(:node) { Chef::Node.new }
|
68
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
69
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
70
|
+
let(:resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
|
71
|
+
let(:provider) { resource.provider_for_action(:create) }
|
72
|
+
let(:all_profiles) do
|
73
|
+
{ "_computerlevel" => [{ "ProfileDisplayName" => "Finder Settings",
|
74
|
+
"ProfileIdentifier" => "com.apple.finder",
|
75
|
+
"ProfileInstallDate" => "2015-11-08 23:15:21 +0000",
|
76
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.finder" => { "Forced" => [{ "mcx_preference_settings" => { "ShowExternalHardDrivesOnDesktop" => false } }] } } },
|
77
|
+
"PayloadDisplayName" => "Custom: (com.apple.finder)",
|
78
|
+
"PayloadIdentifier" => "com.apple.finder",
|
79
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
80
|
+
"PayloadUUID" => "a017048f-684b-4e81-baa3-43afe316d739",
|
81
|
+
"PayloadVersion" => 1 }],
|
82
|
+
"ProfileOrganization" => "Chef",
|
83
|
+
"ProfileRemovalDisallowed" => "false",
|
84
|
+
"ProfileType" => "Configuration",
|
85
|
+
"ProfileUUID" => "e2e09bef-e673-44a6-bcbe-ecb5f1c1b740",
|
86
|
+
"ProfileVerificationState" => "unsigned",
|
87
|
+
"ProfileVersion" => 1 },
|
88
|
+
{ "ProfileDisplayName" => "ScreenSaver Settings",
|
89
|
+
"ProfileIdentifier" => "com.testprofile.screensaver",
|
90
|
+
"ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
|
91
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
|
92
|
+
"PayloadDisplayName" => "Custom: (com.apple.screensaver)",
|
93
|
+
"PayloadIdentifier" => "com.apple.screensaver",
|
94
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
95
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
|
96
|
+
"PayloadVersion" => 1 }],
|
97
|
+
"ProfileOrganization" => "Chef",
|
98
|
+
"ProfileRemovalDisallowed" => "false",
|
99
|
+
"ProfileType" => "Configuration",
|
100
|
+
"ProfileUUID" => "6e95927c-f200-54b4-85c7-52ab99b61c47",
|
101
|
+
"ProfileVerificationState" => "unsigned",
|
102
|
+
"ProfileVersion" => 1 }],
|
103
|
+
}
|
104
|
+
end
|
105
|
+
# If anything is changed within this profile, be sure to update the
|
106
|
+
# ProfileUUID in all_profiles to match the new config specific UUID
|
107
|
+
let(:test_profile) do
|
108
|
+
{
|
109
|
+
"PayloadIdentifier" => "com.testprofile.screensaver",
|
110
|
+
"PayloadRemovalDisallowed" => false,
|
111
|
+
"PayloadScope" => "System",
|
112
|
+
"PayloadType" => "Configuration",
|
113
|
+
"PayloadUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
114
|
+
"PayloadOrganization" => "Chef",
|
115
|
+
"PayloadVersion" => 1,
|
116
|
+
"PayloadDisplayName" => "Screensaver Settings",
|
117
|
+
"PayloadContent" => [
|
118
|
+
{
|
119
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
120
|
+
"PayloadVersion" => 1,
|
121
|
+
"PayloadIdentifier" => "com.testprofile.screensaver",
|
122
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
|
123
|
+
"PayloadEnabled" => true,
|
124
|
+
"PayloadDisplayName" => "com.apple.screensaver",
|
125
|
+
"PayloadContent" => {
|
126
|
+
"com.apple.screensaver" => {
|
127
|
+
"Forced" => [
|
128
|
+
{
|
129
|
+
"mcx_preference_settings" => {
|
130
|
+
"idleTime" => 0,
|
131
|
+
},
|
132
|
+
},
|
133
|
+
],
|
134
|
+
},
|
135
|
+
},
|
136
|
+
},
|
137
|
+
],
|
138
|
+
}
|
139
|
+
end
|
140
|
+
let(:no_profiles) do
|
141
|
+
{}
|
142
|
+
end
|
143
|
+
|
144
|
+
before(:each) do
|
145
|
+
allow(provider).to receive(:cookbook_file_available?).and_return(true)
|
146
|
+
allow(provider).to receive(:cache_cookbook_profile).and_return("/tmp/test.mobileconfig.remote")
|
147
|
+
allow(provider).to receive(:get_new_profile_hash).and_return(test_profile)
|
148
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
149
|
+
allow(provider).to receive(:read_plist).and_return(all_profiles)
|
150
|
+
allow(::File).to receive(:unlink).and_return(true)
|
151
|
+
end
|
152
|
+
|
153
|
+
it "should build the get all profiles shellout command correctly" do
|
154
|
+
profile_name = "com.testprofile.screensaver.mobileconfig"
|
155
|
+
resource.profile_name profile_name
|
156
|
+
allow(provider).to receive(:get_installed_profiles).and_call_original
|
157
|
+
allow(provider).to receive(:read_plist).and_return(all_profiles)
|
158
|
+
expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-P", "-o", kind_of(String))
|
159
|
+
provider.load_current_resource
|
160
|
+
end
|
161
|
+
|
162
|
+
it "should use profile name as profile when no profile is set" do
|
163
|
+
profile_name = "com.testprofile.screensaver.mobileconfig"
|
164
|
+
resource.profile_name profile_name
|
165
|
+
provider.load_current_resource
|
166
|
+
expect(resource.profile_name).to eql(profile_name)
|
167
|
+
end
|
168
|
+
|
169
|
+
it "should use identifier from specified profile" do
|
170
|
+
resource.profile test_profile
|
171
|
+
provider.load_current_resource
|
172
|
+
expect(
|
173
|
+
provider.instance_variable_get(:@new_profile_identifier)
|
174
|
+
).to eql(test_profile["PayloadIdentifier"])
|
175
|
+
end
|
176
|
+
|
177
|
+
it "should install when not installed" do
|
178
|
+
resource.profile test_profile
|
179
|
+
allow(provider).to receive(:get_installed_profiles).and_return(no_profiles)
|
180
|
+
provider.load_current_resource
|
181
|
+
expect(provider).to receive(:install_profile)
|
182
|
+
expect { provider.run_action(:install) }.to_not raise_error
|
183
|
+
end
|
184
|
+
|
185
|
+
it "does not install if the profile is already installed" do
|
186
|
+
resource.profile test_profile
|
187
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
188
|
+
provider.load_current_resource
|
189
|
+
expect(provider).to_not receive(:install_profile)
|
190
|
+
expect { provider.action_install }.to_not raise_error
|
191
|
+
end
|
192
|
+
|
193
|
+
it "should install when installed but uuid differs" do
|
194
|
+
resource.profile test_profile
|
195
|
+
all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
|
196
|
+
provider.load_current_resource
|
197
|
+
expect(provider).to receive(:install_profile)
|
198
|
+
expect { provider.run_action(:install) }.to_not raise_error
|
199
|
+
end
|
200
|
+
|
201
|
+
it "should build the shellout install command correctly" do
|
202
|
+
profile_path = "/tmp/test.mobileconfig"
|
203
|
+
resource.profile test_profile
|
204
|
+
# Change the profile so it triggers an install
|
205
|
+
all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
|
206
|
+
provider.load_current_resource
|
207
|
+
allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
|
208
|
+
expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
|
209
|
+
provider.action_install
|
210
|
+
end
|
211
|
+
|
212
|
+
it "should fail if there is no identifier inside the profile" do
|
213
|
+
test_profile.delete("PayloadIdentifier")
|
214
|
+
resource.profile test_profile
|
215
|
+
error_message = "The specified profile does not seem to be valid"
|
216
|
+
expect { provider.run_action(:install) }.to raise_error(RuntimeError, error_message)
|
217
|
+
end
|
218
|
+
end
|
219
|
+
|
220
|
+
describe "action_remove" do
|
221
|
+
let(:node) { Chef::Node.new }
|
222
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
223
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
224
|
+
let(:resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
|
225
|
+
let(:provider) { resource.provider_for_action(:remove) }
|
226
|
+
let(:current_resource) { Chef::Resource::OsxProfile.new("Profile Test") }
|
227
|
+
let(:all_profiles) do
|
228
|
+
{ "_computerlevel" => [{ "ProfileDisplayName" => "ScreenSaver Settings",
|
229
|
+
"ProfileIdentifier" => "com.apple.screensaver",
|
230
|
+
"ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
|
231
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
|
232
|
+
"PayloadDisplayName" => "Custom: (com.apple.screensaver)",
|
233
|
+
"PayloadIdentifier" => "com.apple.screensaver",
|
234
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
235
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
|
236
|
+
"PayloadVersion" => 1 }],
|
237
|
+
"ProfileOrganization" => "Chef",
|
238
|
+
"ProfileRemovalDisallowed" => "false",
|
239
|
+
"ProfileType" => "Configuration",
|
240
|
+
"ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
241
|
+
"ProfileVerificationState" => "unsigned",
|
242
|
+
"ProfileVersion" => 1 },
|
243
|
+
{ "ProfileDisplayName" => "ScreenSaver Settings",
|
244
|
+
"ProfileIdentifier" => "com.testprofile.screensaver",
|
245
|
+
"ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
|
246
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
|
247
|
+
"PayloadDisplayName" => "Custom: (com.apple.screensaver)",
|
248
|
+
"PayloadIdentifier" => "com.apple.screensaver",
|
249
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
250
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
|
251
|
+
"PayloadVersion" => 1 }],
|
252
|
+
"ProfileOrganization" => "Chef",
|
253
|
+
"ProfileRemovalDisallowed" => "false",
|
254
|
+
"ProfileType" => "Configuration",
|
255
|
+
"ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
256
|
+
"ProfileVerificationState" => "unsigned",
|
257
|
+
"ProfileVersion" => 1 }],
|
258
|
+
}
|
259
|
+
end
|
260
|
+
|
261
|
+
before(:each) do
|
262
|
+
provider.current_resource = current_resource
|
263
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
264
|
+
end
|
265
|
+
|
266
|
+
it "should use resource name for identifier when not specified" do
|
267
|
+
resource.profile_name "com.testprofile.screensaver"
|
268
|
+
resource.action(:remove)
|
269
|
+
provider.load_current_resource
|
270
|
+
expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.profile_name)
|
271
|
+
end
|
272
|
+
|
273
|
+
it "should use specified identifier" do
|
274
|
+
resource.identifier "com.testprofile.screensaver"
|
275
|
+
resource.action(:remove)
|
276
|
+
provider.load_current_resource
|
277
|
+
expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.identifier)
|
278
|
+
end
|
279
|
+
|
280
|
+
it "should work with spaces in the identifier" do
|
281
|
+
provider.action = :remove
|
282
|
+
provider.define_resource_requirements
|
283
|
+
expect { provider.process_resource_requirements }.not_to raise_error
|
284
|
+
end
|
285
|
+
|
286
|
+
it "should build the shellout remove command correctly" do
|
287
|
+
resource.identifier "com.testprofile.screensaver"
|
288
|
+
resource.action(:remove)
|
289
|
+
provider.load_current_resource
|
290
|
+
expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-R", "-p", resource.identifier).and_return(shell_out_success)
|
291
|
+
provider.action_remove
|
292
|
+
end
|
293
|
+
end
|
61
294
|
end
|
@@ -20,7 +20,7 @@ require "spec_helper"
|
|
20
20
|
|
21
21
|
describe Chef::Resource::PowershellScript do
|
22
22
|
|
23
|
-
|
23
|
+
let(:resource) do
|
24
24
|
node = Chef::Node.new
|
25
25
|
|
26
26
|
node.default["kernel"] = {}
|
@@ -29,26 +29,25 @@ describe Chef::Resource::PowershellScript do
|
|
29
29
|
|
30
30
|
run_context = Chef::RunContext.new(node, nil, nil)
|
31
31
|
|
32
|
-
|
32
|
+
Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
|
33
33
|
end
|
34
34
|
|
35
35
|
it "creates a new Chef::Resource::PowershellScript" do
|
36
|
-
expect(
|
36
|
+
expect(resource).to be_a_kind_of(Chef::Resource::PowershellScript)
|
37
37
|
end
|
38
38
|
|
39
39
|
it "sets convert_boolean_return to false by default" do
|
40
|
-
expect(
|
40
|
+
expect(resource.convert_boolean_return).to eq(false)
|
41
41
|
end
|
42
42
|
|
43
43
|
it "returns the value for convert_boolean_return that was set" do
|
44
|
-
|
45
|
-
expect(
|
46
|
-
|
47
|
-
expect(
|
44
|
+
resource.convert_boolean_return true
|
45
|
+
expect(resource.convert_boolean_return).to eq(true)
|
46
|
+
resource.convert_boolean_return false
|
47
|
+
expect(resource.convert_boolean_return).to eq(false)
|
48
48
|
end
|
49
49
|
|
50
50
|
context "when using guards" do
|
51
|
-
let(:resource) { @resource }
|
52
51
|
before(:each) do
|
53
52
|
allow(resource).to receive(:run_action)
|
54
53
|
allow(resource).to receive(:updated).and_return(true)
|
@@ -126,28 +125,11 @@ describe Chef::Resource::PowershellScript do
|
|
126
125
|
end
|
127
126
|
|
128
127
|
context "as a script running in Windows-based scripting language" do
|
129
|
-
let(:
|
130
|
-
let(:resource_instance_name ) {
|
128
|
+
let(:windows_script_resource) { resource }
|
129
|
+
let(:resource_instance_name ) { resource.command }
|
131
130
|
let(:resource_name) { :powershell_script }
|
132
131
|
let(:interpreter_file_name) { "powershell.exe" }
|
133
|
-
before do
|
134
|
-
allow(@resource).to receive(:default_flags).and_return(nil)
|
135
|
-
end
|
136
|
-
it_behaves_like "a Windows script resource"
|
137
|
-
end
|
138
|
-
|
139
|
-
describe "#flags" do
|
140
|
-
let(:resource) { @resource }
|
141
|
-
|
142
|
-
it "appends user's flags to the defaults" do
|
143
|
-
flags = %q{-Lunch "tacos"}
|
144
|
-
resource.flags = flags
|
145
132
|
|
146
|
-
|
147
|
-
end
|
148
|
-
|
149
|
-
it "uses the defaults when user doesn't provide flags" do
|
150
|
-
expect(resource.flags).to eq(resource.default_flags)
|
151
|
-
end
|
133
|
+
it_behaves_like "a Windows script resource"
|
152
134
|
end
|
153
135
|
end
|
@@ -21,9 +21,14 @@ require "spec_helper"
|
|
21
21
|
|
22
22
|
describe Chef::Resource::Script do
|
23
23
|
let(:resource_instance_name) { "fakey_fakerton" }
|
24
|
-
let(:script_resource) { Chef::Resource::Script.new(resource_instance_name) }
|
25
24
|
let(:resource_name) { :script }
|
26
25
|
|
26
|
+
let(:script_resource) do
|
27
|
+
run_context = Chef::RunContext.new(Chef::Node.new, nil, nil)
|
28
|
+
|
29
|
+
Chef::Resource::Script.new(resource_instance_name, run_context)
|
30
|
+
end
|
31
|
+
|
27
32
|
it "sets the default action as :run" do
|
28
33
|
expect(script_resource.action).to eql([:run])
|
29
34
|
end
|
@@ -22,6 +22,7 @@ describe Chef::Resource::WindowsFeaturePowershell do
|
|
22
22
|
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
23
23
|
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
24
24
|
let(:resource) { Chef::Resource::WindowsFeaturePowershell.new(%w{SNMP DHCP}, run_context) }
|
25
|
+
let(:provider) { resource.provider_for_action(:install) }
|
25
26
|
|
26
27
|
it "sets resource name as :windows_feature_powershell" do
|
27
28
|
expect(resource.resource_name).to eql(:windows_feature_powershell)
|
@@ -35,10 +36,6 @@ describe Chef::Resource::WindowsFeaturePowershell do
|
|
35
36
|
expect(resource.feature_name).to eql(%w{snmp dhcp})
|
36
37
|
end
|
37
38
|
|
38
|
-
it "sets the default action as :install" do
|
39
|
-
expect(resource.action).to eql([:install])
|
40
|
-
end
|
41
|
-
|
42
39
|
it "supports :delete, :install, :remove actions" do
|
43
40
|
expect { resource.action :delete }.not_to raise_error
|
44
41
|
expect { resource.action :install }.not_to raise_error
|
@@ -54,4 +51,33 @@ describe Chef::Resource::WindowsFeaturePowershell do
|
|
54
51
|
resource.feature_name "SNMP"
|
55
52
|
expect(resource.feature_name).to eql(["snmp"])
|
56
53
|
end
|
54
|
+
|
55
|
+
it "install a single feature" do
|
56
|
+
resource.feature_name "snmp"
|
57
|
+
expect { resource.action :install }.not_to raise_error
|
58
|
+
end
|
59
|
+
|
60
|
+
it "install multi feature" do
|
61
|
+
resource.feature_name "SNMP, DHCP"
|
62
|
+
expect { resource.action :install }.not_to raise_error
|
63
|
+
end
|
64
|
+
|
65
|
+
it "does not attempt to install features that have been removed" do
|
66
|
+
node.default["powershell_features_cache"] ||= {}
|
67
|
+
node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
|
68
|
+
node.default["powershell_features_cache"]["removed"] = ["snmp"]
|
69
|
+
resource.feature_name "dhcp, snmp"
|
70
|
+
|
71
|
+
expect(provider.features_to_install).to eq(["dhcp"])
|
72
|
+
end
|
73
|
+
|
74
|
+
it "attempts to install features that have been removed when source is set" do
|
75
|
+
node.default["powershell_features_cache"] ||= {}
|
76
|
+
node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
|
77
|
+
node.default["powershell_features_cache"]["removed"] = ["snmp"]
|
78
|
+
resource.feature_name "dhcp, snmp"
|
79
|
+
resource.source 'D:\\sources\\sxs'
|
80
|
+
|
81
|
+
expect(provider.features_to_install).to eq(%w{dhcp snmp})
|
82
|
+
end
|
57
83
|
end
|
data/spec/unit/role_spec.rb
CHANGED
@@ -259,7 +259,7 @@ describe Chef::Role do
|
|
259
259
|
it "should return a Chef::Role object from JSON" do
|
260
260
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json"])
|
261
261
|
file_path = File.join(Chef::Config[:role_path], "memes/lolcat.json")
|
262
|
-
expect(File).to receive(:
|
262
|
+
expect(File).to receive(:exist?).with(file_path).exactly(1).times.and_return(true)
|
263
263
|
expect(IO).to receive(:read).with(file_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
|
264
264
|
expect(@role).to be_a_kind_of(Chef::Role)
|
265
265
|
@role.class.from_disk("lolcat")
|
@@ -268,7 +268,7 @@ describe Chef::Role do
|
|
268
268
|
it "should return a Chef::Role object from a Ruby DSL" do
|
269
269
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
|
270
270
|
rb_path = File.join(Chef::Config[:role_path], "memes/lolcat.rb")
|
271
|
-
expect(File).to receive(:
|
271
|
+
expect(File).to receive(:exist?).with(rb_path).exactly(1).times.and_return(true)
|
272
272
|
expect(File).to receive(:readable?).with(rb_path).exactly(1).times.and_return(true)
|
273
273
|
expect(File).to receive(:file?).with(rb_path).exactly(1).times.and_return(true)
|
274
274
|
expect(IO).to receive(:read).with(rb_path).and_return(ROLE_DSL)
|
@@ -280,8 +280,8 @@ describe Chef::Role do
|
|
280
280
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes", "#{Chef::Config[:role_path]}/memes/lolcat.json", "#{Chef::Config[:role_path]}/memes/lolcat.rb"])
|
281
281
|
js_path = File.join(Chef::Config[:role_path], "memes/lolcat.json")
|
282
282
|
rb_path = File.join(Chef::Config[:role_path], "memes/lolcat.rb")
|
283
|
-
expect(File).to receive(:
|
284
|
-
expect(File).not_to receive(:
|
283
|
+
expect(File).to receive(:exist?).with(js_path).exactly(1).times.and_return(true)
|
284
|
+
expect(File).not_to receive(:exist?).with(rb_path)
|
285
285
|
expect(IO).to receive(:read).with(js_path).and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
|
286
286
|
expect(@role).to be_a_kind_of(Chef::Role)
|
287
287
|
@role.class.from_disk("lolcat")
|
@@ -289,19 +289,19 @@ describe Chef::Role do
|
|
289
289
|
|
290
290
|
it "should raise an exception if the file does not exist" do
|
291
291
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/meme.rb"])
|
292
|
-
expect(File).not_to receive(:
|
292
|
+
expect(File).not_to receive(:exist?)
|
293
293
|
expect { @role.class.from_disk("lolcat") }.to raise_error(Chef::Exceptions::RoleNotFound)
|
294
294
|
end
|
295
295
|
|
296
296
|
it "should raise an exception if two files exist with the same name" do
|
297
297
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/lolcat.rb"])
|
298
|
-
expect(File).not_to receive(:
|
298
|
+
expect(File).not_to receive(:exist?)
|
299
299
|
expect { @role.class.from_disk("lolcat") }.to raise_error(Chef::Exceptions::DuplicateRole)
|
300
300
|
end
|
301
301
|
|
302
302
|
it "should not raise an exception if two files exist with a similar name" do
|
303
303
|
expect(Dir).to receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
|
304
|
-
expect(File).to receive(:
|
304
|
+
expect(File).to receive(:exist?).with("#{Chef::Config[:role_path]}/memes/lolcat.rb").and_return(true)
|
305
305
|
allow_any_instance_of(Chef::Role).to receive(:from_file).with("#{Chef::Config[:role_path]}/memes/lolcat.rb")
|
306
306
|
expect { @role.class.from_disk("lolcat") }.not_to raise_error
|
307
307
|
end
|
@@ -317,7 +317,7 @@ describe Chef::Role do
|
|
317
317
|
|
318
318
|
it "should return a Chef::Role object from JSON" do
|
319
319
|
expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return(["#{root}/lolcat.json"])
|
320
|
-
expect(File).to receive(:
|
320
|
+
expect(File).to receive(:exist?).with("#{root}/lolcat.json").exactly(1).times.and_return(true)
|
321
321
|
expect(IO).to receive(:read).with("#{root}/lolcat.json").and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
|
322
322
|
expect(@role).to be_a_kind_of(Chef::Role)
|
323
323
|
@role.class.from_disk("lolcat")
|
@@ -326,7 +326,7 @@ describe Chef::Role do
|
|
326
326
|
it "should return a Chef::Role object from JSON when role is in the second path" do
|
327
327
|
expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return([])
|
328
328
|
expect(Dir).to receive(:glob).with(File.join("#{root}/path2", "**", "**")).exactly(1).times.and_return(["#{root}/path2/lolcat.json"])
|
329
|
-
expect(File).to receive(:
|
329
|
+
expect(File).to receive(:exist?).with("#{root}/path2/lolcat.json").exactly(1).times.and_return(true)
|
330
330
|
expect(IO).to receive(:read).with("#{root}/path2/lolcat.json").and_return('{"name": "ceiling_cat", "json_class": "Chef::Role" }')
|
331
331
|
expect(@role).to be_a_kind_of(Chef::Role)
|
332
332
|
@role.class.from_disk("lolcat")
|
@@ -334,7 +334,7 @@ describe Chef::Role do
|
|
334
334
|
|
335
335
|
it "should return a Chef::Role object from a Ruby DSL" do
|
336
336
|
expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return(["#{root}/lolcat.rb"])
|
337
|
-
expect(File).to receive(:
|
337
|
+
expect(File).to receive(:exist?).with("#{root}/lolcat.rb").exactly(1).times.and_return(true)
|
338
338
|
expect(File).to receive(:readable?).with("#{root}/lolcat.rb").and_return(true)
|
339
339
|
expect(File).to receive(:file?).with("#{root}/lolcat.rb").and_return(true)
|
340
340
|
expect(IO).to receive(:read).with("#{root}/lolcat.rb").exactly(1).times.and_return(ROLE_DSL)
|
@@ -345,7 +345,7 @@ describe Chef::Role do
|
|
345
345
|
it "should return a Chef::Role object from a Ruby DSL when role is in the second path" do
|
346
346
|
expect(Dir).to receive(:glob).with(File.join(root, "**", "**")).exactly(1).times.and_return([])
|
347
347
|
expect(Dir).to receive(:glob).with(File.join("#{root}/path2", "**", "**")).exactly(1).times.and_return(["#{root}/path2/lolcat.rb"])
|
348
|
-
expect(File).to receive(:
|
348
|
+
expect(File).to receive(:exist?).with("#{root}/path2/lolcat.rb").exactly(1).times.and_return(true)
|
349
349
|
expect(File).to receive(:readable?).with("#{root}/path2/lolcat.rb").and_return(true)
|
350
350
|
expect(File).to receive(:file?).with("#{root}/path2/lolcat.rb").and_return(true)
|
351
351
|
expect(IO).to receive(:read).with("#{root}/path2/lolcat.rb").exactly(1).times.and_return(ROLE_DSL)
|