knife-ec-backup 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be6b56c7c0a6b7cd445ebf3ca610866e91476ab
-  data.tar.gz: a975490841095a7ed627def37f7f2a8b78ad860f
+  metadata.gz: fff49faa32b80dca130c569470c7294e5b3b85ac
+  data.tar.gz: d704f4be0d92946605874737c318a8c79e57c163
 SHA512:
-  metadata.gz: 92e010b8025271bf57ddbcb074944574da406fc6a8bcfb5026f01c872fce547b21dc224151e131b9db3f41b36b5140898d2ea2e1f03d07dd70464c3db96bb15e
-  data.tar.gz: 9320e5c0ad882373b5f894d5fc752f6b17f9c312e1deeb5c0327cf3d65316862b01ed5ff33c6ad9f393e5a00bb645ce5dedcec78b618e846d38d914a4d800683
+  metadata.gz: 5550e8d418ecd3e27284c6b6d6d273037599fcc7009c1fa571ef76a353b96fc9442d69b7d9fcf2788e6d200b1b2ed23c7edf1c94d392ee795c1d13d3fc3542f7
+  data.tar.gz: b7aa8833898097da9b0c3cd697c4e2afa089b3608673594ba5d86a099319b2e3cce2ea8af04ab5c408fa52cd8084458c81868c2df7a7852ec1c8801b61d480e8

data/lib/chef/knife/ec_backup.rb

@@ -187,12 +187,16 @@ class Chef
 
           ensure_dir(Chef::Config.chef_repo_path)
 
-          # Download the billing-admins acls as pivotal
+          # Download the billing-admins ACL and group as pivotal
           chef_fs_config = ::ChefFS::Config.new
           pattern = ::ChefFS::FilePattern.new('/acls/groups/billing-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
+          pattern = ::ChefFS::FilePattern.new('/groups/billing-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)
@@ -203,11 +207,12 @@ class Chef
           Chef::Config.client_key = webui_key
           Chef::Config.custom_http_headers = (Chef::Config.custom_http_headers || {}).merge({'x-ops-request-source' => 'web'})
 
-          # Download the entire org skipping the billing admins group ACL
+          # Download the entire org skipping the billing admins group ACL and the group itself
           chef_fs_config = ::ChefFS::Config.new
-          top_level_paths = chef_fs_config.chef_fs.children.select { |entry| entry.name != 'acls' }.map { |entry| entry.path }
+          top_level_paths = chef_fs_config.chef_fs.children.select { |entry| entry.name != 'acls' && entry.name != 'groups' }.map { |entry| entry.path }
           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|
             ::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/knife_ec_backup/version.rb

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

metadata

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