foreman_maintain 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fabde56ed1a12feb739b6776178693bc779dae8ae3d71ba11b5612c09cd3837
-  data.tar.gz: 24c1ea2e3a56c4a72e444808853d61e0abf56134e071b4d89c4ee501bb6fbedf
+  metadata.gz: d90e54ce37bbcb97b38d4362699d2e5fdec4bb6a9c73a6449cebc1c6a20cf970
+  data.tar.gz: 79ddf0919edb2fd587d06d414ade8b01994d197f61069dab8bb2d03c22ad72f3
 SHA512:
-  metadata.gz: 13fa993d11f4b56cc24d538fd7b9d1b86e39baaad5971266ab8de8a07151d875c6066481b91edadfc5beabd041f4e09b07b298b42ebdc45a1c7c5852d7ac0268
-  data.tar.gz: 00b68e16dca36bf7c71634a98aa7e4d78846aa5ca5b4cfcbc183dd3b492522c53c02793a215da18048f480a002487e95fe6d9965e5b6c1d382a889fb4dd46598
+  metadata.gz: 11c9f890ad98bdac65ca98df002386f6c5435a67b2374e1349d7dc8f53cf79a3587f5ff6f449c0b1f5a7b1a24cb9e96254706c9b2eb9e257679cb1eead8b6831
+  data.tar.gz: d827ab0345f35720c3a1eaae0779593b56c6c577f8a72c0aacccc5210cc4d629f8f1a7c2f8afd5371dbdfb042fc2b79414f457d4d69afdbe203d196eb97d60d5

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/backup/offline/candlepin_db.rb

@@ -36,7 +36,8 @@ module Procedures::Backup
             pg_backup_file,
             :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
             :volume_size => @tar_volume_size,
-            :data_dir => pg_data_dir
+            :data_dir => pg_data_dir,
+            :restore_dir => feature(:candlepin_database).data_dir
           )
         end
       end

data/definitions/procedures/backup/offline/foreman_db.rb

@@ -39,11 +39,13 @@ module Procedures::Backup
       end
 
       def do_backup(pg_dir, cmd)
+        restore_dir = el? ? feature(:foreman_database).data_dir : pg_dir
         feature(:foreman_database).backup_local(
           pg_backup_file,
           :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
           :volume_size => @tar_volume_size,
           :data_dir => pg_dir,
+          :restore_dir => restore_dir,
           :command => cmd
         )
       end

data/definitions/procedures/backup/offline/pulpcore_db.rb

@@ -36,7 +36,8 @@ module Procedures::Backup
             pg_backup_file,
             :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
             :volume_size => @tar_volume_size,
-            :data_dir => pg_data_dir
+            :data_dir => pg_data_dir,
+            :restore_dir => feature(:pulpcore_database).data_dir
           )
         end
       end

data/definitions/scenarios/restore.rb

@@ -45,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
 

data/lib/foreman_maintain/concerns/base_database.rb

@@ -101,13 +101,14 @@ module ForemanMaintain
 
       def backup_local(backup_file, extra_tar_options = {})
         dir = extra_tar_options.fetch(:data_dir, data_dir)
+        restore_dir = extra_tar_options.fetch(:restore_dir, data_dir)
         command = extra_tar_options.fetch(:command, 'create')
 
         FileUtils.cd(dir) do
           tar_options = {
             :archive => backup_file,
             :command => command,
-            :transform => "s,^,#{dir[1..]},S",
+            :transform => "s,^,#{restore_dir[1..]},S",
             :files => '*',
           }.merge(extra_tar_options)
           feature(:tar).run(tar_options)

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

@@ -265,6 +265,14 @@ module ForemanMaintain
       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.3'.freeze
+  VERSION = '1.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-08-16 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
@@ -434,7 +433,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -452,8 +451,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []

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