knife-ec-backup 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94052e4bc31214ed3d933ea32e32eec0b4edb4fa
-  data.tar.gz: 8961c6197922aabe3f37c1e6512f34f39ec3d5f9
+  metadata.gz: b2d0dc307ee907f00f7887f2ef46cb27aecefcf4
+  data.tar.gz: abb5652ac51d594b2f2749a599b6f5decba542b1
 SHA512:
-  metadata.gz: ed3bca73a87926b22a535f3a90433d46f92e1431c3a8b75cee5ae6cefe615e93e63568aa2565e7b5ca0d1846566bcc41186448274f71a395c599a6ba2e72f853
-  data.tar.gz: fb41fbd804d5b37d2db68f01865ff4ec3a9777e273c2541423db22d7f85aa94327fba3d8b40bb4d0c0ce63efbf48111dbd0ee12f2557f4b41d33a74c063a7224
+  metadata.gz: 111b7aeebdc6ba42a2b61df54a73f1bf8655a5b23dd5de777362e9d42ecb3b1f3fbcd8b5b3c03e6933d4f38ad92a8322f5ca405e50a4f1d2918120ffe6081645
+  data.tar.gz: f1fc9a102464d737fe314dd78f7f0e7e8482a7809d8f858ee6992548f1950f17121996b739168a170135c70497c867993b2a29a7490fd236f59587300b3412ec

data/lib/chef/knife/ec_backup.rb

@@ -57,16 +57,22 @@ class Chef
         end
       end
 
+      PATHS = %w(chef_repo_path cookbook_path environment_path data_bag_path role_path node_path client_path acl_path group_path container_path)
+      CONFIG_VARS = %w(chef_server_url custom_http_headers node_name client_key) + PATHS
       def download_org(dest_dir, webui_key, name)
-        @old_chef_server_url = Chef::Config.chef_server_url
-        @old_chef_repo_path = Chef::Config.chef_repo_path
-        @old_node_name = Chef::Config.node_name
-        @old_custom_http_headers = Chef::Config.custom_http_headers
-        @old_client_key = Chef::Config.client_key
+        old_config = {}
+        CONFIG_VARS.each do |key|
+          old_config[key] = Chef::Config[key]
+        end
         begin
-          Chef::Config.chef_server_url = "#{Chef::Config.chef_server_url}/organizations/#{name}"
+          # Clear out paths
+          PATHS.each do |path_var|
+            Chef::Config[path_var] = nil
+          end
           Chef::Config.chef_repo_path = "#{dest_dir}/organizations/#{name}"
 
+          Chef::Config.chef_server_url = "#{Chef::Config.chef_server_url}/organizations/#{name}"
+
           # Figure out who the admin is so we can spoof him and retrieve his stuff
           admin_users = rest.get_rest('groups/admins')['users']
           org_members = rest.get_rest('users').map { |user| user['user']['username'] }
@@ -83,11 +89,9 @@ class Chef
             @error = true
           end
         ensure
-          Chef::Config.chef_server_url = @old_chef_server_url
-          Chef::Config.chef_repo_path = @old_chef_repo_path
-          Chef::Config.node_name = @old_node_name
-          Chef::Config.custom_http_headers = @old_custom_http_headers
-          Chef::Config.client_key = @old_client_key
+          CONFIG_VARS.each do |key|
+            Chef::Config[key] = old_config[key]
+          end
         end
       end
     end

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John Keiser