foreman_maintain 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a074a4ff24a5bb600f21eea3957d5140984b7a107a9d9f660a6619bc5078a9b2
-  data.tar.gz: 34e3377c6e482e89b0e1263592bc93559fd68366b7b8c02144839746b614007e
+  metadata.gz: 467793fe18d5403460cbb877a9b42e8b6c9f82aaf3e876988c444baf0d472e17
+  data.tar.gz: f963b22148f4e08f0daee4a2af1fd479bc655aff1ec6b14c41fe249b51d4e188
 SHA512:
-  metadata.gz: 4529548ad99bf3dd8b074840ec2b8c717f3a3ce88a715135d1e66219b932a63f6482a34eb7e3440b7329936371cce18268373c250540d61ba8046e63847e17b5
-  data.tar.gz: 16d307e273f41e8cd6f58812ec74f9c531ab857ce370b1455792232e6360544c231d665e23e11cf99d3e4263dd99ef7fdb0d63117aad87a9b8982deb0138d5d2
+  metadata.gz: cfce108a55c8f37f82da2b07081a3362f47267a95926e105c74dfc6602eb48ee424603026c9aec32d26e263a1e84deab68a7008953bcfece418029533d14376c
+  data.tar.gz: 8e8f0b94739d7e03f1ca3e8f197013780c030ab46a9d5c6f81c4ee7d2169d37c5d9a21fdd779544c947abb87b8346f67b2b9de7ebe2707c94b6afc4ec9e7298b

data/definitions/features/candlepin_database.rb

@@ -22,26 +22,12 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     @configuration || load_configuration
   end
 
-  def validate_available_in_cpdb?
-    check_option_using_cpdb_help('validate')
-  end
-
   def check_option_using_cpdb_help(option_name, parent_cmd = '')
     parent_cmd = '/usr/share/candlepin/cpdb' if parent_cmd.empty?
     help_cmd = "#{parent_cmd} --help |  grep -c '\\-\\-#{option_name}'"
     execute?(help_cmd)
   end
 
-  def execute_cpdb_validate_cmd
-    main_cmd = cpdb_validate_cmd
-    return [true, nil] if main_cmd.empty?
-    main_cmd += format_shell_args(
-      '-u' => configuration['username'], '-p' => configuration[%(password)]
-    )
-    main_cmd += format_shell_args(extend_with_db_options)
-    execute_with_status(main_cmd, :hidden_patterns => [configuration['password']])
-  end
-
   def env_content_ids_with_null_content
     sql = <<-SQL
       SELECT ec.id
@@ -87,12 +73,4 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     output = /#{key_name}=([^&]*)?/.match(query_string)
     output[1] if output
   end
-
-  def cpdb_validate_cmd
-    return '' unless check_option_using_cpdb_help('validate')
-    cmd = '/usr/share/candlepin/cpdb --validate'
-    return cmd unless check_option_using_cpdb_help('verbose', cmd)
-    cmd += ' --verbose'
-    cmd
-  end
 end

data/definitions/features/instance.rb

@@ -28,6 +28,14 @@ class Features::Instance < ForemanMaintain::Feature
     end
   end
 
+  def project_support_entity
+    if downstream
+      'Red Hat Technical Support'
+    else
+      'Foreman Community Support'
+    end
+  end
+
   def database_remote?(feature)
     !!feature(feature) && !feature(feature).local?
   end

data/definitions/procedures/restore/required_packages.rb

@@ -0,0 +1,23 @@
+module Procedures::Restore
+  class RequiredPackages < ForemanMaintain::Procedure
+    metadata do
+      description 'Ensure required packages are installed before restore'
+
+      param :backup_dir,
+        'Path to backup directory',
+        :required => true
+    end
+
+    def run
+      backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
+      required_packages = []
+      required_packages << 'puppetserver' if backup.with_puppetserver?
+      required_packages << 'qpid-cpp-server' if backup.with_qpidd?
+      if required_packages.any?
+        with_spinner('Installing required packages') do
+          ForemanMaintain.package_manager.install(required_packages, assumeyes: true)
+        end
+      end
+    end
+  end
+end

data/definitions/scenarios/restore.rb

@@ -28,6 +28,7 @@ module ForemanMaintain::Scenarios
 
       add_steps_with_context(Procedures::Restore::Confirmation,
         Procedures::Selinux::SetFileSecurity,
+        Procedures::Restore::RequiredPackages,
         Procedures::Restore::Configs)
       add_step_with_context(Procedures::Crond::Stop) if feature(:cron)
       unless backup.incremental?
@@ -44,7 +45,9 @@ module ForemanMaintain::Scenarios
         add_step(Procedures::Service::Stop.new(:only => ['postgresql']))
       end
 
-      if feature(:instance).postgresql_local? && !backup.online_backup?
+      if feature(:instance).postgresql_local? &&
+         !backup.online_backup? &&
+         backup.different_source_os?
         add_step_with_context(Procedures::Restore::ReindexDatabases)
       end
 
@@ -88,6 +91,7 @@ module ForemanMaintain::Scenarios
         Checks::Restore::ValidateHostname => :backup_dir,
         Checks::Restore::ValidateInterfaces => :backup_dir,
         Checks::Restore::ValidatePostgresqlDumpPermissions => :backup_dir,
+        Procedures::Restore::RequiredPackages => :backup_dir,
         Procedures::Restore::Configs => :backup_dir,
         Procedures::Restore::DropDatabases => :backup_dir,
         Procedures::Restore::CandlepinDump => :backup_dir,

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -330,20 +330,20 @@ module ForemanMaintain
           whitelist_labels = steps_to_whitelist.map(&:label_dashed).join(',')
           unless whitelist_labels.empty?
             recommend << if scenario.detector.feature(:instance).downstream
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+                           format(<<-MESSAGE.strip_heredoc)
               Resolve the failed steps and rerun the command.
 
               If the situation persists and, you are unclear what to do next,
-              contact Red Hat Technical Support.
+              contact #{scenario.detector.feature(:instance).project_support_entity}.
 
               In case the failures are false positives, use
-              --whitelist="%s"
+              --whitelist="#{whitelist_labels}"
                            MESSAGE
                          else
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+                           format(<<-MESSAGE.strip_heredoc)
               Resolve the failed steps and rerun the command.
               In case the failures are false positives, use
-              --whitelist="%s"
+              --whitelist="#{whitelist_labels}"
                            MESSAGE
                          end
           end

data/lib/foreman_maintain/utils/backup.rb

@@ -253,6 +253,26 @@ module ForemanMaintain
       def online_backup?
         !!metadata.fetch('online', false)
       end
+
+      def installed_rpms
+        metadata.fetch('rpms', metadata.fetch(:rpms, []))
+      end
+
+      def with_puppetserver?
+        installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
+      end
+
+      def with_qpidd?
+        installed_rpms.any? { |rpm| rpm.start_with?('qpid-cpp-server-') }
+      end
+
+      def source_os_version
+        metadata.fetch('os_version', 'unknown')
+      end
+
+      def different_source_os?
+        source_os_version != "#{os_name} #{os_version}"
+      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -160,7 +160,6 @@ files:
 - definitions/checks/backup/certs_tar_exist.rb
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
-- definitions/checks/candlepin/validate_db.rb
 - definitions/checks/check_for_newer_packages.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
@@ -313,6 +312,7 @@ files:
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/reindex_databases.rb
+- definitions/procedures/restore/required_packages.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -451,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt

data/definitions/checks/candlepin/validate_db.rb

@@ -1,17 +0,0 @@
-module Checks::Candlepin
-  class ValidateDb < ForemanMaintain::Check
-    metadata do
-      description 'Check to validate candlepin database'
-      tags :pre_upgrade
-
-      confine do
-        feature(:candlepin_database)&.validate_available_in_cpdb?
-      end
-    end
-
-    def run
-      result, result_msg = feature(:candlepin_database).execute_cpdb_validate_cmd
-      assert(result == 0, result_msg)
-    end
-  end
-end