foreman_maintain 1.6.10 → 1.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d9b63f8c0c837772d8b3970d21f05e1b1a10a8b4a85784c4aca8cf337668dd1
-  data.tar.gz: 97034a6b9d3afef56fe2e996d7704e46c4eed61d9f86fc5cf9e9b62ddc425b96
+  metadata.gz: 7357cec0fa22b76e7ae0c7d2da85e2cb20f52aeb2ded53e9a2ddf21c56b7a037
+  data.tar.gz: 2116a2048dc315a55bb7fb8789e9961f2a4fc91a4afa5b614dd237eb7825da37
 SHA512:
-  metadata.gz: cf9b2cf09d804f042cabb04f2215b088776ceee4987fb1aef6be1e09e19207e949b8fc028792729eef29445c8946c3103999bc4f43b07d4509106a1079f49cb0
-  data.tar.gz: f50fc364c0d8d1bfd1dc14764381cabdcde43483e302571a96cc171b4a9c607fad71251424211ed771ebd17cce80559a396ed0345d2a998d26d3239877988d21
+  metadata.gz: 5a14594384dd60070ffde442e87423522ebde81e3f9580ac88c74028bb33a232bbe4bf57e7847d70768c82b375c5067509dfefed5ecc7c79023f66a2c904af11
+  data.tar.gz: 07fc2c9e32f3d16171a99839562dd01210190c00de03414859dfb84492401168d2127d84974ac750c7b5aaa47a927bd6ea42cc47237249c908ac56f96749e7d0

data/definitions/checks/backup/incremental_parent_type.rb

@@ -0,0 +1,36 @@
+module Checks::Backup
+  class IncrementalParentType < ForemanMaintain::Check
+    metadata do
+      description 'Check if the incremental backup has the right type'
+      tags :backup
+      param :incremental_dir, 'Path to existing backup directory'
+      param :online_backup, 'Select for online backup', :flag => true, :default => false
+      param :sql_tar, 'Will backup include PostgreSQL tarball', :flag => true, :default => false
+      manual_detection
+    end
+
+    def run
+      return unless @incremental_dir
+
+      backup = ForemanMaintain::Utils::Backup.new(@incremental_dir)
+
+      existing_type = backup.backup_type
+      new_type = if @online_backup
+                   ForemanMaintain::Utils::Backup::ONLINE_BACKUP
+                 else
+                   ForemanMaintain::Utils::Backup::OFFLINE_BACKUP
+                 end
+      msg = "The existing backup is an #{existing_type} backup, "\
+        "but an #{new_type} backup was requested."
+      assert(existing_type == new_type, msg)
+
+      unless @online_backup
+        existing_sql = backup.sql_tar_files_exist? ? 'tarball' : 'dump'
+        new_sql = @sql_tar ? 'tarball' : 'dump'
+        msg = "The existing backup has PostgreSQL as a #{existing_sql}, "\
+          "but the new one will have a #{new_sql}."
+        assert(existing_sql == new_sql, msg)
+      end
+    end
+  end
+end

data/definitions/checks/foreman/check_tuning_requirements.rb

@@ -70,8 +70,8 @@ module Checks
       end
 
       def failure_message(tuning_profile)
-        <<-MESSAGE.strip_heredoc
-        \nERROR: The installer is configured to use the #{tuning_profile} tuning profile and does not meet the requirements.
+        <<~MESSAGE
+          \nERROR: The installer is configured to use the #{tuning_profile} tuning profile and does not meet the requirements.
         MESSAGE
       end
     end

data/definitions/checks/system_registration.rb

@@ -5,7 +5,7 @@ class Checks::SystemRegistration < ForemanMaintain::Check
     tags :default
 
     confine do
-      file_exists?('/etc/rhsm/rhsm.conf') && feature(:instance).downstream
+      feature(:instance).downstream
     end
   end
 

data/definitions/features/capsule.rb

@@ -18,4 +18,8 @@ class Features::Capsule < ForemanMaintain::Feature
   def package_name
     'satellite-capsule'
   end
+
+  def module_name
+    'satellite-capsule'
+  end
 end

data/definitions/features/foreman_database.rb

