knife-ec-backup 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64485c8411324223a9453e39e68afbd7a834aa2
-  data.tar.gz: 904be6ea0754370384521c07d90578fa70ca4513
+  metadata.gz: 5c285a56c4950610acb55aa11b686076df1a82b2
+  data.tar.gz: 5e6b0e50898af2481631db6703072bfd9708621a
 SHA512:
-  metadata.gz: 084f0ac8b43a0cd0139dd97c2a41e7840641bbca0589bba38a388845ca98857446c2f147e336a7943966804facf8949f27133b986e13480fbba8b314536a9970
-  data.tar.gz: 1e8489c6d5da29a0fd2bd6f8697cf78fe198905efbde6dfecd75ae4c586727552bcb2c969af634af376ddd3eac24fd13ba7e52a491fe399e4e91234ca2f92bda
+  metadata.gz: a0422cabb085a15ddf31b14a0eb53e169c184844a8ccd11091d2c8678355130d4fd99adde97ed4afb9a880b56652347b0f1b1ab948b5ab3e293234e59a37929b
+  data.tar.gz: 4fa91e9ebb1a1b5f5ebe8f1b7e03adb692b8e53cf8f897cc973e811ee9b48c242d046164f7547c7e5981aed050f3f469b9c0b4a3edf7d1dd0ff2f8b7b2fbb26d

data/lib/chef/knife/ec_backup.rb

@@ -33,10 +33,10 @@ class Chef
 
         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)
+            file.write(Chef::JSONCompat.to_json_pretty(rest.get_rest(url)))
           end
           File.open("#{dest_dir}/user_acls/#{name}.json", 'w') do |file|
-            file.write(user_acl_rest.get_rest("users/#{name}/_acl").to_json)
+            file.write(Chef::JSONCompat.to_json_pretty(user_acl_rest.get_rest("users/#{name}/_acl")))
           end
         end
 
@@ -46,10 +46,17 @@ class Chef
           org = rest.get_rest(url)
           if org['assigned_at']
             puts "Grabbing organization #{name} ..."
-            File.open("#{dest_dir}/organizations/#{name}.json", 'w') do |file|
-              file.write(org.to_json)
-            end
+            ensure_dir("#{dest_dir}/organizations/#{name}")
             download_org(dest_dir, webui_key, name)
+            File.open("#{dest_dir}/organizations/#{name}/org.json", 'w') do |file|
+              file.write(Chef::JSONCompat.to_json_pretty(org))
+            end
+            File.open("#{dest_dir}/organizations/#{name}/members.json", 'w') do |file|
+              file.write(Chef::JSONCompat.to_json_pretty(rest.get_rest("#{url}/users")))
+            end
+            File.open("#{dest_dir}/organizations/#{name}/invitations.json", 'w') do |file|
+              file.write(Chef::JSONCompat.to_json_pretty(rest.get_rest("#{url}/association_requests")))
+            end
           end
         end
 
@@ -80,6 +87,17 @@ class Chef
 
           Chef::Config.chef_server_url = "#{Chef::Config.chef_server_url}/organizations/#{name}"
 
+          ensure_dir(Chef::Config.chef_repo_path)
+
+          # Download the billing-admins acls as pivotal
+          chef_fs_config = ::ChefFS::Config.new
+          %w(/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
+          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)
           admin_users = rest.get_rest('groups/admins')['users']
@@ -90,8 +108,7 @@ class Chef
           Chef::Config.custom_http_headers = (Chef::Config.custom_http_headers || {}).merge({'x-ops-request-source' => 'web'})
 
           # 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) })
             @error = true

data/lib/chef/knife/ec_restore.rb

