Merge pull request #544 from chef/dedupe_deps

Lazy load deps and avoid double loading
chef · Aug 3, 2018 · 2ce6c37 · 2ce6c37
2 parents 739ddad + 36acbfa
commit 2ce6c37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/chef/knife/ec2_server_create.rb b/lib/chef/knife/ec2_server_create.rb
@@ -31,10 +31,7 @@ class Ec2ServerCreate < Knife
       include Knife::BootstrapWindowsBase
       deps do
         require "tempfile"
-        require "fog/aws"
         require "uri"
-        require "readline"
-        require "chef/json_compat"
         require "chef/knife/bootstrap"
         Chef::Knife::Bootstrap.load_deps
       end

diff --git a/lib/chef/knife/ec2_server_delete.rb b/lib/chef/knife/ec2_server_delete.rb
@@ -19,16 +19,18 @@
 
 require "chef/knife/ec2_base"
 
-# These two are needed for the '--purge' deletion case
-require "chef/node"
-require "chef/api_client"
-
 class Chef
   class Knife
     class Ec2ServerDelete < Knife
 
       include Knife::Ec2Base
 
+      deps do
+        # These two are needed for the '--purge' deletion case
+        require "chef/node"
+        require "chef/api_client"
+      end
+
       banner "knife ec2 server delete SERVER [SERVER] (options)"
 
       attr_reader :server