@@ -35,7 +35,12 @@ class Features::ForemanDatabase < ForemanMaintain::Feature
   private
 
   def load_configuration
-    config = YAML.load(File.read(FOREMAN_DB_CONFIG))
+    config = if File.exist?('/etc/foreman/database.yml')
+               YAML.load(File.read(FOREMAN_DB_CONFIG))
+             else
+               { 'production' => {} }
+             end
+
     @configuration = config['production']
     @configuration['host'] ||= 'localhost'
     @configuration

data/definitions/features/satellite.rb

@@ -22,6 +22,10 @@ class Features::Satellite < ForemanMaintain::Feature
     'satellite'
   end
 
+  def module_name
+    'satellite'
+  end
+
   private
 
   def version_from_source

data/definitions/procedures/backup/prepare_directory.rb

@@ -6,18 +6,29 @@ module Procedures::Backup
       param :backup_dir, 'Directory where to backup to', :required => true
       param :preserve_dir, 'Directory where to backup to', :flag => true
       param :incremental_dir, 'Changes since specified backup only'
+      param :online_backup, 'Select for online backup', :flag => true, :default => false
     end
 
+    # rubocop:disable Metrics/MethodLength
     def run
-      puts "Creating backup folder #{@backup_dir}"
-
       unless @preserve_dir
+        puts "Creating backup folder #{@backup_dir}"
+
         FileUtils.mkdir_p @backup_dir
         FileUtils.chmod_R 0o770, @backup_dir
-      end
 
-      if feature(:instance).postgresql_local? && !@preserve_dir
-        FileUtils.chown_R(nil, 'postgres', @backup_dir)
+        if feature(:instance).postgresql_local? && @online_backup
+          begin
+            FileUtils.chown_R(nil, 'postgres', @backup_dir)
+          rescue Errno::EPERM
+            warn_msg = <<~MSG
+              #{@backup_dir} could not be made readable by the 'postgres' user.
+              This won't affect the backup procedure, but you have to ensure that
+              the 'postgres' user can read the data during restore.
+            MSG
+            set_status(:warning, warn_msg)
+          end
+        end
       end
 
       FileUtils.rm(Dir.glob(File.join(@backup_dir, '.*.snar'))) if @preserve_dir
@@ -30,5 +41,6 @@ module Procedures::Backup
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/definitions/procedures/foreman_tasks/ui_investigate.rb

@@ -10,7 +10,7 @@ module Procedures::ForemanTasks
     attr_reader :search_query
 
     def run
-      ask(<<-MESSAGE.strip_heredoc)
+      ask(<<~MESSAGE)
         Go to https://#{hostname}/foreman_tasks/tasks?search=#{CGI.escape(@search_query.to_s)}
         press ENTER after the tasks are resolved.
       MESSAGE

data/definitions/procedures/knowledge_base_article.rb

@@ -12,7 +12,7 @@ class Procedures::KnowledgeBaseArticle < ForemanMaintain::Procedure
   end
 
   def run
-    ask(<<-MESSAGE.strip_heredoc)
+    ask(<<~MESSAGE)
       Go to #{kcs_documents[@doc]}
       please follow steps from above article to resolve this issue
       press ENTER once done.

data/definitions/procedures/packages/update_all_confirmation.rb

@@ -20,7 +20,7 @@ module Procedures::Packages
           the recommendations?
         MSG
 
-        answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
+        answer = ask_decision(question.strip, actions_msg: 'y(yes), q(quit)')
         abort! unless answer == :yes
       end
     end

data/definitions/procedures/sync_plans/disable.rb

@@ -4,7 +4,6 @@ module Procedures::SyncPlans
     metadata do
       for_feature :sync_plans
       description 'disable active sync plans'
-      tags :pre_migrations, :maintenance_mode_on
 
       confine do
         feature(:katello)

data/definitions/procedures/sync_plans/enable.rb

@@ -4,8 +4,6 @@ module Procedures::SyncPlans
     metadata do
       for_feature :sync_plans
       description 're-enable sync plans'
-      tags :post_migrations, :maintenance_mode_off
-      before :disk_io
 
       confine do
         feature(:katello)

