chef_backup 0.0.1.dev.4 → 0.2.0.pre1

data/lib/chef_backup/strategy/restore/tar.rb

@@ -1,7 +1,7 @@
-require 'fileutils'
-require 'pathname'
-require 'forwardable'
-require 'chef/mixin/deep_merge'
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
+require "forwardable" unless defined?(Forwardable)
+require "chef_backup/deep_merge"
 
 # rubocop:disable IndentationWidth
 module ChefBackup
@@ -11,23 +11,26 @@ class TarRestore
   # rubocop:enable IndentationWidth
   include ChefBackup::Helpers
   include ChefBackup::Exceptions
-  include Chef::Mixin::DeepMerge
+  include ChefBackup::Mixin::DeepMerge
   extend Forwardable
 
   attr_accessor :tarball_path
+  attr_writer :manifest
 
   def_delegators :@log, :log
 
   def initialize(path)
     @tarball_path = path
-    @log = ChefBackup::Logger.logger(private_chef['backup']['logfile'] || nil)
+    @log = ChefBackup::Logger.logger(service_config["backup"]["logfile"] || nil)
   end
 
   def restore
-    log 'Restoring Chef Server from backup'
-    cleanse_chef_server(config['agree_to_cleanse'])
-    if manifest['topology'] == 'ha'
-      log 'Performing HA restore - please ensure that keepalived is not running on the standby host'
+    log "Restoring Chef Server from backup"
+    return unless check_manifest_version
+
+    cleanse_chef_server(config["agree_to_cleanse"])
+    if ha?
+      log "Performing HA restore - please ensure that keepalived is not running on the standby host"
       fix_ha_plugins
       check_ha_volume
       touch_drbd_ready
@@ -35,69 +38,71 @@ class TarRestore
     restore_configs
     restore_services unless frontend?
     touch_sentinel
+    reconfigure_marketplace if marketplace?
     reconfigure_server
     update_config
     import_db if restore_db_dump?
     start_chef_server
+    reconfigure_add_ons
+    restart_add_ons
     cleanup
-    log 'Restoration Completed!'
+    log "Restoration Completed!"
   end
 
   def manifest
     @manifest ||= begin
-      manifest = File.expand_path(File.join(ChefBackup::Config['restore_dir'],
-                                            'manifest.json'))
+      manifest = File.expand_path(File.join(ChefBackup::Config["restore_dir"],
+        "manifest.json"))
       ensure_file!(manifest, InvalidManifest, "#{manifest} not found")
       JSON.parse(File.read(manifest))
     end
   end
 
   def restore_db_dump?
-    manifest['services']['postgresql']['pg_dump_success'] && !frontend?
+    manifest["services"]["postgresql"]["pg_dump_success"] && !frontend?
   rescue NoMethodError
     false
   end
 
   def import_db
-    start_service('postgresql')
-    sql_file = File.join(ChefBackup::Config['restore_dir'],
-                         "chef_backup-#{manifest['backup_time']}.sql")
+    start_service("postgresql")
+    sql_file = File.join(ChefBackup::Config["restore_dir"],
+      "chef_backup-#{manifest["backup_time"]}.sql")
     ensure_file!(sql_file, InvalidDatabaseDump, "#{sql_file} not found")
 
-    cmd = ['/opt/opscode/embedded/bin/chpst',
-           "-u #{manifest['services']['postgresql']['username']}",
-           '/opt/opscode/embedded/bin/psql',
-           "-U #{manifest['services']['postgresql']['username']}",
-           '-d opscode_chef',
-           "< #{sql_file}"
-          ].join(' ')
-    log 'Importing Database dump'
-    shell_out!(cmd)
+    cmd = [chpst,
+           "-u #{manifest["services"]["postgresql"]["username"]}",
+           pgsql,
+           "-U #{manifest["services"]["postgresql"]["username"]}",
+           "-d #{database_name}",
+           "< #{sql_file}"].join(" ")
+    log "Importing Database dump"
+    shell_out!(cmd, env: ["PGOPTIONS=#{pg_options}"])
   end
 
   def restore_services
-    manifest.key?('services') && manifest['services'].keys.each do |service|
+    manifest.key?("services") && manifest["services"].keys.each do |service|
       restore_data(:services, service)
     end
   end
 
   def restore_configs
-    manifest.key?('configs') && manifest['configs'].keys.each do |config|
+    manifest.key?("configs") && manifest["configs"].keys.each do |config|
       restore_data(:configs, config)
     end
   end
 
   def touch_sentinel
-    dir = '/var/opt/opscode'
-    sentinel = File.join(dir, 'bootstrapped')
+    dir = "/var/opt/opscode"
+    sentinel = File.join(dir, "bootstrapped")
     FileUtils.mkdir_p(dir) unless File.directory?(dir)
-    File.open(sentinel, 'w') { |file| file.write 'bootstrapped!' }
+    File.open(sentinel, "w") { |file| file.write "bootstrapped!" }
   end
 
   def restore_data(type, name)
-    source = File.expand_path(File.join(config['restore_dir'],
-                                        manifest[type.to_s][name]['data_dir']))
-    destination = manifest[type.to_s][name]['data_dir']
+    source = File.expand_path(File.join(config["restore_dir"],
+      manifest[type.to_s][name]["data_dir"]))
+    destination = manifest[type.to_s][name]["data_dir"]
     FileUtils.mkdir_p(destination) unless File.directory?(destination)
     cmd = "rsync -chaz --delete #{source}/ #{destination}"
     log "Restoring the #{name} data"
@@ -105,51 +110,76 @@ class TarRestore
   end
 
   def backup_name
-    @backup_name ||= Pathname.new(tarball_path).basename.sub_ext('').to_s
+    @backup_name ||= Pathname.new(tarball_path).basename.sub_ext("").to_s
+  end
+
+  def check_manifest_version
+    unless manifest["versions"]
+      log "no version information in manifest"
+      return true
+    end
+
+    manifest["versions"].each_pair do |name, data|
+      installed = version_from_manifest_file(data["path"])
+
+      if installed == :no_version
+        log "Warning: #{name} @ #{data["version"]} not installed"
+      elsif installed["version"] != data["version"]
+        log "package #{name} #{installed["version"]} installed, but backup was"\
+            " from #{data["version"]}. Please install correct version, restore, then upgrade."
+        return false
+      end
+    end
+    true
   end
 
   def fix_ha_plugins
-    log 'Fixing HA plugins directory (https://github.com/chef/chef-server/issues/115)'
-    plugins_dir = '/var/opt/opscode/plugins'
-    drbd_plugin = File.join(plugins_dir, 'chef-ha-drbd.rb')
+    log "Fixing HA plugins directory (https://github.com/chef/chef-server/issues/115)"
+    plugins_dir = "/var/opt/opscode/plugins"
+    drbd_plugin = File.join(plugins_dir, "chef-ha-drbd.rb")
 
     FileUtils.mkdir_p(plugins_dir) unless Dir.exist?(plugins_dir)
-    FileUtils.ln_sf('/opt/opscode/chef-server-plugin.rb', drbd_plugin) unless
+    FileUtils.ln_sf("/opt/opscode/chef-server-plugin.rb", drbd_plugin) unless
       File.exist?(drbd_plugin)
   end
 
   def check_ha_volume
-    log 'Checking that the HA storage volume is mounted'
-    ha_data_dir = manifest['ha']['path']
+    log "Checking that the HA storage volume is mounted"
+    ha_data_dir = manifest["ha"]["path"]
 
     unless ha_data_dir_mounted?(ha_data_dir)
-      fail "Please mount the data directory #{ha_data_dir} and perform any DRBD configuration before continuing"
+      raise "Please mount the data directory #{ha_data_dir} and perform any DRBD configuration before continuing"
     end
   end
 
   def ha_data_dir_mounted?(ha_data_dir)
-    File.read('/proc/mounts').split("\n").grep(/#{ha_data_dir}/).count > 0
+    File.read("/proc/mounts").split("\n").grep(/#{ha_data_dir}/).count > 0
   end
 
   def touch_drbd_ready
-    log 'Touching drbd_ready file'
-    FileUtils.touch('/var/opt/opscode/drbd/drbd_ready') unless
-      File.exist?('/var/opt/opscode/drbd/drbd_ready')
+    log "Touching drbd_ready file"
+    FileUtils.touch("/var/opt/opscode/drbd/drbd_ready") unless
+      File.exist?("/var/opt/opscode/drbd/drbd_ready")
   end
 
   def reconfigure_server
-    log 'Reconfiguring the Chef Server'
-    shell_out('chef-server-ctl reconfigure')
+    log "Reconfiguring the Chef Server"
+    shell_out("#{ctl_command} reconfigure")
   end
 
   def cleanse_chef_server(agree)
-    log 'Cleaning up any old files'
-    shell_out!("chef-server-ctl cleanse #{agree || ''}")
+    log "Cleaning up any old files"
+    # The chef-server-ctl cleanse command deliberately waits 60 seconds to give
+    # you an option to cancel it.  Therefore, don't count it in the timeout that
+    # the user provided.  If the user has eagerly dismissed that wait period,
+    # then don't elongate the timeout.  The user can do this with the -c flag.
+    timeout = shell_timeout + (agree ? 0 : 60) if shell_timeout
+    shell_out!("#{ctl_command} cleanse #{agree || ""}", "timeout" => timeout)
   end
 
   def running_config
     @running_config ||=
-      JSON.parse(File.read('/etc/opscode/chef-server-running.json')) || {}
+      JSON.parse(File.read(running_filepath)) || {}
   end
 
   def update_config

data/lib/chef_backup/strategy.rb

@@ -2,16 +2,16 @@
 #
 # All Rights Reserved
 
-require 'chef_backup/strategy/backup/tar'
-require 'chef_backup/strategy/backup/lvm'
-require 'chef_backup/strategy/backup/ebs'
-require 'chef_backup/strategy/backup/object'
-require 'chef_backup/strategy/backup/custom'
-require 'chef_backup/strategy/restore/tar'
-require 'chef_backup/strategy/restore/lvm'
-require 'chef_backup/strategy/restore/ebs'
-require 'chef_backup/strategy/restore/object'
-require 'chef_backup/strategy/restore/custom'
+require "chef_backup/strategy/backup/tar"
+require "chef_backup/strategy/backup/lvm"
+require "chef_backup/strategy/backup/ebs"
+require "chef_backup/strategy/backup/object"
+require "chef_backup/strategy/backup/custom"
+require "chef_backup/strategy/restore/tar"
+require "chef_backup/strategy/restore/lvm"
+require "chef_backup/strategy/restore/ebs"
+require "chef_backup/strategy/restore/object"
+require "chef_backup/strategy/restore/custom"
 
 module ChefBackup
   # ChefBackup::Strategy factory returns an ChefBackup::Strategy object

data/lib/chef_backup/version.rb

@@ -1,4 +1,4 @@
 # ChefBackup module
 module ChefBackup
-  VERSION = '0.0.1.dev.4'
+  VERSION = "0.1.1".freeze
 end

data/lib/chef_backup.rb

@@ -2,11 +2,11 @@
 #
 # All Rights Reserved
 
-require 'chef_backup/version'
-require 'chef_backup/exceptions'
-require 'chef_backup/config'
-require 'chef_backup/logger'
-require 'chef_backup/data_map'
-require 'chef_backup/helpers'
-require 'chef_backup/runner'
-require 'chef_backup/strategy'
+require "chef_backup/version"
+require "chef_backup/exceptions"
+require "chef_backup/config"
+require "chef_backup/logger"
+require "chef_backup/data_map"
+require "chef_backup/helpers"
+require "chef_backup/runner"
+require "chef_backup/strategy"

metadata

@@ -1,93 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev.4
+  version: 0.2.0.pre1
 platform: ruby
 authors:
-- Ryan Cragun
+- Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: di-ruby-lvm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,98 +45,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0.21'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rescue
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.32.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.32.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 description: A library to backup a Chef Server
 email:
-- me@ryan.ec
+- oss@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".kitchen.yml"
-- ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
-- Guardfile
 - LICENSE
-- README.md
-- Rakefile
-- chef_backup.gemspec
 - lib/chef_backup.rb
 - lib/chef_backup/config.rb
 - lib/chef_backup/data_map.rb
+- lib/chef_backup/deep_merge.rb
 - lib/chef_backup/exceptions.rb
 - lib/chef_backup/helpers.rb
 - lib/chef_backup/logger.rb
+- lib/chef_backup/mash.rb
 - lib/chef_backup/runner.rb
 - lib/chef_backup/strategy.rb
 - lib/chef_backup/strategy/backup/custom.rb
@@ -200,22 +87,9 @@ files:
 - lib/chef_backup/strategy/restore/object.rb
 - lib/chef_backup/strategy/restore/tar.rb
 - lib/chef_backup/version.rb
-- spec/fixtures/chef-server-running.json
-- spec/spec_helper.rb
-- spec/unit/data_map_spec.rb
-- spec/unit/helpers_spec.rb
-- spec/unit/runner_spec.rb
-- spec/unit/shared_examples/helpers.rb
-- spec/unit/strategy/backup/lvm_spec.rb
-- spec/unit/strategy/backup/shared_examples/backup.rb
-- spec/unit/strategy/backup/tar_spec.rb
-- spec/unit/strategy/restore/lvm_spec.rb
-- spec/unit/strategy/restore/shared_examples/restore.rb
-- spec/unit/strategy/restore/tar_spec.rb
-- spec/unit/strategy_spec.rb
 homepage: https://github.com/chef/chef_backup
 licenses:
-- Apachev2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -232,23 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A library to backup a Chef Server
-test_files:
-- spec/fixtures/chef-server-running.json
-- spec/spec_helper.rb
-- spec/unit/data_map_spec.rb
-- spec/unit/helpers_spec.rb
-- spec/unit/runner_spec.rb
-- spec/unit/shared_examples/helpers.rb
-- spec/unit/strategy/backup/lvm_spec.rb
-- spec/unit/strategy/backup/shared_examples/backup.rb
-- spec/unit/strategy/backup/tar_spec.rb
-- spec/unit/strategy/restore/lvm_spec.rb
-- spec/unit/strategy/restore/shared_examples/restore.rb
-- spec/unit/strategy/restore/tar_spec.rb
-- spec/unit/strategy_spec.rb
-has_rdoc: 
+test_files: []

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-*.sw*

data/.kitchen.yml

@@ -1,30 +0,0 @@
-driver:
-  name: vagrant
-  forward_agent: true
-  customize:
-    cpus: 2
-    memory: 2048
-  synced_folders:
-    - ['.', '/home/vagrant/chef_backup']
-    - ['../../opscode/chef_packages/', '/home/vagrant/chef_packages']
-
-provisioner:
-  name: chef_zero
-  require_chef_omnibus: 11.16.4
-
-platforms:
-  - name: ubuntu-14.04
-    run_list: apt::default
-  - name: ubuntu-12.04
-    run_list: apt::default
-  - name: ubuntu-11.04
-    run_list: apt::default
-  - name: ubuntu-10.04
-    run_list: apt::default
-  - name: centos-5.10
-  - name: centos-6.5
-
-suites:
-  - name: default
-    attributes:
-    run_list:

data/.rubocop.yml

@@ -1,21 +0,0 @@
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/GuardClause:
-  Enabled: false
-Metrics/LineLength:
-  Max: 120
-Metrics/ClassLength:
-  Max: 200
-Metrics/ModuleLength:
-  Max: 200
-Metrics/CyclomaticComplexity:
-  Max: 10
-Metrics/PerceivedComplexity:
-  Max: 10
-Metrics/MethodLength:
-  Max: 40
-Metrics/AbcSize:
-  Max: 40
-AllCops:
-  Exclude:
-    - 'Guardfile'

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - "2.1.5"
-  - "2.2.0"
-notifications:
-  email: false

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ec_backup.gemspec
-gemspec

data/Guardfile

@@ -1,22 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rsspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separetly)
-#  * 'just' rspec: 'rspec'
-guard :rspec, cmd: 'bundle exec rspec -f doc --color', all_after_pass: true do
-  watch(%r{^spec/.+/.+_spec\.rb$})
-  watch(%r{^spec/.+/.+/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch(%r{^lib/chef_backup/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch(%r{^lib/chef_backup/(.+)/(.+)\.rb$})  { |m| "spec/unit/#{m[1]}/#{m[2]}_spec.rb" }
-  watch(%r{^lib/chef_backup/(.+)/(.+)/(.+)\.rb$})  { |m| "spec/unit/#{m[1]}/#{m[2]}/#{m[3]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-
-notification :tmux