knife-ec-backup 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff49faa32b80dca130c569470c7294e5b3b85ac
-  data.tar.gz: d704f4be0d92946605874737c318a8c79e57c163
+  metadata.gz: 3eb5963efae70a51a2f7e1c7668040a474387b4e
+  data.tar.gz: be734d4f4c46e9034e1dc11cb7765ad54e9cbf45
 SHA512:
-  metadata.gz: 5550e8d418ecd3e27284c6b6d6d273037599fcc7009c1fa571ef76a353b96fc9442d69b7d9fcf2788e6d200b1b2ed23c7edf1c94d392ee795c1d13d3fc3542f7
-  data.tar.gz: b7aa8833898097da9b0c3cd697c4e2afa089b3608673594ba5d86a099319b2e3cce2ea8af04ab5c408fa52cd8084458c81868c2df7a7852ec1c8801b61d480e8
+  metadata.gz: f37485fee5ddbde8c0478b7f7ff7a7420d970da080ceb237fbc55922ae4e185c4f9d3e215b1479d10a5c19d550f3469d67459476a3f1475235494faf4c34304e
+  data.tar.gz: 7a2883b1e6bab1a4450357604ec120946c99cd06f2631fa1bef08897fd0acd38bebc49434c42bf82c4c6103183040942b7ee8c3a223e4c1489d94de070f5dbcf

data/README.md

@@ -119,5 +119,7 @@ Restores all data from a repository to an Enterprise Chef / Private Chef server.
 
 * Ensure easy installation into embedded ruby gemset on Chef Server.
 * Remove requirement for Knife Essentials gem to be installed.
+* Single org backups.
 * This plugin does **NOT** currently backup user passwords.  **They will have to be reset after a restore.**
+* This plugin does **NOT** currently restore user public keys.  **Private keys will have to be reset after a restore.**
 * This plugin does **NOT** currently restore custom user ACLs.  **It will revert back to default ACLs on a restore.**

data/lib/chef/knife/ec_backup.rb

@@ -197,6 +197,10 @@ class Chef
           if ::ChefFS::FileSystem.copy_to(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
+          pattern = ::ChefFS::FilePattern.new('/groups/admins.json') 
+          if ::ChefFS::FileSystem.copy_to(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
 
           # Figure out who the admin is so we can spoof him and retrieve his stuff
           rest = Chef::REST.new(Chef::Config.chef_server_url)
@@ -213,7 +217,7 @@ class Chef
           acl_paths = ::ChefFS::FileSystem.list(chef_fs_config.chef_fs, ::ChefFS::FilePattern.new('/acls/*')).select { |entry| entry.name != 'groups' }.map { |entry| entry.path }
           group_acl_paths = ::ChefFS::FileSystem.list(chef_fs_config.chef_fs, ::ChefFS::FilePattern.new('/acls/groups/*')).select { |entry| entry.name != 'billing-admins.json' }.map { |entry| entry.path }
           group_paths = ::ChefFS::FileSystem.list(chef_fs_config.chef_fs, ::ChefFS::FilePattern.new('/groups/*')).select { |entry| entry.name != 'billing-admins.json' }.map { |entry| entry.path }
-          (top_level_paths + group_acl_paths + acl_paths).each do |path|
+          (top_level_paths + group_acl_paths + acl_paths + group_paths).each do |path|
             ::ChefFS::FileSystem.copy_to(::ChefFS::FilePattern.new(path), chef_fs_config.chef_fs, chef_fs_config.local_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
           end
 

data/lib/chef/knife/ec_restore.rb

@@ -64,8 +64,8 @@ class Chef
             ui.error("Username not configured as pivotal and /etc/opscode/pivotal.pem does not exist.  It is recommended that you run this plugin from your Chef server.")
             exit 1
           end
-          the_node_name = 'pivotal'
-          the_client_key = '/etc/opscode/pivotal.pem'
+          node_name = 'pivotal'
+          client_key = '/etc/opscode/pivotal.pem'
         end
 
         #Check for WebUI Key
@@ -124,7 +124,7 @@ class Chef
           next if filename !~ /(.+)\.json/
           name = $1
           if name == 'pivotal' && !config[:overwrite_pivotal]
-            ui.warn("Skipping pivotal update.  To overwrite pivotal, pass --overwrite-pivotal.  Once pivotal is updated, you will need to modify #{Chef::Config.client_key} to be the corresponding private key.")
+            ui.warn("Skipping pivotal update.  To overwrite pivotal, pass --overwrite-pivotal.")
             next
           end
 
@@ -203,7 +203,7 @@ class Chef
             next
           end
           if name == 'pivotal' && !config[:overwrite_pivotal]
-            ui.warn("Skipping pivotal update.  To overwrite pivotal, pass --overwrite-pivotal.  Once pivotal is updated, you will need to modify #{Chef::Config.client_key} to be the corresponding private key.")
+            ui.warn("Skipping pivotal update.  To overwrite pivotal, pass --overwrite-pivotal.")
             next
           end
 
@@ -236,6 +236,7 @@ class Chef
           Chef::Config.chef_server_url = "#{Chef::Config.chef_server_root}/organizations/#{name}"
 
           # 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)
@@ -246,34 +247,30 @@ class Chef
 
           # 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_admins = 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) }
-          Chef::Config.node_name = admin_users[0]
-          Chef::Config.client_key = webui_key
+          org_admins.delete_if { |user| !org_members.include?(user) }
+          if org_admins[0] != nil
+            # Using an org admin already on the destination server
+            Chef::Config.node_name = org_admins[0]
+            Chef::Config.client_key = webui_key
+          else
+            # No suitable org admins found, defaulting to pivotal
+            ui.warn("No suitable Organizational Admins found.  Defaulting to pivotal for org creation")
+          end
           Chef::Config.custom_http_headers = (Chef::Config.custom_http_headers || {}).merge({'x-ops-request-source' => 'web'})
 
-          # Do the upload.
+          # Restore the entire org skipping the admin data and restoring groups and acls last
+          puts "Restoring the rest of the org"
           chef_fs_config = ::ChefFS::Config.new
-          # groups and acls come last.
-          children = chef_fs_config.chef_fs.children.map { |child| child.name }
-          children.delete('acls')
-          children.delete('groups')
-          parallelize(children) do |child_name|
-            pattern = ::ChefFS::FilePattern.new("/#{child_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
-          end
-          pattern = ::ChefFS::FilePattern.new("/groups") 
-          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
-          pattern = ::ChefFS::FilePattern.new("/acls") 
-          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
+          top_level_paths = chef_fs_config.local_fs.children.select { |entry| entry.name != 'acls' && entry.name != 'groups' }.map { |entry| entry.path }
+          acl_paths = ::ChefFS::FileSystem.list(chef_fs_config.local_fs, ::ChefFS::FilePattern.new('/acls/*')).select { |entry| entry.name != 'groups' }.map { |entry| entry.path }
+          group_acl_paths = ::ChefFS::FileSystem.list(chef_fs_config.local_fs, ::ChefFS::FilePattern.new('/acls/groups/*')).select { |entry| entry.name != 'billing-admins.json' }.map { |entry| entry.path }
+          group_paths = ::ChefFS::FileSystem.list(chef_fs_config.local_fs, ::ChefFS::FilePattern.new('/groups/*')).select { |entry| entry.name != 'billing-admins.json' }.map { |entry| entry.path }
+          (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
-        ensure
+         ensure
           CONFIG_VARS.each do |key|
             Chef::Config[key.to_sym] = old_config[key]
           end

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

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