diff options
author | Tim Smith <tsmith@chef.io> | 2018-08-15 15:36:30 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-08-15 15:36:30 -0700 |
commit | ef1c4abf0a7a8ec0437a771124920eba62cdd766 (patch) | |
tree | 3507533da7a5d9e53f3208d4fde15d15e84967ff /lib/chef/resource | |
parent | 65b92f00cb59a0b41ce29be38387a3cebb6fc5b4 (diff) | |
download | chef-ef1c4abf0a7a8ec0437a771124920eba62cdd766.tar.gz |
Set the new resources as preview resources and remove nil user/group
No need for allowing nil here.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/resource')
-rw-r--r-- | lib/chef/resource/openssl_ec_private_key.rb | 6 | ||||
-rw-r--r-- | lib/chef/resource/openssl_ec_public_key.rb | 6 | ||||
-rw-r--r-- | lib/chef/resource/openssl_x509_certificate.rb | 8 | ||||
-rw-r--r-- | lib/chef/resource/openssl_x509_request.rb | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb index b0c509ac27..69030c7eb2 100644 --- a/lib/chef/resource/openssl_ec_private_key.rb +++ b/lib/chef/resource/openssl_ec_private_key.rb @@ -23,8 +23,8 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper + preview_resource true resource_name :openssl_ec_private_key - provides(:openssl_ec_private_key) { true } description "Use the openssl_ec_private_key resource to generate..." introduced "14.4" @@ -47,10 +47,10 @@ class Chef description: "The designed cipher to use when generating your key. Run `openssl list-cipher-algorithms` to see available options.", default: "des3" - property :owner, [String, nil], + property :owner, String, description: "The owner of all files created by the resource." - property :group, [String, nil], + property :group, String, description: "The group of all files created by the resource." property :mode, [Integer, String], diff --git a/lib/chef/resource/openssl_ec_public_key.rb b/lib/chef/resource/openssl_ec_public_key.rb index eb2f311d01..59bb1d4a80 100644 --- a/lib/chef/resource/openssl_ec_public_key.rb +++ b/lib/chef/resource/openssl_ec_public_key.rb @@ -23,8 +23,8 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper + preview_resource true resource_name :openssl_ec_public_key - provides(:openssl_ec_public_key) { true } description "Use the openssl_ec_public_key resource to..." introduced "14.4" @@ -42,10 +42,10 @@ class Chef property :private_key_pass, String, description: "The passphrase of the provided private key." - property :owner, [String, nil], + property :owner, String, description: "The owner of all files created by the resource." - property :group, [String, nil], + property :group, String, description: "The group of all files created by the resource." property :mode, [Integer, String], diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb index cb50e60fca..5fc508c282 100644 --- a/lib/chef/resource/openssl_x509_certificate.rb +++ b/lib/chef/resource/openssl_x509_certificate.rb @@ -22,16 +22,16 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper + preview_resource true resource_name :openssl_x509_certificate - provides(:openssl_x509) { true } - provides(:openssl_x509_certificate) { true } + provides :openssl_x509 { true } # legacy cookbook name. Cookbook will win. @todo Make this true in Chef 15 property :path, String, name_property: true - property :owner, [String, nil], + property :owner, String, description: "The owner of all files created by the resource." - property :group, [String, nil], + property :group, String, description: "The group of all files created by the resource." property :expire, Integer, default: 365 diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index 5357863122..3a90ee81c1 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -22,16 +22,16 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper + preview_resource true resource_name :openssl_x509_request - provides(:openssl_x509_request) { true } property :path, String, name_property: true, description: "The optional path to write the file to if you'd like to specify it here instead of in the resource name." - property :owner, [String, nil], + property :owner, String, description: "The owner of all files created by the resource." - property :group, [String, nil], + property :group, String, description: "The group of all files created by the resource." property :mode, [Integer, String], default: "0644", |