diff options
| author | Matt Wrock <matt@mattwrock.com> | 2020-09-25 00:33:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 00:33:32 +0000 |
| commit | 2c48df4f51eef6adc85587fa8bb7aca3b9d0f7bc (patch) | |
| tree | 20678f7c2638441558c25f67bd57b5953862042a | |
| parent | a1e8747af72cf91a7b5a729db647e158f46ad01f (diff) | |
| parent | 288665d13858b3ee5f176d478862da6e3fb82779 (diff) | |
| download | chef-2c48df4f51eef6adc85587fa8bb7aca3b9d0f7bc.tar.gz | |
Merge pull request #10464 from chef/addressable
autoload addressable/uri on :URI inside addressable module
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 4 | ||||
| -rw-r--r-- | lib/chef/mixin/uris.rb | 4 | ||||
| -rw-r--r-- | lib/chef/resource/apt_repository.rb | 4 | ||||
| -rw-r--r-- | lib/chef/search/query.rb | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 37bd7fd448..0f642fe00e 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -33,7 +33,9 @@ module Mixlib autoload :ShellOut, "mixlib/shellout" end autoload :URI, "uri" -autoload :Addressable, "addressable/uri" +module Addressable + autoload :URI, "addressable/uri" +end autoload :OpenSSL, "openssl" autoload :YAML, "yaml" require "chef-utils/dist" unless defined?(ChefUtils::Dist) diff --git a/lib/chef/mixin/uris.rb b/lib/chef/mixin/uris.rb index 74c2af73d8..13c4ee29b3 100644 --- a/lib/chef/mixin/uris.rb +++ b/lib/chef/mixin/uris.rb @@ -17,7 +17,9 @@ # autoload :URI, "uri" -autoload :Addressable, "addressable/uri" +module Addressable + autoload :URI, "addressable/uri" +end class Chef module Mixin diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb index e4569561fc..0dc7f7d9b9 100644 --- a/lib/chef/resource/apt_repository.rb +++ b/lib/chef/resource/apt_repository.rb @@ -19,7 +19,9 @@ require_relative "../resource" require_relative "../http/simple" require "tmpdir" unless defined?(Dir.mktmpdir) -autoload :Addressable, "addressable" +module Addressable + autoload :URI, "addressable/uri" +end class Chef class Resource diff --git a/lib/chef/search/query.rb b/lib/chef/search/query.rb index 70b31cd5e4..c278ea9a68 100644 --- a/lib/chef/search/query.rb +++ b/lib/chef/search/query.rb @@ -21,7 +21,9 @@ require_relative "../exceptions" require_relative "../server_api" autoload :URI, "uri" -autoload :Addressable, "addressable/uri" +module Addressable + autoload :URI, "addressable/uri" +end class Chef class Search |