knife-ec-backup 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d0dc307ee907f00f7887f2ef46cb27aecefcf4
-  data.tar.gz: abb5652ac51d594b2f2749a599b6f5decba542b1
+  metadata.gz: c64485c8411324223a9453e39e68afbd7a834aa2
+  data.tar.gz: 904be6ea0754370384521c07d90578fa70ca4513
 SHA512:
-  metadata.gz: 111b7aeebdc6ba42a2b61df54a73f1bf8655a5b23dd5de777362e9d42ecb3b1f3fbcd8b5b3c03e6933d4f38ad92a8322f5ca405e50a4f1d2918120ffe6081645
-  data.tar.gz: f1fc9a102464d737fe314dd78f7f0e7e8482a7809d8f858ee6992548f1950f17121996b739168a170135c70497c867993b2a29a7490fd236f59587300b3412ec
+  metadata.gz: 084f0ac8b43a0cd0139dd97c2a41e7840641bbca0589bba38a388845ca98857446c2f147e336a7943966804facf8949f27133b986e13480fbba8b314536a9970
+  data.tar.gz: 1e8489c6d5da29a0fd2bd6f8697cf78fe198905efbde6dfecd75ae4c586727552bcb2c969af634af376ddd3eac24fd13ba7e52a491fe399e4e91234ca2f92bda

data/lib/chef/knife/ec_backup.rb

@@ -21,16 +21,23 @@ class Chef
         webui_key = name_args[1]
         rest = Chef::REST.new(Chef::Config.chef_server_url)
         if name_args.length >= 3
-          user_acl_rest = Chef::REST.new(name_args[3])
+          user_acl_rest = Chef::REST.new(name_args[2])
+        else
+          user_acl_rest = rest
         end
+
         # Grab users
+        puts "Grabbing users ..."
         ensure_dir("#{dest_dir}/users")
+        ensure_dir("#{dest_dir}/user_acls")
 
-        puts "Grabbing users ..."
         rest.get_rest('/users').each_pair do |name, url|
           File.open("#{dest_dir}/users/#{name}.json", 'w') do |file|
             file.write(rest.get_rest(url).to_json)
           end
+          File.open("#{dest_dir}/user_acls/#{name}.json", 'w') do |file|
+            file.write(user_acl_rest.get_rest("users/#{name}/_acl").to_json)
+          end
         end
 
         # Download organizations
@@ -74,6 +81,7 @@ class Chef
           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
+          rest = Chef::REST.new(Chef::Config.chef_server_url)
           admin_users = rest.get_rest('groups/admins')['users']
           org_members = rest.get_rest('users').map { |user| user['user']['username'] }
           admin_users.delete_if { |user| !org_members.include?(user) }
@@ -83,9 +91,9 @@ class Chef
 
           # Do the download
           ensure_dir(Chef::Config.chef_repo_path)
-          @chef_fs_config ||= ::ChefFS::Config.new
+          chef_fs_config ||= ::ChefFS::Config.new
           root_pattern = ::ChefFS::FilePattern.new('/')
-          if ::ChefFS::FileSystem.copy_to(root_pattern, @chef_fs_config.chef_fs, @chef_fs_config.local_fs, nil, config, ui, proc { |entry| @chef_fs_config.format_path(entry) })
+          if ::ChefFS::FileSystem.copy_to(root_pattern, chef_fs_config.chef_fs, chef_fs_config.local_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
             @error = true
           end
         ensure

data/lib/chef/knife/opc_restore.rb

@@ -2,8 +2,8 @@ require 'chef/knife'
 
 class Chef
   class Knife
-    class OpcRestore < Chef::Knife
-      banner "knife opc restore"
+    class EcRestore < Chef::Knife
+      banner "knife ec restore"
 
       deps do
         require 'chef_fs/config'

data/lib/knife_ec_backup/version.rb

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

metadata

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