diff options
| author | Tim Smith <tsmith@chef.io> | 2018-01-22 11:27:04 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-01-22 11:31:33 -0800 |
| commit | d310076da6fe246a413b82601c8a55cd0ebcef0b (patch) | |
| tree | a574af93ef5037cb61b915b2ddc06efd9ae9a6c2 | |
| parent | 9439fd6e5da8d87f48ebc1b6de4b7c09c8654c39 (diff) | |
| download | chef-d310076da6fe246a413b82601c8a55cd0ebcef0b.tar.gz | |
Rename the OpenSSL mixin to avoid name conflicts
This way people don't have to refactor their code from OpenSSL::Whatever to ::OpenSSL::Whatever
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/mixin/openssl_helper.rb (renamed from lib/chef/mixin/openssl.rb) | 2 | ||||
| -rw-r--r-- | lib/chef/resource/openssl_dhparam.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/openssl_rsa_private_key.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/openssl_rsa_public_key.rb | 4 | ||||
| -rw-r--r-- | spec/unit/mixin/openssl_helper_spec.rb (renamed from spec/unit/mixin/openssl_spec.rb) | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/chef/mixin/openssl.rb b/lib/chef/mixin/openssl_helper.rb index e868da9ac4..fb2638f0e9 100644 --- a/lib/chef/mixin/openssl.rb +++ b/lib/chef/mixin/openssl_helper.rb @@ -17,7 +17,7 @@ class Chef module Mixin - module OpenSSL + module OpenSSLHelper def self.included(_base) require "openssl" unless defined?(::OpenSSL) end diff --git a/lib/chef/resource/openssl_dhparam.rb b/lib/chef/resource/openssl_dhparam.rb index cec27d21bd..693061f535 100644 --- a/lib/chef/resource/openssl_dhparam.rb +++ b/lib/chef/resource/openssl_dhparam.rb @@ -26,8 +26,8 @@ class Chef # # @since 14.0 class OpensslDhparam < Chef::Resource - require "chef/mixin/openssl" - include Chef::Mixin::OpenSSL + require "chef/mixin/openssl_helper" + include Chef::Mixin::OpenSSLHelper resource_name :openssl_dhparam diff --git a/lib/chef/resource/openssl_rsa_private_key.rb b/lib/chef/resource/openssl_rsa_private_key.rb index 32c394846b..4b0bae2fd0 100644 --- a/lib/chef/resource/openssl_rsa_private_key.rb +++ b/lib/chef/resource/openssl_rsa_private_key.rb @@ -27,8 +27,8 @@ class Chef # # @since 14.0 class OpensslRsaPrivateKey < Chef::Resource - require "chef/mixin/openssl" - include Chef::Mixin::OpenSSL + require "chef/mixin/openssl_helper" + include Chef::Mixin::OpenSSLHelper resource_name :openssl_rsa_private_key provides :openssl_rsa_private_key diff --git a/lib/chef/resource/openssl_rsa_public_key.rb b/lib/chef/resource/openssl_rsa_public_key.rb index 602b48065e..5ab7206938 100644 --- a/lib/chef/resource/openssl_rsa_public_key.rb +++ b/lib/chef/resource/openssl_rsa_public_key.rb @@ -23,8 +23,8 @@ class Chef # # @since 14.0 class OpensslRsaPublicKey < Chef::Resource - require "chef/mixin/openssl" - include Chef::Mixin::OpenSSL + require "chef/mixin/openssl_helper" + include Chef::Mixin::OpenSSLHelper resource_name :openssl_rsa_public_key diff --git a/spec/unit/mixin/openssl_spec.rb b/spec/unit/mixin/openssl_helper_spec.rb index 8a0206116c..6873fd8cf2 100644 --- a/spec/unit/mixin/openssl_spec.rb +++ b/spec/unit/mixin/openssl_helper_spec.rb @@ -14,11 +14,11 @@ # limitations under the License. require "spec_helper" -require "chef/mixin/openssl" +require "chef/mixin/openssl_helper" -describe Chef::Mixin::OpenSSL do +describe Chef::Mixin::OpenSSLHelper do let(:instance) do - Class.new { include Chef::Mixin::OpenSSL }.new + Class.new { include Chef::Mixin::OpenSSLHelper }.new end describe ".included" do |