@@ -0,0 +1,186 @@
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class EcRestore < Chef::Knife
+      banner "knife ec restore"
+
+      deps do
+        require 'chef/json_compat'
+        require 'chef_fs/config'
+        require 'chef_fs/file_system'
+        require 'chef_fs/file_pattern'
+        require 'chef_fs/file_system/acl_entry'
+        require 'chef_fs/data_handler/acl_data_handler'
+        require 'securerandom'
+        require 'chef_fs/parallelizer'
+      end
+
+      def run
+        if name_args.length == 0
+          ui.error("Must specify backup directory as argument.")
+          exit 1
+        end
+
+        dest_dir = name_args[0]
+        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[2])
+        else
+          user_acl_rest = rest
+        end
+
+        # Restore users
+        puts "Restoring users ..."
+        Dir.foreach("#{dest_dir}/users") do |filename|
+          next if filename !~ /(.+)\.json/
+          name = $1
+          user = JSONCompat.from_json(IO.read("#{dest_dir}/users/#{name}.json"))
+          begin
+            user_with_password = user.dup
+            user_with_password['password'] = SecureRandom.hex
+            rest.post_rest('users', user_with_password)
+          rescue Net::HTTPServerException => e
+            if e.response.code == "409"
+              rest.put_rest("users/#{name}", user)
+            else
+              raise
+            end
+          end
+          # Doesn't work at present
+          #user_acl = JSONCompat.from_json(IO.read("#{dest_dir}/user_acls/#{name}.json"))
+          #put_acl(user_acl_rest, "users/#{name}/_acl", user_acl)
+        end
+
+        # Restore organizations
+        Dir.foreach("#{dest_dir}/organizations") do |name|
+          next if name == '..' || name == '.' || !File.directory?("#{dest_dir}/organizations/#{name}")
+          puts "Restoring org #{name} ..."
+
+          # Create organization
+          org = JSONCompat.from_json(IO.read("#{dest_dir}/organizations/#{name}/org.json"))
+          begin
+            rest.post_rest('organizations', org)
+          rescue Net::HTTPServerException => e
+            if e.response.code == "409"
+              rest.put_rest("organizations/#{name}", org)
+            else
+              raise
+            end
+          end
+
+          # Restore open invitations
+          invitations = JSONCompat.from_json(IO.read("#{dest_dir}/organizations/#{name}/invitations.json"))
+          parallelize(invitations) do |invitation|
+            begin
+              rest.post_rest("organizations/#{name}/association_requests", { 'user' => invitation['username'] })
+            rescue Net::HTTPServerException => e
+              if e.response.code != "409"
+                raise
+              end
+            end
+          end
+
+          # Repopulate org members
+          members = JSONCompat.from_json(IO.read("#{dest_dir}/organizations/#{name}/members.json"))
+          parallelize(members) do |member|
+            username = member['user']['username']
+            begin
+              response = rest.post_rest("organizations/#{name}/association_requests", { 'user' => username })
+              association_id = response["uri"].split("/").last
+              rest.put_rest("users/#{username}/association_requests/#{association_id}", { 'response' => 'accept' })
+            rescue Net::HTTPServerException => e
+              if e.response.code != "409"
+                raise
+              end
+            end
+          end
+
+          # Upload org data
+          upload_org(dest_dir, webui_key, name)
+        end
+
+        if @error
+          exit 1
+        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 upload_org(dest_dir, webui_key, name)
+        old_config = {}
+        CONFIG_VARS.each do |key|
+          old_config[key] = Chef::Config[key]
+        end
+        begin
+          # 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}"
+
+          # Upload the admins group and billing-admins acls
+          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
+          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)
+          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) }
+          Chef::Config.node_name = admin_users[0]
+          Chef::Config.client_key = webui_key
+          Chef::Config.custom_http_headers = (Chef::Config.custom_http_headers || {}).merge({'x-ops-request-source' => 'web'})
+
+          # Do the upload.
+          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
+          end
+        ensure
+          CONFIG_VARS.each do |key|
+            Chef::Config[key] = old_config[key]
+          end
+        end
+      end
+
+      def parallelize(entries, options = {}, &block)
+        ::ChefFS::Parallelizer.parallelize(entries, options, &block)
+      end
+
+      def put_acl(rest, url, acls)
+        old_acls = rest.get_rest(url)
+        old_acls = ::ChefFS::DataHandler::AclDataHandler.new.normalize(old_acls, nil)
+        acls = ::ChefFS::DataHandler::AclDataHandler.new.normalize(acls, nil)
+        if acls != old_acls
+          ::ChefFS::FileSystem::AclEntry::PERMISSIONS.each do |permission|
+            rest.put_rest("#{url}/#{permission}", { permission => acls[permission] })
+          end
+        end
+      end
+    end
+  end
+end

