Move most bootstrap requires into deps()

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index b2c4b72f5e..d46bf455e9 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -18,11 +18,6 @@
 
 require "chef/knife"
 require "chef/knife/data_bag_secret_options"
-require "erubis"
-require "chef/knife/bootstrap/chef_vault_handler"
-require "chef/knife/bootstrap/client_builder"
-require "chef/util/path_helper"
-require "chef/dist"
 
 class Chef
   class Knife
@@ -390,7 +385,13 @@ class Chef
       attr_reader   :connection
 
       deps do
+        require "erubis"
+
         require "chef/json_compat"
+        require "chef/util/path_helper"
+        require "chef/knife/bootstrap/chef_vault_handler"
+        require "chef/knife/bootstrap/client_builder"
+        require "chef/knife/bootstrap/train_connector"
       end
 
       banner "knife bootstrap [PROTOCOL://][USER@]FQDN (options)"
@@ -623,8 +624,6 @@ class Chef
       end
 
       def do_connect(conn_options)
-        require "chef/knife/bootstrap/train_connector"
-
         @connection = TrainConnector.new(host_descriptor, connection_protocol, conn_options)
         connection.connect!
       end