knife-ec-backup 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 49eae40bfe9da28186050773eef46ac2cd63a1f4
-  data.tar.gz: 1669ea6a6b98ec0154889832a2ed382d21376d7f
+SHA256:
+  metadata.gz: 6e94dbbeb73cf96ad811e14f7f28c23122179345a8e892c56ca1a1b562f727e2
+  data.tar.gz: 2bf04cbef9be2ec11aaccc083ee4b01d8647e7b3b3da6a9aec3f95ada34e1f59
 SHA512:
-  metadata.gz: 27c51b93ff94f47c7386421aa926c1ea6442fd746077936601eb7623d8732fe8e4a521dd191146250880eeafe925fc69cc5f8c62346a7b13cda5725dfd1b9947
-  data.tar.gz: 0ecb787dfe351a7094fb81643d4de7eae4d8f00238208678e0e1e6a79be07c4cd6f7d6c61b21189a327cabb0fabdb7c4abf93948c3fcbff8ca5edc09bc54ed09
+  metadata.gz: 101b9da212a5407d68829335e264b919760aca883cd9d9aec04a7165a4fb38b0daf86d04126324c681ee59965b80b3b34f8241f0d11eb351af771cf3612e087f
+  data.tar.gz: 5b44c656dc7ed08f8965c0a6492ecdcf76fec04fa81631bd16d4c92dc4061accdbbe3c89b5805514832c88ef4b9c6df1dc5875389d5ca24af3273a349f994615

data/lib/chef/knife/ec_backup.rb

@@ -50,6 +50,8 @@ class Chef
           download_org_invitations(name)
         end
 
+        warn_on_incorrect_clients_group(dest_dir, "backup")
+
         completion_banner
       end
 

data/lib/chef/knife/ec_base.rb

@@ -20,6 +20,7 @@ require 'chef/knife'
 require 'chef/server_api'
 require 'veil'
 require 'chef/knife/ec_error_handler'
+require 'ffi_yajl'
 
 class Chef
   class Knife
@@ -224,6 +225,21 @@ class Chef
         end
       end
 
+      def warn_on_incorrect_clients_group(dir, op)
+        orgs = Dir[::File.join(dir, 'organizations', '*')].map { |d| ::File.basename(d) }
+        orgs.each do |org|
+          clients_path = ::File.expand_path(::File.join(dir, 'organizations', org, 'clients'))
+          clients_in_org = Dir[::File.join(clients_path, '*')].map { |d| ::File.basename(d, '.json') }
+          clients_group_path = ::File.expand_path(::File.join(dir, 'organizations', org, 'groups', 'clients.json'))
+          existing_group_data = FFI_Yajl::Parser.parse(::File.read(clients_group_path), symbolize_names: false)
+          existing_group_data['clients'] = [] unless existing_group_data.key?('clients')
+          if existing_group_data['clients'].length != clients_in_org.length
+            ui.warn "There are #{(existing_group_data['clients'].length - clients_in_org.length).abs} missing clients in #{org}'s client group file #{clients_group_path}. If this is not intentional do NOT proceed with a restore until corrected. `knife tidy backup clean` will auto-correct this. https://github.com/chef-customers/knife-tidy"
+            ui.confirm("\nDo you still wish to continue with the restore?") if op == "restore"
+          end
+        end
+      end
+
       def completion_banner
         puts "#{ui.color("** Finished **", :magenta)}"
       end

data/lib/chef/knife/ec_key_import.rb

@@ -165,6 +165,7 @@ class Chef
 
       def import_user_data(path)
         key_data = JSON.parse(File.read(path))
+        knife_ec_error_handler = config[:knife_ec_error_handler]
         key_data.each do |d|
           if d['username'] == 'pivotal' && config[:skip_pivotal]
             ui.warn "Skipping pivotal user."
@@ -190,7 +191,17 @@ class Chef
               d['hashed_password'] = nil
               d['salt'] = nil
             end
-            users_to_update.update(d)
+            begin
+              users_to_update.update(d)
+            rescue => ex
+              ui.warn "Could not restore user #{d['username']}"
+              if ex.class == Sequel::ForeignKeyConstraintViolation
+                message = "This error usually indicates that a user already exists with a different ID and is associated with one or more organizations on the target system.  The username is #{d['username']} and the ID in the backup files is #{d['id']}"
+                ui.warn message
+                ex = ex.exception "#{ex.message} #{message}"
+              end
+              knife_ec_error_handler.add(ex) if knife_ec_error_handler
+            end
           end
         end
       end

data/lib/chef/knife/ec_restore.rb

@@ -39,6 +39,8 @@ class Chef
         ensure_webui_key_exists!
         set_skip_user_acl!
 
+        warn_on_incorrect_clients_group(dest_dir, "restore")
+
         restore_users unless config[:skip_users]
         restore_user_sql if config[:with_user_sql]
 
@@ -186,6 +188,7 @@ class Chef
 
       def restore_user_sql
         k = ec_key_import
+        k.config[:knife_ec_error_handler] = knife_ec_error_handler
         k.config[:skip_users_table] = false
         k.config[:skip_keys_table] = !config[:with_key_sql]
         k.config[:users_only] = true

data/lib/chef/server.rb

@@ -15,13 +15,17 @@ class Chef
       Chef::Server.new(url)
     end
 
+    def parse_server_version(line)
+      # first line from the /version endpoint will either be this format "chef-server 12.17.5\n"
+      # or, when habitat, this format "Package: chef-server/chef-server-nginx/12.17.42/20180413212943\n"
+      Gem::Version.new(line.include?('/') ? line.split('/')[2] : line.split(' ').last.gsub(/\+.*$/, ''))
+    end
+
     def version
       @version ||= begin
                      uri = URI.parse("#{root_url}/version")
                      ver_line = open(uri, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).each_line.first
-                     ver_string = ver_line.split(' ').last
-                     ver_string = ver_string.gsub(/\+.*$/, '')
-                     Gem::Version.new(ver_string)
+                     parse_server_version(ver_line)
                    end
     end
 

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '2.2.3'
+  VERSION = '2.3.0'
 end

data/spec/chef/server_spec.rb

@@ -10,10 +10,16 @@ describe Chef::Server do
     expect(s.root_url).to eq("http://api.example.com")
   end
 
-  it "determines the server version" do
-    s = Chef::Server.new("http://api.example.com")
+  it "determines the running habitat service pkg version" do
+    s = Chef::Server.new('http://api.example.com')
+    allow(s).to receive(:open).and_return(StringIO.new("Package: chef-server/chef-server-nginx/12.17.42/20180413212943\nother stuff\nother stuff"))
+    expect(s.version.to_s).to eq('12.17.42')
+  end
+
+  it "determines the running omnibus server version" do
+    s = Chef::Server.new('http://api.example.com')
     allow(s).to receive(:open).and_return(StringIO.new("Chef Server 1.8.1\nother stuff\nother stuff"))
-    expect(s.version.to_s).to eq("1.8.1")
+    expect(s.version.to_s).to eq('1.8.1')
   end
 
   it "ignores git tags when determining the version" do
@@ -22,7 +28,7 @@ describe Chef::Server do
     expect(s.version.to_s).to eq("1.8.1")
   end
 
-  it "knows whether the server supports user ACLs via ngingx" do
+  it "knows whether the server supports user ACLs via nginx" do
     s1 = Chef::Server.new("http://api.example.com")
     s2 = Chef::Server.new("http://api.example.com")
     allow(s1).to receive(:open).and_return(StringIO.new("Chef Server 11.0.0\nother stuff\nother stuff"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Backup and Restore of Enterprise Chef