data/lib/knife_ec_backup/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - John Keiser
@@ -50,7 +50,7 @@ files:
 - README.md
 - Rakefile
 - lib/chef/knife/ec_backup.rb
-- lib/chef/knife/opc_restore.rb
+- lib/chef/knife/ec_restore.rb
 - lib/knife_ec_backup/version.rb
 homepage: http://www.opscode.com
 licenses:

data/lib/chef/knife/opc_restore.rb

@@ -1,96 +0,0 @@
-require 'chef/knife'
-
-class Chef
-  class Knife
-    class EcRestore < Chef::Knife
-      banner "knife ec restore"
-
-      deps do
-        require 'chef_fs/config'
-        require 'chef_fs/file_system'
-        require 'chef_fs/file_pattern'
-      end
-
-      def run
-        if name_args.length == 0
-          ui.error("Must specify backup directory as argument.")
-          exit 1
-        end
-
-        dest_dir = name_args[0]
-        webui_key = name_args[1]
-        rest = Chef::REST.new(Chef::Config.chef_server_url)
-
-        # Restore users
-        puts "Restoring users ..."
-        Dir.foreach("#{dest_dir}/users") do |user_file|
-          next if user_file !~ /(.+)\.json$/
-          name = $1
-          rest.post("#{dest_dir}/users", JSONCompat.to_json(IO.read("#{dest_dir}/users/#{user_file}")))
-        end
-
-        # Download organizations
-        Dir.foreach("#{dest_dir}/organizations") do |org_file|
-          next if org_file !~ /(.+)\.json/
-          name = $1
-          rest.post("#{dest_dir}/organizations", JSONCompat.to_json(IO.read("#{dest_dir}/users/#{user_file}")))
-        end
-        rest.get('/organizations').each_pair do |name, url|
-          org = rest.get(url)
-          if org['assigned_at']
-            puts "Restoring organization #{name} ..."
-            File.open("#{dest_dir}/organizations/#{name}.json", 'w') do |file|
-              file.write(org.to_json)
-            end
-            download_org(dest_dir, webui_key, name)
-          end
-        end
-
-        if @error
-          exit 1
-        end
-      end
-
-      def ensure_dir(dir)
-        if !File.exist?(dir)
-          Dir.mkdir(dir)
-        end
-      end
-
-      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
-        begin
-          Chef::Config.chef_server_url = "#{Chef::Config.chef_server_url}/organizations/#{name}"
-          Chef::Config.chef_repo_path = "#{dest_dir}/organizations/#{name}"
-
-          # Figure out who the admin is so we can spoof him and retrieve his stuff
-          admin_users = rest.get('groups/admins')['users']
-          org_members = rest.get('users').map { |user| user['user']['username'] }
-          admin_users.delete_if { |user| !org_members.include?(user) }
-          admin = admin_users[0]
-          Chef::Config.node_name = admin_users[0]
-          Chef::Config.client_key = webui_key
-          Chef::Config.custom_http_headers = (Chef::Config.custom_http_headers || {}).merge({'x-ops-request-source' => 'web'})
-
-          # Do the download
-          ensure_dir(Chef::Config.chef_repo_path)
-          @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) })
-            @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
-        end
-      end
-    end
-  end
-end