foreman_maintain 1.3.0 → 1.3.1

data/lib/foreman_maintain/concerns/base_database.rb

@@ -2,9 +2,7 @@ module ForemanMaintain
   module Concerns
     module BaseDatabase
       def data_dir
-        if el7? && package_manager.installed?('rh-postgresql12-postgresql-server-syspaths')
-          '/var/opt/rh/rh-postgresql12/lib/pgsql/data/'
-        elsif debian_or_ubuntu?
+        if debian_or_ubuntu?
           deb_postgresql_data_dir
         else
           '/var/lib/pgsql/data/'
@@ -39,20 +37,13 @@ module ForemanMaintain
         end
       end
 
-      def restore_transform
-        if el8?
-          # this allows to transform an EL7 backup to EL8 paths
-          's,^var/opt/rh/rh-postgresql12/,var/,S'
-        end
-      end
-
       def configuration
         raise NotImplementedError
       end
 
       def config_files
         [
-          '/etc/systemd/system/postgresql.service'
+          '/etc/systemd/system/postgresql.service',
         ]
       end
 
@@ -71,8 +62,8 @@ module ForemanMaintain
       def psql(query, config = configuration)
         if ping(config)
           execute(psql_command(config),
-                  :stdin => query,
-                  :hidden_patterns => [config['password']])
+            :stdin => query,
+            :hidden_patterns => [config['password']])
         else
           raise_service_error
         end
@@ -80,8 +71,8 @@ module ForemanMaintain
 
       def ping(config = configuration)
         execute?(psql_command(config),
-                 :stdin => 'SELECT 1 as ping',
-                 :hidden_patterns => [config['password']])
+          :stdin => 'SELECT 1 as ping',
+          :hidden_patterns => [config['password']])
       end
 
       def backup_file_path(config = configuration)
@@ -116,8 +107,8 @@ module ForemanMaintain
           tar_options = {
             :archive => backup_file,
             :command => command,
-            :transform => "s,^,#{dir[1..-1]},S",
-            :files => '*'
+            :transform => "s,^,#{dir[1..]},S",
+            :files => '*',
           }.merge(extra_tar_options)
           feature(:tar).run(tar_options)
         end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -53,85 +53,27 @@ module ForemanMaintain
         rh_repos = main_rh_repos
         server_version_full = "#{server_version.major}.#{server_version.minor}"
         rh_repos.concat(product_specific_repos(server_version_full))
-        if server_version > version('6.3')
-          ansible_repo = ansible_repo(server_version)
-          rh_repos << ansible_repo if ansible_repo
-        end
-
         rh_repos
       end
 
-      def ansible_repo(server_version)
-        if server_version >= version('6.8')
-          ansible_version = '2.9'
-        elsif server_version >= version('6.6')
-          ansible_version = '2.8'
-        elsif server_version >= version('6.4')
-          ansible_version = '2.6'
-        end
-
-        if el7?
-          "rhel-#{el_major_version}-server-ansible-#{ansible_version}-rpms"
-        end
-      end
-
       def use_beta_repos?
         ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
       end
 
       def product_specific_repos(full_version)
-        maj_version = full_version[0]
-        repos = if el7? && use_beta_repos?
-                  ["rhel-server-#{el_major_version}-#{package_name}-#{maj_version}-beta-rpms"]
-                elsif el7?
-                  ["rhel-#{el_major_version}-server-#{package_name}-#{full_version}-rpms"]
-                elsif use_beta_repos?
-                  ["#{package_name}-#{maj_version}-beta-for-rhel-#{el_major_version}-x86_64-rpms"]
-                else
-                  ["#{package_name}-#{full_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
-                end
-
-        repos << puppet4_repo(full_version) unless puppet4_repo(full_version).nil?
+        repos = ["#{package_name}-#{full_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
         repos.concat(common_repos(full_version))
       end
 
-      def puppet4_repo(full_version)
-        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
-          feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
-          "rhel-#{el_major_version}-server-#{package_name}-tools-6.3-puppet4-rpms"
-        end
-      end
-
       def common_repos(full_version)
-        sat_maint_version = if version(full_version) >= version('6.11') && !use_beta_repos?
-                              full_version
-                            else
-                              full_version[0]
-                            end
-
-        # rubocop:disable Metrics/LineLength
-        repos = if el7? && use_beta_repos?
-                  ["rhel-#{el_major_version}-server-satellite-maintenance-#{sat_maint_version}-beta-rpms"]
-                elsif el7?
-                  ["rhel-#{el_major_version}-server-satellite-maintenance-#{sat_maint_version}-rpms"]
-                elsif use_beta_repos?
-                  ["satellite-maintenance-#{sat_maint_version}-beta-for-rhel-#{el_major_version}-x86_64-rpms"]
-                else
-                  ["satellite-maintenance-#{sat_maint_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
-                end
-        # rubocop:enable Metrics/LineLength
-
-        repos
+        ["satellite-maintenance-#{full_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
       end
 
       def main_rh_repos
-        if el7?
-          ["rhel-#{el_major_version}-server-rpms",
-           "rhel-server-rhscl-#{el_major_version}-rpms"]
-        else
-          ["rhel-#{el_major_version}-for-x86_64-baseos-rpms",
-           "rhel-#{el_major_version}-for-x86_64-appstream-rpms"]
-        end
+        [
+          "rhel-#{el_major_version}-for-x86_64-baseos-rpms",
+          "rhel-#{el_major_version}-for-x86_64-appstream-rpms",
+        ]
       end
 
       def version_from_source

data/lib/foreman_maintain/concerns/firewall/iptables_maintenance_mode.rb

@@ -8,7 +8,7 @@ module ForemanMaintain
 
         def enable_maintenance_mode
           add_chain(custom_chain_name,
-                    ['-i lo -j ACCEPT', '-p tcp --dport 443 -j REJECT'])
+            ['-i lo -j ACCEPT', '-p tcp --dport 443 -j REJECT'])
         end
 
         def maintenance_mode_status?

data/lib/foreman_maintain/concerns/foreman_and_katello_version_map.rb

@@ -2,7 +2,7 @@ module ForemanMaintain
   module Concerns
     module ForemanAndKatelloVersionMap
       FOREMAN_AND_KATELLO_VERSION_MAP = {
-        'nightly' => 'nightly'
+        'nightly' => 'nightly',
       }.freeze
 
       def foreman_version_by_katello(version)

data/lib/foreman_maintain/concerns/os_facts.rb

@@ -62,14 +62,6 @@ module ForemanMaintain
         os_id == 'ubuntu'
       end
 
-      def el7?
-        el_major_version == 7
-      end
-
-      def el8?
-        el_major_version == 8
-      end
-
       def el_major_version
         os_version_id.to_i if el?
       end

data/lib/foreman_maintain/concerns/primary_checks.rb

@@ -2,19 +2,20 @@ module ForemanMaintain
   module Concerns
     module PrimaryChecks
       def validate_downstream_packages
-        return unless detector.feature(:installer) && detector.feature(:installer).with_scenarios?
+        return unless detector.feature(:installer)&.with_scenarios?
         if (package = package_name) && !package_manager.installed?(package)
           raise ForemanMaintain::Error::Fail,
-                "Error: Important rpm package #{package} is not installed!"\
-                "\nInstall #{package} rpm to ensure system consistency."
+            "Error: Important rpm package #{package} is not installed!"\
+            "\nInstall #{package} rpm to ensure system consistency."
         end
       end
 
       def package_name
         installed_scenario = detector.feature(:installer).last_scenario
-        if installed_scenario == 'satellite'
+        case installed_scenario
+        when 'satellite'
           'satellite'
-        elsif installed_scenario == 'capsule'
+        when 'capsule'
           'satellite-capsule'
         end
       end

data/lib/foreman_maintain/concerns/pulp_common.rb

@@ -6,16 +6,9 @@ module ForemanMaintain
       end
 
       def exclude_from_backup
-        # For pulp2:
-        # Exclude /var/lib/pulp/katello-export and /var/lib/pulp/cache
-        # since the tar is run from /var/lib/pulp, list subdir paths only
-        # For pulp3/pulpcore:
-        pulp2_dirs = %w[katello-export cache]
-        # For pulp3/pulpcore:
         # Only need to backup media directory of /var/lib/pulp
         # All below directories and their contents are regenerated on installer run
-        pulpcore_dirs = %w[assets exports imports sync_imports tmp]
-        pulp2_dirs + pulpcore_dirs
+        %w[assets exports imports sync_imports tmp]
       end
     end
   end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -127,7 +127,7 @@ module ForemanMaintain
       def parse_csv(data)
         parsed_data = CSV.parse(data)
         header = parsed_data.first
-        parsed_data[1..-1].map do |row|
+        parsed_data[1..].map do |row|
           Hash[*header.zip(row).flatten(1)]
         end
       end
@@ -191,11 +191,9 @@ module ForemanMaintain
         ForemanMaintain.repository_manager
       end
 
-      def ruby_prefix(scl = true)
+      def ruby_prefix
         if debian_or_ubuntu?
           'ruby-'
-        elsif el7? && scl
-          'tfm-rubygem-'
         else
           'rubygem-'
         end
@@ -213,8 +211,7 @@ module ForemanMaintain
         else
           proxy_plugin_prefix = 'smart_proxy_'
         end
-        scl = check_min_version('foreman-proxy', '2.0')
-        ruby_prefix(scl) + proxy_plugin_prefix + plugin
+        ruby_prefix + proxy_plugin_prefix + plugin
       end
 
       def hammer_plugin_name(plugin)

data/lib/foreman_maintain/concerns/upstream.rb

@@ -86,7 +86,7 @@ module ForemanMaintain
         repoids_and_urls = {}
         repository_manager.enabled_repos.each do |repo, url|
           repo_urls.each do |regex|
-            repoids_and_urls[repo] = url if url =~ regex
+            repoids_and_urls[repo] = url if url&.match?(regex)
           end
         end
         repoids_and_urls
@@ -95,8 +95,8 @@ module ForemanMaintain
       private
 
       def repo_urls
-        [%r{yum.theforeman.org\/*},
-         %r{yum.puppetlabs.com\/*}]
+        [%r{yum.theforeman.org/*},
+         %r{yum.puppetlabs.com/*}]
       end
     end
   end

data/lib/foreman_maintain/config.rb

@@ -2,17 +2,17 @@ require 'fileutils'
 module ForemanMaintain
   class Config
     attr_accessor :pre_setup_log_messages,
-                  :config_file, :definitions_dirs, :log_level, :log_dir, :log_file_size,
-                  :log_filename, :storage_file, :backup_dir, :foreman_proxy_cert_path,
-                  :db_backup_dir, :completion_cache_file, :disable_commands, :manage_crond,
-                  :foreman_url, :foreman_port
+      :config_file, :definitions_dirs, :log_level, :log_dir, :log_file_size,
+      :log_filename, :storage_file, :backup_dir, :foreman_proxy_cert_path,
+      :db_backup_dir, :completion_cache_file, :disable_commands, :manage_crond,
+      :foreman_url, :foreman_port
 
     def initialize(options)
       @pre_setup_log_messages = []
       @config_file = options.fetch(:config_file, config_file_path)
       @options = load_config
       @definitions_dirs = @options.fetch(:definitions_dirs,
-                                         [File.join(source_path, 'definitions')])
+        [File.join(source_path, 'definitions')])
       load_log_configs
       load_backup_dir_paths
       load_cron_option
@@ -68,7 +68,7 @@ module ForemanMaintain
     end
 
     def source_path
-      File.expand_path('../../..', __FILE__)
+      File.expand_path('../..', __dir__)
     end
 
     def find_dir_path(dir_path_str)

data/lib/foreman_maintain/core_ext.rb

@@ -10,7 +10,7 @@ module ForemanMaintain
         gsub(/^[ \t]{#{indent}}/, '')
       end
     end
-    String.send(:include, StripHeredoc)
+    String.include StripHeredoc
 
     module ValidateOptions
       def validate_options!(*valid_keys)
@@ -23,6 +23,6 @@ module ForemanMaintain
         self
       end
     end
-    Hash.send(:include, ValidateOptions)
+    Hash.include ValidateOptions
   end
 end

data/lib/foreman_maintain/executable.rb

@@ -3,10 +3,11 @@ module ForemanMaintain
     extend Forwardable
     extend Concerns::Finders
     attr_reader :options
+
     def_delegators :execution,
-                   :success?, :skipped?, :fail?, :aborted?, :warning?, :output,
-                   :assumeyes?, :whitelisted?, :ask_decision,
-                   :execution, :puts, :print, :with_spinner, :ask, :storage
+      :success?, :skipped?, :fail?, :aborted?, :warning?, :output,
+      :assumeyes?, :whitelisted?, :ask_decision,
+      :execution, :puts, :print, :with_spinner, :ask, :storage
 
     def initialize(options = {})
       @options = options.inject({}) { |h, (k, v)| h.update(k.to_s => v) }
@@ -26,7 +27,8 @@ module ForemanMaintain
     end
 
     # public method to be overriden to perform after-initialization steps
-    def after_initialize; end
+    def after_initialize
+    end
 
     # processes the params from provided options
     def setup_params
@@ -113,11 +115,7 @@ module ForemanMaintain
     end
 
     def execution
-      if @_execution
-        @_execution
-      else
-        raise 'Trying to get execution information before the run started happened'
-      end
+      @_execution || raise('Trying to get execution information before the run started happened')
     end
 
     # public method to be overriden: it can perform additional checks

data/lib/foreman_maintain/package_manager/apt.rb

@@ -68,10 +68,10 @@ module ForemanMaintain::PackageManager
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
       if with_status
         sys.execute_with_status("apt-get#{apt_options_s} #{action}#{packages_s}",
-                                :interactive => !assumeyes)
+          :interactive => !assumeyes)
       else
         sys.execute!("apt-get#{apt_options_s} #{action}#{packages_s}",
-                     :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
+          :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
       end
     end
   end

data/lib/foreman_maintain/package_manager/base.rb

@@ -1,5 +1,4 @@
 module ForemanMaintain::PackageManager
-  # rubocop:disable Lint/UnusedMethodArgument
   class Base
     # confirms that Package Manager supports the locking mechanism
     def version_locking_supported?
@@ -62,5 +61,4 @@ module ForemanMaintain::PackageManager
       ForemanMaintain::Utils::SystemHelpers
     end
   end
-  # rubocop:enable Lint/UnusedMethodArgument
 end

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -35,10 +35,10 @@ module ForemanMaintain::PackageManager
       yum_options << '-y' if assumeyes
       if with_status
         sys.execute_with_status("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
-                                :interactive => !assumeyes)
+          :interactive => !assumeyes)
       else
         sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
-                     :interactive => !assumeyes)
+          :interactive => !assumeyes)
 
       end
     end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -120,7 +120,6 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def yum_action(action, packages, options)
       with_status = options.fetch(:with_status, false)
       assumeyes = options.fetch(:assumeyes, false)
@@ -133,10 +132,10 @@ module ForemanMaintain::PackageManager
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
       if with_status
         sys.execute_with_status("yum#{yum_options_s} #{action}#{packages_s}",
-                                :interactive => !assumeyes)
+          :interactive => !assumeyes)
       else
         sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
-                     :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
+          :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
       end
     end
   end

data/lib/foreman_maintain/package_manager.rb

@@ -5,9 +5,7 @@ require 'foreman_maintain/package_manager/apt'
 
 module ForemanMaintain
   def self.package_manager
-    @package_manager ||= if el7?
-                           ForemanMaintain::PackageManager::Yum.new
-                         elsif el?
+    @package_manager ||= if el?
                            ForemanMaintain::PackageManager::Dnf.new
                          elsif debian_or_ubuntu?
                            ForemanMaintain::PackageManager::Apt.new

data/lib/foreman_maintain/param.rb

@@ -4,7 +4,7 @@ module ForemanMaintain
 
     def initialize(name, description, options, &block)
       options.validate_options!(:description, :required, :flag, :array,
-                                :allowed_values, :default)
+        :allowed_values, :default)
       @name = name
       @description = description || options[:description] || ''
       @options = options
@@ -63,7 +63,7 @@ module ForemanMaintain
       return if within_allowed
       error_msg = "'#{value}' not allowed for #{name} param."
       raise ForemanMaintain::Error::UsageError,
-            "#{error_msg} Possible values are #{@allowed_values.join(', ')}"
+        "#{error_msg} Possible values are #{@allowed_values.join(', ')}"
     end
   end
 end

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -1,4 +1,3 @@
-require 'thread'
 require 'highline'
 
 module ForemanMaintain
@@ -73,7 +72,7 @@ module ForemanMaintain
       attr_accessor :select_option_counter
       attr_reader :last_line, :max_length
 
-      def initialize(stdout = STDOUT, stdin = STDIN, options = {})
+      def initialize(stdout = $stdout, stdin = $stdin, options = {})
         @stdout = stdout
         @stdin = stdin
         options.validate_options!(:assumeyes)
@@ -127,9 +126,9 @@ module ForemanMaintain
         @new_line_next_time = false
         @last_line = ''
         # add space at the end as otherwise highline would add new line there :/
-        message = "#{message} " unless message =~ /\s\Z/
+        message = "#{message} " unless /\s\Z/.match?(message)
         answer = @hl.ask(message) { |q| q.echo = false if options[:password] }
-        answer.to_s.chomp if answer
+        answer&.to_s&.chomp
       end
 
       def new_line_if_needed
@@ -179,7 +178,7 @@ module ForemanMaintain
 
       def single_step_decision(step, run_strategy)
         answer = ask_decision("Continue with step [#{step.runtime_message}]?",
-                              run_strategy: run_strategy)
+          run_strategy: run_strategy)
         if answer == :yes
           step
         else
@@ -339,13 +338,13 @@ module ForemanMaintain
 
               In case the failures are false positives, use
               --whitelist="%s"
-              MESSAGE
+                           MESSAGE
                          else
                            format(<<-MESSAGE.strip_heredoc, whitelist_labels)
               Resolve the failed steps and rerun the command.
               In case the failures are false positives, use
               --whitelist="%s"
-              MESSAGE
+                           MESSAGE
                          end
           end
         end

data/lib/foreman_maintain/reporter.rb

@@ -10,17 +10,21 @@ module ForemanMaintain
     DECISION_MAPPER = {
       %w[y yes] => :yes,
       %w[n next no] => :no,
-      %w[q quit] => :quit
+      %w[q quit] => :quit,
     }.freeze
 
     # Each public method is a hook called by executor at the specific point
-    def before_scenario_starts(_scenario, _last_scenario = nil); end
+    def before_scenario_starts(_scenario, _last_scenario = nil)
+    end
 
-    def before_execution_starts(_execution); end
+    def before_execution_starts(_execution)
+    end
 
-    def after_execution_finishes(_execution); end
+    def after_execution_finishes(_execution)
+    end
 
-    def after_scenario_finishes(_scenario); end
+    def after_scenario_finishes(_scenario)
+    end
 
     def on_next_steps(steps, run_strategy = :fail_fast)
       return if steps.empty?
@@ -36,11 +40,14 @@ module ForemanMaintain
       yield DummySpinner.new
     end
 
-    def print(_message); end
+    def print(_message)
+    end
 
-    def puts(_message); end
+    def puts(_message)
+    end
 
-    def ask(_message); end
+    def ask(_message)
+    end
 
     def assumeyes?
       @assumeyes
@@ -100,7 +107,6 @@ module ForemanMaintain
       decision
     end
 
-    # rubocop:disable Metrics/MethodLength
     def ask_to_select(message, steps, run_strategy)
       if assumeyes?
         puts('(assuming first option)')
@@ -122,7 +128,6 @@ module ForemanMaintain
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     # loop over the block until it returns some non-false value
     def until_valid_decision

data/lib/foreman_maintain/repository_manager/el.rb

@@ -4,11 +4,7 @@ module ForemanMaintain::RepositoryManager
     include ForemanMaintain::Concerns::SystemHelpers
 
     def disable_repos(repo_ids)
-      if el7?
-        execute!("yum-config-manager #{config_manager_options(repo_ids, 'disable')}")
-      else
-        execute!("dnf config-manager #{config_manager_options(repo_ids, 'set-disabled')}")
-      end
+      execute!("dnf config-manager #{config_manager_options(repo_ids, 'set-disabled')}")
     end
 
     def rhsm_disable_repos(repo_ids)
@@ -22,11 +18,7 @@ module ForemanMaintain::RepositoryManager
     end
 
     def enable_repos(repo_ids)
-      if el7?
-        execute!("yum-config-manager #{config_manager_options(repo_ids, 'enable')}")
-      else
-        execute!("dnf config-manager #{config_manager_options(repo_ids, 'enable')}")
-      end
+      execute!("dnf config-manager #{config_manager_options(repo_ids, 'enable')}")
     end
 
     def rhsm_enable_repos(repo_ids)

data/lib/foreman_maintain/repository_manager.rb

@@ -1,6 +1,7 @@
 require 'foreman_maintain/repository_manager/el'
-include ForemanMaintain::Concerns::OsFacts
 module ForemanMaintain
+  extend ForemanMaintain::Concerns::OsFacts
+
   def self.repository_manager
     @repository_manager ||= if el?
                               ForemanMaintain::RepositoryManager::El.new

data/lib/foreman_maintain/runner.rb

@@ -78,7 +78,7 @@ module ForemanMaintain
                  elsif @last_scenario.steps_with_warning(:whitelisted => false).any?
                    @last_scenario_continuation_confirmed = true
                    reporter.ask_decision("Continue with [#{scenario.description}]",
-                                         run_strategy: scenario.run_strategy)
+                     run_strategy: scenario.run_strategy)
                  end
 
       ask_to_quit if [:quit, :no].include?(decision)
@@ -93,7 +93,7 @@ module ForemanMaintain
     def add_steps(*steps)
       # we we add the steps at the beginning, but still keeping the
       # order of steps passed in the arguments
-      steps.reverse.each do |step|
+      steps.reverse_each do |step|
         @steps_to_run.unshift(step)
       end
     end
@@ -125,9 +125,9 @@ module ForemanMaintain
     def run_step(step)
       @reporter.puts('Rerunning the check after fix procedure') if rerun_check?(step)
       execution = Execution.new(step, @reporter,
-                                :whitelisted => whitelisted_step?(step),
-                                :storage => storage,
-                                :force => @force)
+        :whitelisted => whitelisted_step?(step),
+        :storage => storage,
+        :force => @force)
       execution.run
       execution
     ensure

data/lib/foreman_maintain/scenario.rb

@@ -88,10 +88,12 @@ module ForemanMaintain
     end
 
     # Override to compose steps for the scenario
-    def compose; end
+    def compose
+    end
 
     # Override to map context for the scenario
-    def set_context_mapping; end
+    def set_context_mapping
+    end
 
     def preparation_steps
       # we first take the preparation steps defined for the scenario + collect