data/definitions/scenarios/backup.rb

@@ -18,9 +18,13 @@ module ForemanMaintain::Scenarios
 
     def compose
       check_valid_strategy
+      add_step_with_context(Checks::Backup::IncrementalParentType,
+        :online_backup => strategy == :online,
+        :sql_tar => feature(:instance).postgresql_local?)
       safety_confirmation
       add_step_with_context(Procedures::Backup::AccessibilityConfirmation) if strategy == :offline
-      add_step_with_context(Procedures::Backup::PrepareDirectory)
+      add_step_with_context(Procedures::Backup::PrepareDirectory,
+        :online_backup => strategy == :online)
       add_step_with_context(Procedures::Backup::Metadata, :online_backup => strategy == :online)
 
       case strategy
@@ -50,6 +54,7 @@ module ForemanMaintain::Scenarios
       context.map(:preserve_dir,
         Procedures::Backup::PrepareDirectory => :preserve_dir)
       context.map(:incremental_dir,
+        Checks::Backup::IncrementalParentType => :incremental_dir,
         Procedures::Backup::PrepareDirectory => :incremental_dir,
         Procedures::Backup::Metadata => :incremental_dir)
       context.map(:proxy_features,
@@ -136,7 +141,6 @@ module ForemanMaintain::Scenarios
     def compose
       if strategy == :offline
         add_step_with_context(Procedures::Service::Start)
-        add_steps_with_context(find_procedures(:maintenance_mode_off))
       end
       add_step_with_context(Procedures::Backup::Clean)
     end

data/definitions/scenarios/foreman_upgrade.rb

@@ -1,4 +1,4 @@
-module Scenarios::ForemanUpgrade
+module Scenarios::Foreman
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -38,6 +38,7 @@ module Scenarios::ForemanUpgrade
         Checks::CheckUpstreamRepository,
         Checks::Disk::AvailableSpace,
         Checks::Disk::AvailableSpaceCandlepin, # if candlepin
+        Checks::Disk::AvailableSpacePostgresql13,
         Checks::Foreman::ValidateExternalDbVersion, # if external database
         Checks::Foreman::CheckCorruptedRoles,
         Checks::Foreman::CheckDuplicatePermissions,
@@ -50,6 +51,7 @@ module Scenarios::ForemanUpgrade
         Checks::NonRhPackages,
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,
+        Checks::CheckOrganizationContentAccessMode,
         Checks::Repositories::Validate
       )
     end

data/definitions/scenarios/restore.rb

@@ -14,7 +14,7 @@ module ForemanMaintain::Scenarios
     def compose
       backup = ForemanMaintain::Utils::Backup.new(context.get(:backup_dir))
 
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Checks::Restore::ValidateBackup,
         Checks::Restore::ValidateHostname,
         Checks::Restore::ValidateInterfaces,

data/definitions/scenarios/satellite_upgrade.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite
       metadata do
         tags :upgrade_scenario
         confine do
-          (feature(:instance).downstream.current_minor_version == '6.15' || \
+          (feature(:instance).downstream&.current_minor_version == '6.15' || \
             ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
@@ -23,14 +23,41 @@ module Scenarios::Satellite
       run_strategy :fail_slow
     end
 
+    # rubocop:disable Metrics/MethodLength
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::CheckIpv6Disable)
-      add_step(Checks::Disk::AvailableSpacePostgresql13)
-      add_step(Checks::Repositories::Validate.new(:version => target_version))
-      add_step(Checks::CheckOrganizationContentAccessMode)
+      add_steps(
+        Checks::Foreman::FactsNames, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests, # if puppetserver
+        Checks::ServerPing,
+        Checks::ServicesUp,
+        Checks::SystemRegistration,
+        Checks::CheckHotfixInstalled,
+        Checks::CheckTmout,
+        Checks::CheckUpstreamRepository,
+        Checks::Disk::AvailableSpace,
+        Checks::Disk::AvailableSpaceCandlepin, # if candlepin
+        Checks::Foreman::ValidateExternalDbVersion, # if external database
+        Checks::Foreman::CheckCorruptedRoles,
+        Checks::Foreman::CheckDuplicatePermissions,
+        Checks::Foreman::TuningRequirements, # if katello present
+        Checks::ForemanOpenscap::InvalidReportAssociations, # if foreman-openscap
+        Checks::ForemanTasks::Invalid::CheckOld, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks
+        Checks::ForemanTasks::NotRunning, # if foreman-tasks
+        Checks::NonRhPackages,
+        Checks::PackageManager::Dnf::ValidateDnfConfig,
+        Checks::Repositories::CheckNonRhRepository,
+        Checks::CheckIpv6Disable,
+        Checks::Disk::AvailableSpacePostgresql13,
+        Checks::CheckOrganizationContentAccessMode,
+        Checks::Repositories::Validate.new(:version => target_version),
+      )
     end
+    # rubocop:enable Metrics/MethodLength
   end
 
   class PreMigrations < Abstract
@@ -40,7 +67,11 @@ module Scenarios::Satellite
     end
 
     def compose
-      add_steps(find_procedures(:pre_migrations))
+      add_steps(
+        Procedures::MaintenanceMode::EnableMaintenanceMode,
+        Procedures::Crond::Stop,
+        Procedures::SyncPlans::Disable,
+      )
     end
   end
 
@@ -60,15 +91,17 @@ module Scenarios::Satellite
       if el8?
         modules_to_switch = ['postgresql:13']
         add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite:#{el_short_name}"]
+        modules_to_enable = ["#{feature(:instance).downstream.module_name}:#{el_short_name}"]
         add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :download_only => true
-      ))
-      add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
+      add_steps(
+        Procedures::Packages::Update.new(
+          :assumeyes => true,
+          :download_only => true
+        ),
+        Procedures::Service::Stop,
+        Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false),
+      )
       add_step_with_context(Procedures::Installer::Run)
       add_step(Procedures::Installer::UpgradeRakeTask)
     end
@@ -81,9 +114,13 @@ module Scenarios::Satellite
     end
 
     def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_steps(
+        Procedures::RefreshFeatures,
+        Procedures::Service::Start,
+        Procedures::Crond::Start,
+        Procedures::SyncPlans::Enable,
+        Procedures::MaintenanceMode::DisableMaintenanceMode,
+      )
     end
   end
 
@@ -95,11 +132,19 @@ module Scenarios::Satellite
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-      add_step(Procedures::Packages::CheckForReboot)
-      add_step(Procedures::Pulpcore::ContainerHandleImageMetadata)
-      add_step(Procedures::Repositories::IndexKatelloRepositoriesContainerMetatdata)
+      add_steps(
+        Checks::Foreman::FactsNames, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests, # if puppetserver
+        Checks::ServerPing,
+        Checks::ServicesUp,
+        Checks::SystemRegistration,
+        Procedures::Packages::CheckForReboot,
+        Procedures::Pulpcore::ContainerHandleImageMetadata,
+        Procedures::Repositories::IndexKatelloRepositoriesContainerMetatdata,
+      )
     end
   end
 end

data/definitions/scenarios/services.rb

@@ -8,7 +8,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Procedures::Service::Restart)
     end
 
@@ -33,7 +33,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Procedures::Service::Stop)
     end
 
@@ -55,7 +55,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Procedures::Service::Start)
     end
 
@@ -98,7 +98,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Procedures::Service::Enable)
     end
 
@@ -120,7 +120,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_checks(:root_user))
+      add_step(Checks::RootUser)
       add_steps_with_context(Procedures::Service::Disable)
     end
 

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -30,7 +30,7 @@ module ForemanMaintain
                           else
                             '--target-version not specified'
                           end
-          message = <<-MESSAGE.strip_heredoc
+          message = <<~MESSAGE
             #{message_start}
             Possible target versions are:
           MESSAGE

data/lib/foreman_maintain/concerns/base_database.rb

@@ -42,7 +42,7 @@ module ForemanMaintain
       end
 
       def local?(config = configuration)
-        ['localhost', '127.0.0.1', `hostname`.strip].include? config['host']
+        ['localhost', '127.0.0.1', `hostname`.strip].include?(config['host'])
       end
 
       def query(sql, config = configuration)

data/lib/foreman_maintain/concerns/finders.rb

@@ -13,10 +13,6 @@ module ForemanMaintain
         ensure_one_object(:check, label)
       end
 
-      def find_checks(conditions)
-        detector.available_checks(conditions)
-      end
-
       def procedure(label)
         ensure_one_object(:procedure, label)
       end

data/lib/foreman_maintain/config.rb

@@ -25,6 +25,11 @@ module ForemanMaintain
       @foreman_port = @options.fetch(:foreman_port, 443)
     end
 
+    def use_color?
+      ENV['TERM'] && ENV.fetch('NO_COLOR', '') == '' && \
+        system('command -v tput', out: File.open('/dev/null')) && `tput colors`.to_i > 0
+    end
+
     private
 
     def load_log_configs

data/lib/foreman_maintain/core_ext.rb

@@ -1,17 +1,5 @@
 module ForemanMaintain
   module CoreExt
-    module StripHeredoc
-      def strip_heredoc
-        indent = 0
-        indented_lines = scan(/^[ \t]+(?=\S)/)
-        unless indented_lines.empty?
-          indent = indented_lines.min.size
-        end
-        gsub(/^[ \t]{#{indent}}/, '')
-      end
-    end
-    String.include StripHeredoc
-
     module ValidateOptions
       def validate_options!(*valid_keys)
         valid_keys.flatten!

data/lib/foreman_maintain/detector.rb

@@ -24,6 +24,7 @@ module ForemanMaintain
       @all_features_scanned = false
       @available_checks = nil
       @available_scenarios = nil
+      @available_procedures = nil
       @scenarios ||= Scenario.all_sub_classes.select(&:autodetect?)
     end
 

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -301,17 +301,17 @@ module ForemanMaintain
         return if scenario.passed? && !scenario.warning?
 
         message = []
-        message << <<-MESSAGE.strip_heredoc
+        message << <<~MESSAGE
           Scenario [#{scenario.description}] failed.
         MESSAGE
         recommend = []
 
         steps_with_abort = scenario.steps_with_abort(:whitelisted => false)
         unless steps_with_abort.empty?
-          message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_abort, "\n", 2))
-          The processing was aborted by user during the following steps:
+          message << format(<<~MESSAGE, format_steps(steps_with_abort, "\n", 2))
+            The processing was aborted by user during the following steps:
 
-          %s
+            %s
           MESSAGE
         end
 
@@ -323,28 +323,28 @@ module ForemanMaintain
 
         steps_to_whitelist = steps_with_error + steps_with_skipped - not_skippable_steps
         unless steps_with_error.empty?
-          message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_error, "\n", 2))
-          The following steps ended up in failing state:
+          message << format(<<~MESSAGE, format_steps(steps_with_error, "\n", 2))
+            The following steps ended up in failing state:
 
-          %s
+            %s
           MESSAGE
           whitelist_labels = steps_to_whitelist.map(&:label_dashed).join(',')
           unless whitelist_labels.empty?
             recommend << if scenario.detector.feature(:instance).downstream
-                           format(<<-MESSAGE.strip_heredoc)
-              Resolve the failed steps and rerun the command.
+                           format(<<~MESSAGE)
+                             Resolve the failed steps and rerun the command.
 
-              If the situation persists and, you are unclear what to do next,
-              contact #{scenario.detector.feature(:instance).project_support_entity}.
+                             If the situation persists and, you are unclear what to do next,
+                             contact #{scenario.detector.feature(:instance).project_support_entity}.
 
-              In case the failures are false positives, use
-              --whitelist="#{whitelist_labels}"
+                             In case the failures are false positives, use
+                             --whitelist="#{whitelist_labels}"
                            MESSAGE
                          else
-                           format(<<-MESSAGE.strip_heredoc)
-              Resolve the failed steps and rerun the command.
-              In case the failures are false positives, use
-              --whitelist="#{whitelist_labels}"
+                           format(<<~MESSAGE)
+                             Resolve the failed steps and rerun the command.
+                             In case the failures are false positives, use
+                             --whitelist="#{whitelist_labels}"
                            MESSAGE
                          end
           end
@@ -352,15 +352,15 @@ module ForemanMaintain
 
         steps_with_warning = scenario.steps_with_warning(:whitelisted => false)
         unless steps_with_warning.empty?
-          message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_warning, "\n", 2))
-          The following steps ended up in warning state:
+          message << format(<<~MESSAGE, format_steps(steps_with_warning, "\n", 2))
+            The following steps ended up in warning state:
 
-          %s
+            %s
           MESSAGE
 
-          recommend << <<-MESSAGE.strip_heredoc
-          The steps in warning state itself might not mean there is an error,
-          but it should be reviewed to ensure the behavior is expected
+          recommend << <<~MESSAGE
+            The steps in warning state itself might not mean there is an error,
+            but it should be reviewed to ensure the behavior is expected
           MESSAGE
         end
         puts((message + recommend).join("\n"))

data/lib/foreman_maintain/reporter.rb

@@ -67,7 +67,7 @@ module ForemanMaintain
       end
 
       until_valid_decision do
-        filter_decision(ask("#{message}, [#{actions_msg}]"))
+        filter_decision(ask("#{message}\n[#{actions_msg}]"))
       end
     end
     # rubocop:enable Metrics/LineLength

data/lib/foreman_maintain/update_runner.rb

@@ -133,10 +133,10 @@ module ForemanMaintain
       decision = super(scenario)
       # we have not asked the user already about next steps
       if decision.nil? && @ask_to_confirm_update
-        response = reporter.ask_decision(<<-MESSAGE.strip_heredoc.strip)
-            The pre-update checks indicate that the system is ready for update.
-            It's recommended to perform a backup at this stage.
-            Confirm to continue with the modification part of the update
+        response = reporter.ask_decision(<<~MESSAGE.strip)
+          The pre-update checks indicate that the system is ready for update.
+          It's recommended to perform a backup at this stage.
+          Confirm to continue with the modification part of the update
         MESSAGE
         if [:no, :quit].include?(response)
           ask_to_quit

data/lib/foreman_maintain/upgrade_runner.rb

@@ -94,7 +94,7 @@ module ForemanMaintain
     def finish_upgrade
       @finished = true
       @reporter.hline
-      @reporter.puts <<-MESSAGE.strip_heredoc
+      @reporter.puts <<~MESSAGE
         Upgrade finished.
       MESSAGE
     end
@@ -136,7 +136,7 @@ module ForemanMaintain
     def skip_phase(skipped_phase)
       with_non_empty_scenario(skipped_phase) do |scenario|
         @reporter.before_scenario_starts(scenario)
-        @reporter.puts <<-MESSAGE.strip_heredoc
+        @reporter.puts <<~MESSAGE
           Skipping #{skipped_phase} phase as it was already run before.
           To enforce to run the phase, use `upgrade run --phase #{skipped_phase}`
         MESSAGE
@@ -164,7 +164,7 @@ module ForemanMaintain
         end
       end
       self.phase = :pre_upgrade_checks # rollback finished
-      @reporter.puts <<-MESSAGE.strip_heredoc
+      @reporter.puts <<~MESSAGE
         The upgrade failed and system was restored to pre-upgrade state.
       MESSAGE
     end
@@ -199,10 +199,10 @@ module ForemanMaintain
       decision = super(scenario)
       # we have not asked the user already about next steps
       if decision.nil? && @ask_to_confirm_upgrade
-        response = reporter.ask_decision(<<-MESSAGE.strip_heredoc.strip)
-            The pre-upgrade checks indicate that the system is ready for upgrade.
-            It's recommended to perform a backup at this stage.
-            Confirm to continue with the modification part of the upgrade
+        response = reporter.ask_decision(<<~MESSAGE.strip)
+          The pre-upgrade checks indicate that the system is ready for upgrade.
+          It's recommended to perform a backup at this stage.
+          Confirm to continue with the modification part of the upgrade
         MESSAGE
         if [:no, :quit].include?(response)
           ask_to_quit

data/lib/foreman_maintain/utils/backup.rb

@@ -11,6 +11,9 @@ module ForemanMaintain
         :foreman_online_files, :foreman_offline_files, :fpc_offline_files,
         :fpc_online_files
 
+      ONLINE_BACKUP = 'online'.freeze
+      OFFLINE_BACKUP = 'offline'.freeze
+
       def initialize(backup_dir)
         # fpc stands for foreman proxy w/ content
         @backup_dir = backup_dir
@@ -260,6 +263,10 @@ module ForemanMaintain
       def different_source_os?
         source_os_version != "#{os_name} #{os_version}"
       end
+
+      def backup_type
+        online_backup? ? ONLINE_BACKUP : OFFLINE_BACKUP
+      end
     end
   end
 end

data/lib/foreman_maintain/utils/service/systemd.rb

@@ -50,11 +50,7 @@ module ForemanMaintain::Utils
       end
 
       def exist?
-        if @sys.systemd_installed?
-          ['enabled', 'disabled'].include?(service_enabled_status)
-        else
-          File.exist?("/etc/init.d/#{@name}")
-        end
+        ['enabled', 'disabled'].include?(service_enabled_status)
       end
 
       def enabled?

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.10'.freeze
+  VERSION = '1.6.12'.freeze
 end

data/lib/foreman_maintain.rb

@@ -1,7 +1,3 @@
-if RUBY_VERSION <= '1.8.7'
-  require 'rubygems'
-end
-
 require 'forwardable'
 require 'json'
 require 'logger'
@@ -68,6 +64,7 @@ module ForemanMaintain
 
       # using a queue, we can log the messages which are generated before initializing logger
       self.config = Config.new(options)
+      configure_highline
       load_definitions
       init_logger
       update_path
@@ -102,6 +99,10 @@ module ForemanMaintain
       end
     end
 
+    def configure_highline
+      HighLine.use_color = config.use_color?
+    end
+
     def cache
       ObjectCache.instance
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.12
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -158,6 +158,7 @@ files:
 - config/foreman_maintain.yml.packaging
 - config/hammer.yml.example
 - definitions/checks/backup/certs_tar_exist.rb
+- definitions/checks/backup/incremental_parent_type.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_ipv6_disable.rb
@@ -275,7 +276,6 @@ files:
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/pulpcore/container_handle_image_metadata.rb
-- definitions/procedures/pulpcore/trim_rpm_changelogs.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
 - definitions/procedures/puppet/remove_puppet_data.rb
@@ -293,7 +293,6 @@ files:
 - definitions/procedures/restore/extract_files.rb
 - definitions/procedures/restore/foreman_dump.rb
 - definitions/procedures/restore/installer_reset.rb
-- definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/reindex_databases.rb
 - definitions/procedures/restore/required_packages.rb

data/definitions/procedures/pulpcore/trim_rpm_changelogs.rb

@@ -1,22 +0,0 @@
-module Procedures::Pulpcore
-  class TrimRpmChangelogs < ForemanMaintain::Procedure
-    include ForemanMaintain::Concerns::SystemService
-    include ForemanMaintain::Concerns::PulpCommon
-
-    metadata do
-      description 'Trim RPM changelogs in the pulpcore db'
-      for_feature :pulpcore
-    end
-
-    def run
-      with_spinner('Trimming RPM changelogs in the pulpcore db') do |spinner|
-        necessary_services = feature(:pulpcore_database).services
-
-        feature(:service).handle_services(spinner, 'start', :only => necessary_services)
-
-        spinner.update('Trimming RPM changelogs')
-        execute!(pulpcore_manager('rpm-trim-changelogs'))
-      end
-    end
-  end
-end

data/definitions/procedures/restore/postgres_owner.rb

@@ -1,18 +0,0 @@
-module Procedures::Restore
-  class PostgresOwner < ForemanMaintain::Procedure
-    include ForemanMaintain::Concerns::SystemHelpers
-    metadata do
-      description 'Make postgres owner of backup directory'
-
-      param :backup_dir,
-        'Path to backup directory',
-        :required => true
-    end
-
-    def run
-      if feature(:instance).foreman_proxy_with_content?
-        FileUtils.chown(nil, 'postgres', @backup_dir)
-      end
-    end
-  end
-end