diff options
| author | Tim Smith <tsmith@chef.io> | 2018-07-10 11:16:20 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-07-10 11:16:20 -0700 |
| commit | 5efbaeaa5ebdfebdc9fe48569a001085b2ec0bcf (patch) | |
| tree | 3752eecdbc32c7a853322d7b87ec5ea2e021ce41 | |
| parent | 313ae36721d7f0fd4b1050433e715b99e52c03e9 (diff) | |
| download | chef-5efbaeaa5ebdfebdc9fe48569a001085b2ec0bcf.tar.gz | |
Attributes -> Properties in a few more resources
Make sure we're calling these properties so we don't further confuse
users.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/resource/dsc_script.rb | 12 | ||||
| -rw-r--r-- | lib/chef/resource/windows_service.rb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb index 7d1e11b659..86be3ddd70 100644 --- a/lib/chef/resource/dsc_script.rb +++ b/lib/chef/resource/dsc_script.rb @@ -46,10 +46,10 @@ class Chef def code(arg = nil) if arg && command - raise ArgumentError, "Only one of 'code' and 'command' attributes may be specified" + raise ArgumentError, "Only one of 'code' and 'command' properties may be specified" end if arg && configuration_name - raise ArgumentError, "The 'code' and 'command' attributes may not be used together" + raise ArgumentError, "The 'code' and 'command' properties may not be used together" end set_or_return( :code, @@ -60,7 +60,7 @@ class Chef def configuration_name(arg = nil) if arg && code - raise ArgumentError, "Attribute `configuration_name` may not be set if `code` is set" + raise ArgumentError, "Property `configuration_name` may not be set if `code` is set" end set_or_return( :configuration_name, @@ -71,7 +71,7 @@ class Chef def command(arg = nil) if arg && code - raise ArgumentError, "The 'code' and 'command' attributes may not be used together" + raise ArgumentError, "The 'code' and 'command' properties may not be used together" end set_or_return( :command, @@ -82,7 +82,7 @@ class Chef def configuration_data(arg = nil) if arg && configuration_data_script - raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together" + raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' properties may not be used together" end set_or_return( :configuration_data, @@ -93,7 +93,7 @@ class Chef def configuration_data_script(arg = nil) if arg && configuration_data - raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together" + raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' properties may not be used together" end set_or_return( :configuration_data_script, diff --git a/lib/chef/resource/windows_service.rb b/lib/chef/resource/windows_service.rb index a9ce1f454f..7e265c57c3 100644 --- a/lib/chef/resource/windows_service.rb +++ b/lib/chef/resource/windows_service.rb @@ -31,7 +31,7 @@ class Chef }.freeze # Until #1773 is resolved, you need to manually specify the windows_service resource - # to use action :configure_startup and attribute startup_type + # to use action :configure_startup and properties startup_type provides(:windows_service) { true } provides :service, os: "windows" |