knife-ec-backup 2.4.7 → 2.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4801984205d4df0174d61e67d8b4ebe4a6199778a5bc3b4048fb1f4f25d0c027
-  data.tar.gz: ed391c6e19f1f091aa0993d887d6ece7f76c04475f26ac7499a360e91d032a0e
+  metadata.gz: 312e0c84f3b2b40b6a2824917e31da481007f65f1b82282a18ec441e398220bd
+  data.tar.gz: e2f1962db8526925402afcf73c145f04ffda47263fa8bade5064c2d50f494c3e
 SHA512:
-  metadata.gz: f80e17213b08ffec758bdca995b78acd55d439d9ea777d33ccbc75bd185ca604a5749a44a241c098f9da52033fb5d746b994cf5388c82b953036486e6df7c5fd
-  data.tar.gz: 75cedd7e96b53bdb7be8eb95195940fd955edbb3c7b59c20af41b6af858aa737ace3f66f2ad65ff7fb5f9da93f9aede80fc8d1395e2400b43b2a66f30422f008
+  metadata.gz: 16f96728387157fad3ef2fe38c18c9597c8c2fc2b6cb295262a7c161fc52d2fddaa40b38e38ad3e4c39af22fbec8dbf4c3bce74b8b0c97da7b22994e3cc2e7c9
+  data.tar.gz: e8bb31bc8fde89b682b2ab3dd8c89c7bc9b885af3f9e21d30e1e3e3875f8beea9ccb228fb3e6c8909300cf79c6bfe24e799b83af85b83b3d0ec348f59959466b

data/README.md

@@ -1,5 +1,5 @@
 # Knife EC Backup
-[![Build Status Master](https://travis-ci.org/chef/knife-ec-backup.svg?branch=master)](https://travis-ci.org/chef/knife-ec-backup)
+[![Build status](https://badge.buildkite.com/4bc85427aab66accafbd7abb2932b9dd7f9208162c5be33488.svg?branch=master)](https://buildkite.com/chef-oss/chef-knife-ec-backup-master-verify)
 [![Gem Version](https://badge.fury.io/rb/knife-ec-backup.svg)](https://badge.fury.io/rb/knife-ec-backup)
 
 **Umbrella Project**: [Knife](https://github.com/chef/chef-oss-practices/blob/master/projects/knife.md)
@@ -10,7 +10,7 @@
 
 **Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
 
-# Description
+## Description
 
 knife-ec-backup can backup and restore the data in an Enterprise Chef
 Server installation, preserving the data in an intermediate, editable
@@ -21,26 +21,21 @@ Server API deficiencies.  The long-run goal is to improve `knife
 download`, `knife upload` and the Chef Server API and deprecate this
 tool.
 
-# Requirements
+## Requirements
 
 This knife plugin requires Chef Client 11.8+.
 
-## Chef 10
+### Server Support
 
-Users who are still using Chef 10 can use the most recent 1.x version
-of this gem.  Version 1.x additionally depends on knife-essentials.
-
-## Server Support
-
-This plugin currently supports Enterprise Chef 11 and Chef Server 12.
+This plugin currently supports Enterprise Chef 11 and Chef Server 12+.
 Support for the beta key rotation features is provided via the
 `--with-keys-sql` flag, but users of this feature should note that
 this may change once the Chef Server supports an API-based export of
 the key data.
 
-# Installation
+## Installation
 
-## Chef Server Install (Recommended)
+### Chef Server Install (Recommended)
 
 This gem is installed with chef-server-core 12.0.0 and newer.
 
@@ -53,7 +48,7 @@ downloading the .zip file. Once unpacked, run:
 /opt/opscode/embedded/bin/gem install knife-ec-backup*gem --no-ri --no-rdoc -V
 ```
 
-### Note on installing with existing development tools:
+#### Note on installing with existing development tools:
 
 The latest versions of knife-ec-backup require gems with native
 extensions, thus you must install a standard build toolchain.  To
@@ -84,17 +79,17 @@ Clone the git repository and run the following from inside:
     gem build knife-ec-backup.gemspec
     gem install knife-ec-backup*gem
 
-# Configuration
+## Configuration
 
-## Permissions
+### Permissions
 
 Note that most users in an EC installation lack the permissions to pull all of the data from all organizations and other users.
 This plugin **REQUIRES THE PIVOTAL KEY AND WEBUI KEY** from the Chef Server.
 It is recommended that you run this from a frontend Enterprise Chef Server, you can use --user and --key to pass the pivotal information along.
 
-# Subcommands
+## Subcommands
 
-## Common Options
+### Common Options
 
 The following options are supported across all subcommands:
 
@@ -122,7 +117,7 @@ The following options are supported across all subcommands:
   * `--dry-run`:
     Report what actions would be taken without performing any. (default: false)
 
-## knife ec backup DEST_DIR (options)
+### knife ec backup DEST_DIR (options)
 
 *Path*: If you have chef-client installed as well, you may need to invoke this as `/opt/opscode/embedded/bin/knife ec backup backup`
 
@@ -214,7 +209,7 @@ This compares very closely with the "knife download /" from an OSC server:
     users
       <name>.json>
 
-## knife ec restore DEST_DIR (options)
+### knife ec restore DEST_DIR (options)
 
 Restores all data from the specified DEST_DIR to an Enterprise Chef /
 Private Chef server. DEST_DIR should be a backup directory created by
@@ -243,7 +238,7 @@ Private Chef server. DEST_DIR should be a backup directory created by
     also skip any auto-configured options (default: false)
 
   * `--[no-]skip-user-ids`:
-    Reuses user ids from the restore destination when updating existing 
+    Reuses user ids from the restore destination when updating existing
     users to avoid database conflicts (default: true)
 
   * `--with-user-sql`:
@@ -268,10 +263,10 @@ Private Chef server. DEST_DIR should be a backup directory created by
     Chef objects.
 
   * `--only-org ORG`:
-    Only donwload/restore objects in the named organization. Global
+    Only download/restore objects in the named organization. Global
     objects such as users will still be downloaded/restored.
 
-## knife ec key export [FILENAME]
+### knife ec key export [FILENAME]
 
 Create a json representation of the users table from the Chef Server
 database.  If no argument is given, the name of the backup is
@@ -280,7 +275,7 @@ database.  If no argument is given, the name of the backup is
 Please note, most users should use `knife ec backup` with the
 `--with-user-sql` option rather than this command.
 
-## knife ec key import [FILENAME]
+### knife ec key import [FILENAME]
 
 Import a json representation of the users table from FILENAME to the
 the Chef Server database.  If no argument is given, the filename is
@@ -289,7 +284,7 @@ assumed to be `key_dump.json`.
 Please note, most user should use `knife ec restore` with the
 `--with-user-sql` option rather than this command.
 
-# Known Bugs
+## Known Bugs
 
 - knife-ec-backup cannot be installed in the embedded gemset of Chef
   Server 12.  This will be resolved in a future Chef Server release.

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler'
-require 'rubygems'
+require 'rubygems' unless defined?(Gem)
 require 'rubygems/package_task'
 require 'rdoc/task'
 require 'rspec/core/rake_task'

data/lib/chef/knife/ec_backup.rb

@@ -15,7 +15,7 @@ class Chef
         require 'chef/chef_fs/file_pattern'
         require 'chef/chef_fs/parallelizer'
         require_relative '../server'
-        require 'fileutils'
+        require 'fileutils' unless defined?(FileUtils)
       end
 
       def run
@@ -96,10 +96,10 @@ class Chef
             knife_ec_error_handler.add(ex)
             next
           end
-          # Enterprise Chef 11 and below uses a pool of precreated
+          # Enterprise Chef 11 and below uses a pool of pre-created
           # organizations to account for slow organization creation
           # using CouchDB. Thus, on server versions < 12 we want to
-          # skip any of these precreated organizations by checking if
+          # skip any of these pre-created organizations by checking if
           # they have been assigned or not.  The Chef 12 API does not
           # return an assigned_at field.
           if org['assigned_at'] || server.version >= Gem::Version.new("12")

data/lib/chef/knife/ec_base.rb

@@ -20,7 +20,7 @@ require 'chef/knife'
 require 'chef/server_api'
 require 'veil'
 require_relative 'ec_error_handler'
-require 'ffi_yajl'
+require 'ffi_yajl' unless defined?(FFI_Yajl)
 
 class Chef
   class Knife

data/lib/chef/knife/ec_key_base.rb

@@ -27,7 +27,7 @@ class Chef
 
           deps do
             require 'sequel'
-            require 'json'
+            require 'json' unless defined?(JSON)
           end
 
           option :sql_host,

data/lib/chef/knife/ec_key_import.rb

@@ -184,7 +184,7 @@ class Chef
             d.delete('id') if config[:skip_ids]
             # If the hash_type in the export,
             # we are dealing with a record where the password is still in the
-            # serialized_obejct.  Explictly setting these to nil ensures that the
+            # serialized_object. Explicitly setting these to nil ensures that the
             # password set in the restore is wiped out.
             unless d.has_key?('hash_type')
               d['hash_type'] = nil

data/lib/chef/knife/ec_restore.rb

@@ -33,7 +33,7 @@ class Chef
         # Work around bug in chef_fs
         require 'chef/chef_fs/command_line'
         require 'chef/chef_fs/data_handler/acl_data_handler'
-        require 'securerandom'
+        require 'securerandom' unless defined?(SecureRandom)
         require 'chef/chef_fs/parallelizer'
         require_relative '../tsorter'
         require_relative '../server'
@@ -229,7 +229,7 @@ class Chef
           ui.msg "Restoring org admin data"
           chef_fs_config = Chef::ChefFS::Config.new
 
-          # Handle Admins, Billing Admins and Public Key Read Access seperately
+          # Handle Admins, Billing Admins and Public Key Read Access separately
           #
           # admins: We need to upload admins first so that we
           # can upload all of the other objects as a user in the org

data/lib/chef/server.rb

@@ -1,5 +1,5 @@
-require 'uri'
-require 'openssl'
+require 'uri' unless defined?(URI)
+require 'openssl' unless defined?(OpenSSL)
 require 'chef/server_api'
 
 class Chef

data/lib/knife_ec_backup/version.rb

@@ -1,4 +1,4 @@
 # when you change this to double quotes, also update .expeditor/update_version.sh
 module KnifeECBackup
-  VERSION = '2.4.7'
+  VERSION = '2.4.12'
 end

data/spec/chef/knife/ec_base_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 require 'chef/knife/ec_base'
 require 'chef/knife'
 require 'chef/config'
-require 'stringio'
+require 'stringio' unless defined?(StringIO)
 
 class Tester < Chef::Knife
   include Chef::Knife::EcBase

data/spec/chef/knife/ec_key_export_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 require 'chef/knife/ec_key_export'
 require 'sequel'
-require 'json'
-require 'securerandom'
+require 'json' unless defined?(JSON)
+require 'securerandom' unless defined?(SecureRandom)
 require 'fakefs/spec_helpers'
 
 def user_record(name)

data/spec/chef/knife/ec_restore_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Knife::EcRestore do
       @knife.restore_open_invitations("foo")
     end
 
-    it "does NOT fail if an inivitation already exists" do
+    it "does NOT fail if an invitation already exists" do
       make_org "foo"
       allow(@rest).to receive(:post).with("organizations/foo/association_requests", {"user" => "bob"}).and_return(net_exception(409))
       allow(@rest).to receive(:post).with("organizations/foo/association_requests", {"user" => "jane"}).and_return(net_exception(409))

data/spec/chef/server_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 require 'chef/server'
 require 'chef/server_api'
-require 'stringio'
+require 'stringio' unless defined?(StringIO)
 
 describe Chef::Server do
   before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.12
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel