diff options
author | Tim Smith <tsmith@chef.io> | 2018-10-26 13:07:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-26 13:07:55 -0700 |
commit | abedea1af6c5ce459819195e9e617512e42af330 (patch) | |
tree | d3a175949ad40299945454e3b9ccb19584e43e75 | |
parent | 1b6c746837441123376dcb0737f8e8cb91c292aa (diff) | |
parent | d5ed55048ac1ad60d56fdd915283b55992696784 (diff) | |
download | chef-abedea1af6c5ce459819195e9e617512e42af330.tar.gz |
Merge pull request #7786 from chef/prep_15
Make all Chef 14 preview resources into full resources
-rw-r--r-- | lib/chef/resource/chocolatey_config.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/chocolatey_source.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/cron_access.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/cron_d.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/kernel_module.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/locale.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/openssl_ec_private_key.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/openssl_ec_public_key.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/openssl_x509_certificate.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/openssl_x509_crl.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/openssl_x509_request.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/powershell_package_source.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/ssh_known_hosts_entry.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/timezone.rb | 1 | ||||
-rw-r--r-- | spec/unit/resource/chocolatey_config_spec.rb | 5 | ||||
-rw-r--r-- | spec/unit/resource/chocolatey_source_spec.rb | 5 | ||||
-rw-r--r-- | spec/unit/resource/kernel_module_spec.rb | 5 | ||||
-rw-r--r-- | spec/unit/resource/ssh_known_hosts_entry_spec.rb | 5 |
18 files changed, 0 insertions, 34 deletions
diff --git a/lib/chef/resource/chocolatey_config.rb b/lib/chef/resource/chocolatey_config.rb index e9452e8f3c..84c91e0167 100644 --- a/lib/chef/resource/chocolatey_config.rb +++ b/lib/chef/resource/chocolatey_config.rb @@ -17,7 +17,6 @@ class Chef class Resource class ChocolateyConfig < Chef::Resource - preview_resource true resource_name :chocolatey_config description "Use the chocolatey_config resource to add or remove Chocolatey configuration keys." diff --git a/lib/chef/resource/chocolatey_source.rb b/lib/chef/resource/chocolatey_source.rb index 5319f82ab4..05f8848117 100644 --- a/lib/chef/resource/chocolatey_source.rb +++ b/lib/chef/resource/chocolatey_source.rb @@ -17,7 +17,6 @@ class Chef class Resource class ChocolateySource < Chef::Resource - preview_resource true resource_name :chocolatey_source description "Use the chocolatey_source resource to add or remove Chocolatey sources." diff --git a/lib/chef/resource/cron_access.rb b/lib/chef/resource/cron_access.rb index b6b822ba40..cf50d4ace4 100644 --- a/lib/chef/resource/cron_access.rb +++ b/lib/chef/resource/cron_access.rb @@ -23,7 +23,6 @@ require "chef/resource" class Chef class Resource class CronAccess < Chef::Resource - preview_resource true resource_name :cron_access provides(:cron_manage) # legacy name @todo in Chef 15 we should { true } this so it wins over the cookbook diff --git a/lib/chef/resource/cron_d.rb b/lib/chef/resource/cron_d.rb index ab6d600a16..304a1ad388 100644 --- a/lib/chef/resource/cron_d.rb +++ b/lib/chef/resource/cron_d.rb @@ -21,7 +21,6 @@ require "shellwords" class Chef class Resource class CronD < Chef::Resource - preview_resource true resource_name :cron_d introduced "14.4" diff --git a/lib/chef/resource/kernel_module.rb b/lib/chef/resource/kernel_module.rb index 54f213cd11..0976b9c211 100644 --- a/lib/chef/resource/kernel_module.rb +++ b/lib/chef/resource/kernel_module.rb @@ -11,7 +11,6 @@ require "chef/resource" class Chef class Resource class KernelModule < Chef::Resource - preview_resource true resource_name :kernel_module description "Use the kernel_module resource to manage kernel modules on Linux systems. This resource can load, unload, blacklist, install, and uninstall modules." diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb index 9c5e7d0eea..443e682c47 100644 --- a/lib/chef/resource/locale.rb +++ b/lib/chef/resource/locale.rb @@ -20,7 +20,6 @@ require "chef/resource" class Chef class Resource class Locale < Chef::Resource - preview_resource true resource_name :locale description "Use the locale resource to set the system's locale." diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb index 77e98f9c2d..72543f7612 100644 --- a/lib/chef/resource/openssl_ec_private_key.rb +++ b/lib/chef/resource/openssl_ec_private_key.rb @@ -24,7 +24,6 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper - preview_resource true resource_name :openssl_ec_private_key description "Use the openssl_ec_private_key resource to generate an elliptic curve (EC) private key file. If a valid EC key file can be opened at the specified location, no new file will be created. If the EC key file cannot be opened, either because it does not exist or because the password to the EC key file does not match the password in the recipe, then it will be overwritten." diff --git a/lib/chef/resource/openssl_ec_public_key.rb b/lib/chef/resource/openssl_ec_public_key.rb index 9b1ded4043..51eb4c93a2 100644 --- a/lib/chef/resource/openssl_ec_public_key.rb +++ b/lib/chef/resource/openssl_ec_public_key.rb @@ -24,7 +24,6 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper - preview_resource true resource_name :openssl_ec_public_key description "Use the openssl_ec_public_key resource to generate elliptic curve (EC) public key files given a private key." diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb index 192b56026a..467bffb9cf 100644 --- a/lib/chef/resource/openssl_x509_certificate.rb +++ b/lib/chef/resource/openssl_x509_certificate.rb @@ -24,7 +24,6 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper - preview_resource true resource_name :openssl_x509_certificate provides(:openssl_x509) { true } # legacy cookbook name. diff --git a/lib/chef/resource/openssl_x509_crl.rb b/lib/chef/resource/openssl_x509_crl.rb index 06f73bdd51..7f41c551cc 100644 --- a/lib/chef/resource/openssl_x509_crl.rb +++ b/lib/chef/resource/openssl_x509_crl.rb @@ -24,7 +24,6 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper - preview_resource true resource_name :openssl_x509_crl description "Use the openssl_x509_crl resource to generate PEM-formatted x509 certificate revocation list (CRL) files." diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index a553e38a89..b4699612c9 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -24,7 +24,6 @@ class Chef require "chef/mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper - preview_resource true resource_name :openssl_x509_request description "Use the openssl_x509_request resource to generate PEM-formatted x509 certificates requests. If no existing key is specified, the resource will automatically generate a passwordless key with the certificate." diff --git a/lib/chef/resource/powershell_package_source.rb b/lib/chef/resource/powershell_package_source.rb index b3bad41f65..321a788822 100644 --- a/lib/chef/resource/powershell_package_source.rb +++ b/lib/chef/resource/powershell_package_source.rb @@ -21,7 +21,6 @@ require "chef/json_compat" class Chef class Resource class PowershellPackageSource < Chef::Resource - preview_resource true resource_name "powershell_package_source" description "Use the powershell_package_source resource to register a PowerShell package repository." diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb index a1257722e0..5685a069a7 100644 --- a/lib/chef/resource/ssh_known_hosts_entry.rb +++ b/lib/chef/resource/ssh_known_hosts_entry.rb @@ -22,7 +22,6 @@ require "chef/resource" class Chef class Resource class SshKnownHostsEntry < Chef::Resource - preview_resource true resource_name :ssh_known_hosts_entry description "Use the ssh_known_hosts_entry resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified." diff --git a/lib/chef/resource/timezone.rb b/lib/chef/resource/timezone.rb index 8834e2404f..ef851c154e 100644 --- a/lib/chef/resource/timezone.rb +++ b/lib/chef/resource/timezone.rb @@ -22,7 +22,6 @@ require "chef/resource" class Chef class Resource class Timezone < Chef::Resource - preview_resource true resource_name :timezone description "Use the timezone resource to change the system timezone." diff --git a/spec/unit/resource/chocolatey_config_spec.rb b/spec/unit/resource/chocolatey_config_spec.rb index 3c50642487..b6f36026bd 100644 --- a/spec/unit/resource/chocolatey_config_spec.rb +++ b/spec/unit/resource/chocolatey_config_spec.rb @@ -53,11 +53,6 @@ CONFIG expect(resource.resource_name).to eql(:chocolatey_config) end - it "is not a preview resource in Chef 15" do - pending("Chef 15") unless Chef::VERSION.start_with?("15") - expect(resource.class.preview_resource).to be_falsey - end - it "has a name property of config_key" do expect(resource.config_key).to eql("fakey_fakerton") end diff --git a/spec/unit/resource/chocolatey_source_spec.rb b/spec/unit/resource/chocolatey_source_spec.rb index 237eb5b787..bbead24e79 100644 --- a/spec/unit/resource/chocolatey_source_spec.rb +++ b/spec/unit/resource/chocolatey_source_spec.rb @@ -53,11 +53,6 @@ CONFIG expect(resource.resource_name).to eql(:chocolatey_source) end - it "is not a preview resource in Chef 15" do - pending("Chef 15") unless Chef::VERSION.start_with?("15") - expect(resource.class.preview_resource).to be_falsey - end - it "has a name property of source_name" do expect(resource.source_name).to eql("fakey_fakerton") end diff --git a/spec/unit/resource/kernel_module_spec.rb b/spec/unit/resource/kernel_module_spec.rb index 03cda28471..6cbc047e79 100644 --- a/spec/unit/resource/kernel_module_spec.rb +++ b/spec/unit/resource/kernel_module_spec.rb @@ -24,11 +24,6 @@ describe Chef::Resource::KernelModule do expect(resource.resource_name).to eql(:kernel_module) end - it "is not a preview resource in Chef 15" do - pending("Chef 15") unless Chef::VERSION.start_with?("15") - expect(resource.class.preview_resource).to be_falsey - end - it "sets the default action as :install" do expect(resource.action).to eql([:install]) end diff --git a/spec/unit/resource/ssh_known_hosts_entry_spec.rb b/spec/unit/resource/ssh_known_hosts_entry_spec.rb index 3bae37dfe7..251675dd10 100644 --- a/spec/unit/resource/ssh_known_hosts_entry_spec.rb +++ b/spec/unit/resource/ssh_known_hosts_entry_spec.rb @@ -26,11 +26,6 @@ describe Chef::Resource::SshKnownHostsEntry do end let(:resource) { Chef::Resource::SshKnownHostsEntry.new("example.com", run_context) } - it "is not a preview resource in Chef 15" do - pending("Chef 15") unless Chef::VERSION.start_with?("15") - expect(resource.class.preview_resource).to be_falsey - end - it "sets resource name as :ssh_known_hosts_entry" do expect(resource.resource_name).to eql(:ssh_known_hosts_entry) end |