Commit 98a16ccc authored by Tim Smith's avatar Tim Smith
Browse files

Avoid deprecation warnings on Chef 14.3+



Don't load the resources unless we're on a version of Chef that doesn't
have them built in.
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 5342ed33
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
# limitations under the License. # limitations under the License.
# #
chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
resource_name :openssl_dhparam
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
# limitations under the License. # limitations under the License.
# #
chef_version_for_provides '< 14.4' if respond_to?(:chef_version_for_provides)
resource_name :openssl_ec_private_key
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
# limitations under the License. # limitations under the License.
# #
chef_version_for_provides '< 14.4' if respond_to?(:chef_version_for_provides)
resource_name :openssl_ec_public_key
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
#
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
resource_name :openssl_rsa_private_key
provides :openssl_rsa_key # legacy name provides :openssl_rsa_key # legacy name
provides :openssl_rsa_private_key
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
# limitations under the License. # limitations under the License.
# #
chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
resource_name :openssl_rsa_public_key
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
#
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
chef_version_for_provides '< 14.4' if respond_to?(:chef_version_for_provides)
resource_name :openssl_x509_certificate
provides :openssl_x509 # legacy_name provides :openssl_x509 # legacy_name
provides :openssl_x509_certificate
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
......
#
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
chef_version_for_provides '< 14.4' if respond_to?(:chef_version_for_provides)
resource_name :openssl_x509_crl
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
chef_version_for_provides '< 14.4' if respond_to?(:chef_version_for_provides)
resource_name :openssl_x509_request
include OpenSSLCookbook::Helpers include OpenSSLCookbook::Helpers
property :path, String, name_property: true property :path, String, name_property: true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment