foreman_maintain 1.7.6 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d0abf16f40a1448c08bbcc3841e1347d27ffe2e7da598e05dd27a3c565de49
-  data.tar.gz: b3b19431311ac39014e8679653bcb61c055cf46f4cc867158cc1222485986ebd
+  metadata.gz: 076bba551da26888de415a1f67a2b1950493db5cbcc8ace83b3efd0498ffa96d
+  data.tar.gz: b39e663f0109565f11303ce1cd02740e8b937dbd554ff3d8123446b63d09e073
 SHA512:
-  metadata.gz: 6534adf54060798589ef949490e03d43ef58525b6cf6818a0b55c9f1c909bd29b6cd8db3909e0961efaf3357b6148ef868b75713c15bd1b85ab7729c7b2331c9
-  data.tar.gz: 53173b1621d5ced84e12eeffb80a03fb5d808dd92ed2f29585439506312e382600cfc25a53c799a692344513de27fe313c5bda1717b17304ef27068909627664
+  metadata.gz: 636a6a7fde3ba794afd5080133c38ec4f77533190659b901fc796daa6c0130f7b213c2e9572b1c149e6a6a55911423c5431606b7e119cbe5613b7f91543bface
+  data.tar.gz: c7361d2bc970e0d58b6e4a2f4fb32550720ceb3565759447305c36339015ad96cc19722e53f9a21130834f3a582b29614de5848d04c7ea1a950b83ed5b2693f8

data/definitions/features/candlepin_database.rb

@@ -28,15 +28,6 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     execute?(help_cmd)
   end
 
-  def env_content_ids_with_null_content
-    sql = <<-SQL
-      SELECT ec.id
-      FROM cp_env_content ec
-      LEFT JOIN cp_content c ON ec.contentid = c.id WHERE c.id IS NULL
-    SQL
-    query(sql).map { |r| r['id'] }
-  end
-
   private
 
   def load_configuration

data/definitions/features/installer.rb

@@ -8,7 +8,7 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def answers
-    load_answers(configuration)
+    YAML.load_file(answer_file)
   end
 
   def configuration
@@ -28,11 +28,13 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def config_files
-    Dir.glob(File.join(config_directory, '**/*')) +
-      [
-        '/opt/puppetlabs/puppet/cache/foreman_cache_data',
-        '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
-      ]
+    paths = [
+      config_directory,
+      '/opt/puppetlabs/puppet/cache/foreman_cache_data',
+      '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
+    ]
+    paths << answer_file unless answer_file.start_with?("#{config_directory}/")
+    paths
   end
 
   def last_scenario
@@ -80,8 +82,8 @@ class Features::Installer < ForemanMaintain::Feature
 
   private
 
-  def load_answers(config)
-    YAML.load_file(config[:answer_file])
+  def answer_file
+    configuration[:answer_file]
   end
 
   def last_scenario_config

data/definitions/features/pulpcore_database.rb

@@ -26,18 +26,21 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
 
   private
 
-  # rubocop:disable Metrics/AbcSize
   def load_configuration
-    full_config = File.read(PULPCORE_DB_CONFIG).split(/[\s,'":]/).reject(&:empty?)
+    python_command = <<~PYTHON.strip
+      from django.conf import settings; import json; print(json.dumps(settings.DATABASES["default"]))
+    PYTHON
+    manager_command = pulpcore_manager("shell --command '#{python_command}'")
+    manager_result = execute!(manager_command)
+    db_config = JSON.parse(manager_result)
 
     @configuration = {}
     @configuration['adapter'] = 'postgresql'
-    @configuration['host'] = full_config[full_config.index('HOST') + 1]
-    @configuration['port'] = full_config[full_config.index('PORT') + 1]
-    @configuration['database'] = full_config[full_config.index('NAME') + 1]
-    @configuration['username'] = full_config[full_config.index('USER') + 1]
-    @configuration['password'] = full_config[full_config.index('PASSWORD') + 1]
+    @configuration['host'] = db_config['HOST']
+    @configuration['port'] = db_config['PORT']
+    @configuration['database'] = db_config['NAME']
+    @configuration['username'] = db_config['USER']
+    @configuration['password'] = db_config['PASSWORD']
     @configuration
   end
-  # rubocop:enable Metrics/AbcSize
 end

data/definitions/features/satellite.rb

@@ -11,11 +11,11 @@ class Features::Satellite < ForemanMaintain::Feature
   end
 
   def target_version
-    '6.16'
+    satellite_maintain_target_version
   end
 
   def current_version
-    @current_version ||= package_version(package_name) || version_from_source
+    @current_version ||= package_version(package_name)
   end
 
   def package_name
@@ -25,10 +25,4 @@ class Features::Satellite < ForemanMaintain::Feature
   def module_name
     'satellite'
   end
-
-  private
-
-  def version_from_source
-    version(File.read('/usr/share/foreman/lib/satellite/version.rb')[/6\.\d\.\d/])
-  end
 end

data/definitions/scenarios/satellite_upgrade.rb

@@ -4,15 +4,14 @@ module Scenarios::Satellite
       metadata do
         tags :upgrade_scenario
         confine do
-          (feature(:instance).downstream&.current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.16')
+          feature(:instance).downstream&.satellite_upgrade_allowed?
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.16'
+      feature(:instance).downstream&.satellite_maintain_target_version
     end
   end
 

data/lib/foreman_maintain/concerns/base_database.rb

@@ -16,11 +16,12 @@ module ForemanMaintain
       end
 
       def deb_postgresql_versions
-        installed_pkgs = package_manager.list_installed_packages('${binary:Package}\n')
-        @deb_postgresql_versions ||= installed_pkgs.grep(/^postgresql-\d+$/).map do |name|
-          name.split('-').last
+        @deb_postgresql_versions ||= begin
+          installed_pkgs = package_manager.list_installed_packages('${binary:Package}\n')
+          installed_pkgs.grep(/^postgresql-\d+$/).map do |name|
+            name.split('-').last
+          end
         end
-        @deb_postgresql_versions
       end
 
       def postgresql_conf
@@ -41,49 +42,47 @@ module ForemanMaintain
         raise NotImplementedError
       end
 
-      def local?(config = configuration)
-        ['localhost', '127.0.0.1', `hostname`.strip].include?(config['host'])
+      def local?
+        ['localhost', '127.0.0.1', `hostname`.strip].include?(configuration['host'])
       end
 
-      def query(sql, config = configuration)
-        parse_csv(query_csv(sql, config))
+      def query(sql)
+        parse_csv(query_csv(sql))
       end
 
-      def query_csv(sql, config = configuration)
-        psql(%{COPY (#{sql}) TO STDOUT WITH CSV HEADER}, config)
+      def query_csv(sql)
+        psql(%{COPY (#{sql}) TO STDOUT WITH CSV HEADER})
       end
 
-      def psql(query, config = configuration)
-        if ping(config)
-          execute(psql_command(config),
-            :stdin => query,
-            :hidden_patterns => [config['password']])
-        else
-          raise_service_error
-        end
+      def psql(query)
+        ping!
+
+        execute('psql',
+          :stdin => query,
+          :env => base_env)
       end
 
-      def ping(config = configuration)
-        execute?(psql_command(config),
+      def ping
+        execute?('psql',
           :stdin => 'SELECT 1 as ping',
-          :hidden_patterns => [config['password']])
+          :env => base_env)
       end
 
-      def dump_db(file, config = configuration)
-        execute!(dump_command(config) + " > #{file}", :hidden_patterns => [config['password']])
+      def dump_db(file)
+        dump_command = "pg_dump -Fc -f #{file}"
+        execute!(dump_command, :env => base_env)
       end
 
-      def restore_dump(file, localdb, config = configuration)
+      def restore_dump(file, localdb)
         if localdb
           dump_cmd = "runuser - postgres -c 'pg_restore -C -d postgres #{file}'"
           execute!(dump_cmd)
         else
           # TODO: figure out how to completely ignore errors. Currently this
           # sometimes exits with 1 even though errors are ignored by pg_restore
-          dump_cmd = base_command(config, 'pg_restore') +
-                     ' --no-privileges --clean --disable-triggers -n public ' \
-                     "-d #{config['database']} #{file}"
-          execute!(dump_cmd, :hidden_patterns => [config['password']],
+          dump_cmd = 'pg_restore --no-privileges --clean --disable-triggers -n public ' \
+                     "-d #{configuration['database']} #{file}"
+          execute!(dump_cmd, :env => base_env,
             :valid_exit_statuses => [0, 1])
         end
       end
@@ -109,11 +108,11 @@ module ForemanMaintain
         @backup_dir ||= File.expand_path(ForemanMaintain.config.db_backup_dir)
       end
 
-      def dropdb(config = configuration)
+      def dropdb
         if local?
-          execute!("runuser - postgres -c 'dropdb #{config['database']}'")
+          execute!("runuser - postgres -c 'dropdb #{configuration['database']}'")
         else
-          delete_statement = psql(<<-SQL)
+          delete_statement = psql(<<~SQL)
             select string_agg('drop table if exists \"' || tablename || '\" cascade;', '')
             from pg_tables
             where schemaname = 'public';
@@ -122,15 +121,13 @@ module ForemanMaintain
         end
       end
 
-      def db_version(config = configuration)
-        if ping(config)
-          # Note - t removes headers, -A removes alignment whitespace
-          server_version_cmd = psql_command(config) + ' -c "SHOW server_version" -t -A'
-          version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
-          version(version_string)
-        else
-          raise_service_error
-        end
+      def db_version
+        ping!
+
+        query = 'SHOW server_version'
+        server_version_cmd = 'psql --tuples-only --no-align'
+        version_string = execute!(server_version_cmd, :stdin => query, :env => base_env)
+        version(version_string)
       end
 
       def psql_cmd_available?
@@ -145,22 +142,20 @@ module ForemanMaintain
 
       private
 
-      def base_command(config, command = 'psql')
-        "PGPASSWORD='#{config[%(password)]}' "\
-        "#{command} -h #{config['host'] || 'localhost'} "\
-        " -p #{config['port'] || '5432'} -U #{config['username']}"
+      def base_env
+        {
+          'PGHOST' => configuration.fetch('host', 'localhost'),
+          'PGPORT' => configuration['port']&.to_s,
+          'PGUSER' => configuration['username'],
+          'PGPASSWORD' => configuration['password'],
+          'PGDATABASE' => configuration['database'],
+        }
       end
 
-      def psql_command(config)
-        base_command(config, 'psql') + " -d #{config['database']}"
-      end
-
-      def dump_command(config)
-        base_command(config, 'pg_dump') + " -Fc #{config['database']}"
-      end
-
-      def raise_service_error
-        raise Error::Fail, 'Please check whether database service is up & running state.'
+      def ping!
+        unless ping
+          raise Error::Fail, 'Please check whether database service is up & running state.'
+        end
       end
     end
   end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -1,6 +1,8 @@
 module ForemanMaintain
   module Concerns
     module Downstream
+      SATELLITE_MAINTAIN_CONFIG = '/usr/share/satellite-maintain/config.yml'.freeze
+
       def current_version
         raise NotImplementedError
       end
@@ -46,8 +48,25 @@ module ForemanMaintain
         %w[satellite-maintain satellite-maintain]
       end
 
+      def satellite_maintain_target_version
+        satellite_maintain_config['current_satellite_version']
+      end
+
+      def satellite_upgrade_allowed?
+        current_minor_version == satellite_maintain_config['previous_satellite_version'] ||
+          ForemanMaintain.upgrade_in_progress == satellite_maintain_target_version
+      end
+
       private
 
+      def satellite_maintain_config
+        if File.exist?(SATELLITE_MAINTAIN_CONFIG)
+          YAML.load_file(SATELLITE_MAINTAIN_CONFIG)
+        else
+          raise "Could not load satellite-maintain configuration file #{SATELLITE_MAINTAIN_CONFIG}."
+        end
+      end
+
       def rh_repos(server_version)
         server_version = version(server_version)
         rh_repos = main_rh_repos
@@ -71,10 +90,6 @@ module ForemanMaintain
           "rhel-#{el_major_version}-for-x86_64-appstream-rpms",
         ]
       end
-
-      def version_from_source
-        raise NotImplementedError
-      end
     end
   end
 end

data/lib/foreman_maintain/utils/command_runner.rb

@@ -8,26 +8,27 @@ module ForemanMaintain
       attr_reader :logger, :command
 
       def initialize(logger, command, options)
-        options.validate_options!(:stdin, :hidden_patterns, :interactive, :valid_exit_statuses)
+        options.validate_options!(:stdin, :interactive, :valid_exit_statuses, :env)
         options[:valid_exit_statuses] ||= [0]
+        options[:env] ||= {}
         @logger = logger
         @command = command
         @stdin = options[:stdin]
-        @hidden_patterns = Array(options[:hidden_patterns]).compact
         @interactive = options[:interactive]
         @options = options
         @valid_exit_statuses = options[:valid_exit_statuses]
+        @env = options[:env]
         raise ArgumentError, 'Can not pass stdin for interactive command' if @interactive && @stdin
       end
 
       def run
-        logger&.debug(hide_strings("Running command #{@command} with stdin #{@stdin.inspect}"))
+        logger&.debug("Running command #{@command} with stdin #{@stdin.inspect}")
         if @interactive
           run_interactively
         else
           run_non_interactively
         end
-        logger&.debug("output of the command:\n #{hide_strings(output)}")
+        logger&.debug("output of the command:\n #{output}")
       end
 
       def interactive?
@@ -49,10 +50,10 @@ module ForemanMaintain
       end
 
       def execution_error
-        raise Error::ExecutionError.new(hide_strings(@command),
+        raise Error::ExecutionError.new(@command,
           exit_status,
-          hide_strings(@stdin),
-          @interactive ? nil : hide_strings(@output))
+          @stdin,
+          @interactive ? nil : @output)
       end
 
       private
@@ -81,7 +82,7 @@ module ForemanMaintain
       end
 
       def run_non_interactively
-        IO.popen(full_command, 'r+') do |f|
+        IO.popen(@env, full_command, 'r+') do |f|
           if @stdin
             f.puts(@stdin)
             f.close_write
@@ -94,13 +95,6 @@ module ForemanMaintain
       def full_command
         "#{@command} 2>&1"
       end
-
-      def hide_strings(string)
-        return unless string
-        @hidden_patterns.reduce(string) do |result, hidden_pattern|
-          result.gsub(hidden_pattern, '[FILTERED]')
-        end
-      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.6'.freeze
+  VERSION = '1.8.1'.freeze
 end

data/lib/foreman_maintain.rb

@@ -181,20 +181,22 @@ module ForemanMaintain
 
     def perform_self_upgrade
       package_name, command = pkg_and_cmd_name
+      packages_to_update = [package_name, main_package_name].uniq
+      packages_to_update_str = packages_to_update.join(', ')
 
-      puts "Checking for new version of #{package_name}..."
+      puts "Checking for new version of #{packages_to_update_str}..."
 
       enable_maintenance_module
       package_manager = ForemanMaintain.package_manager
 
-      if package_manager.update_available?(main_package_name)
-        puts "\nUpdating #{package_name} package."
-        package_manager.update(main_package_name, :assumeyes => true)
-        puts "\nThe #{package_name} package successfully updated."\
+      if package_manager.update_available?(packages_to_update)
+        puts "\nUpdating #{packages_to_update_str}."
+        package_manager.update(packages_to_update, :assumeyes => true)
+        puts "\nSuccessfully updated #{packages_to_update_str}."\
              "\nRe-run #{command} with required options!"
         exit 75
       end
-      puts "Nothing to update, can't find new version of #{package_name}."
+      puts "Nothing to update, can't find new version of #{packages_to_update_str}."
     end
 
     def enable_maintenance_module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.8.1
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -410,7 +410,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -429,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []