knife-ec-backup 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d12c87f2f93b3140357b7206d01274571f8adb
-  data.tar.gz: b597018c25f2c2c8da15bbcee036e423c42a26db
+  metadata.gz: 555db6e18f609eb180e4903ce2ca211db5f33444
+  data.tar.gz: 07a794b5dbd08e1c383eb25072ff88e20cdfbcb5
 SHA512:
-  metadata.gz: be56f4584a4e166ead2daa956dbfd2659d572433a33520aba295aa26677acc5c22301b57898c3eb545b26bf7a722a673b3e3b245a7da5222ecfa5704c3e9cf45
-  data.tar.gz: 7c272d46ba92aa91d269dcde62adb146a1a1d4a8ec79ec45ca31acf20e6aa811e835a6103af85fbc1488973d6cf0447425f88b929488c27d68f4f5b3e9648d99
+  metadata.gz: d4679a94465e27cfdbb81930aa828fef32523df2dced01c7be95141691dfe91693ae8749e8003666879f8c04fa331bed31ca9a1a805a400006b9757f0d52ee37
+  data.tar.gz: 23e4d67586e1ff4b6c9e934ff770fdfe6c5bc14c5dcee06e6ba39ab67540f70d7bb7eec6e90f93b01ca2ddc7898c25bad3bef6c2cec1a984004cd8442132d48a

data/lib/chef/knife/ec_restore.rb

@@ -274,9 +274,12 @@ class Chef
           (top_level_paths + group_paths + group_acl_paths + acl_paths).each do |path|
             ::ChefFS::FileSystem.copy_to(::ChefFS::FilePattern.new(path), chef_fs_config.local_fs, chef_fs_config.chef_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
           end
-          # restore clients to groups
+          # restore clients to groups, using the pivotal key again
+          Chef::Config[:node_name] = old_config['node_name']
+          Chef::Config[:client_key] = old_config['client_key'] 
+          Chef::Config.custom_http_headers = {}
           ['admins', 'billing-admins'].each do |group|
-            restore_group(chef_fs_config, group, :users => false)
+            restore_group(::ChefFS::Config.new, group, :users => false)
           end
          ensure
           CONFIG_VARS.each do |key|

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

metadata

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