knife-ec-backup 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1fa04532a43b013c1d7e6f535f6245959c34b88
-  data.tar.gz: 219c74741df411d3072e0927259337972ce69b7e
+  metadata.gz: 54d12c87f2f93b3140357b7206d01274571f8adb
+  data.tar.gz: b597018c25f2c2c8da15bbcee036e423c42a26db
 SHA512:
-  metadata.gz: c85f85e6984ee20d7d87471ff5926df00ae82b834dd8a31242d0ac11e8e44b3bc174090c45676230a2d1005b78e87221223fda79d89e655e7394ede761d829c1
-  data.tar.gz: e2c99033987ecf7e5040c529a0f509b17efc5141d889962537eca3160a3927347d11bf468b4183c9edb52111141a2ee529ce0c6aab755594351a369b2c347f2a
+  metadata.gz: be56f4584a4e166ead2daa956dbfd2659d572433a33520aba295aa26677acc5c22301b57898c3eb545b26bf7a722a673b3e3b245a7da5222ecfa5704c3e9cf45
+  data.tar.gz: 7c272d46ba92aa91d269dcde62adb146a1a1d4a8ec79ec45ca31acf20e6aa811e835a6103af85fbc1488973d6cf0447425f88b929488c27d68f4f5b3e9648d99

data/lib/chef/knife/ec_restore.rb

@@ -238,11 +238,15 @@ class Chef
           # Upload the admins group and billing-admins acls
           puts "Restoring the org admin data"
           chef_fs_config = ::ChefFS::Config.new
-          %w(/groups/admins.json /groups/billing-admins.json /acls/groups/billing-admins.json).each do |name|
-            pattern = ::ChefFS::FilePattern.new(name)
-            if ::ChefFS::FileSystem.copy_to(pattern, chef_fs_config.local_fs, chef_fs_config.chef_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
-              @error = true
-            end
+
+          # Restore users w/o clients (which don't exist yet)
+          ['admins', 'billing-admins'].each do |group|
+            restore_group(chef_fs_config, group, :clients => false)
+          end
+
+          pattern = ::ChefFS::FilePattern.new('/acls/groups/billing-admins.json')
+          if ::ChefFS::FileSystem.copy_to(pattern, chef_fs_config.local_fs, chef_fs_config.chef_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
+            @error = true
           end
 
           # Figure out who the admin is so we can spoof him and retrieve his stuff
@@ -270,6 +274,10 @@ 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
+          ['admins', 'billing-admins'].each do |group|
+            restore_group(chef_fs_config, group, :users => false)
+          end
          ensure
           CONFIG_VARS.each do |key|
             Chef::Config[key.to_sym] = old_config[key]
@@ -277,6 +285,33 @@ class Chef
         end
       end
 
+      def restore_group(chef_fs_config, group_name, includes = {:users => true, :clients => true})
+        includes[:users] = true unless includes.key? :users
+        includes[:clients] = true unless includes.key? :clients
+      
+        group = ::ChefFS::FileSystem.resolve_path(
+          chef_fs_config.chef_fs,
+          "/groups/#{group_name}.json"
+        )
+
+        members_json = ::ChefFS::FileSystem.resolve_path(
+          chef_fs_config.local_fs,
+          "/groups/#{group_name}.json"
+        ).read
+
+        members = JSON.parse(members_json).select do |member|
+          if includes[:users] and includes[:clients]
+            member
+          elsif includes[:users]
+            member == 'users'
+          elsif includes[:clients]
+            member == 'clients'
+          end
+        end
+        
+        group.write(members.to_json)
+      end
+
       def parallelize(entries, options = {}, &block)
         ::ChefFS::Parallelizer.parallelize(entries, options, &block)
       end

data/lib/knife_ec_backup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec