foreman_maintain 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193b1e7cefdc871725692b84d03636fab11dcf6a0de8928c7c8ff05179b8ddd8
-  data.tar.gz: afdf239a676685fa3b793e78389d989029f6dd29ec806bb1cef4ee72a91c37fe
+  metadata.gz: e83e212f9fbf31738c939454ad7978b9d29beb66b66cbfb5d905e2a15aebe1af
+  data.tar.gz: b09528f68095f1139ab66e1dbdb7587e79b1c7d5e135626f94e60f7abb17e393
 SHA512:
-  metadata.gz: d2305610529e5ff51dc325daaaeee9da689259a0c1aeec88d155c8315d83da7551d0c00b8c5098439986602b039ae85bae3346dc679db184dc08bd856610b3d4
-  data.tar.gz: f0fdf10df80d8a26552c1f74aed56d944b1324ef06fe8960c92aa9d8411cae211f24ff596d60c8a1fff2bae450901c40e9b478889fe118432323fb748ee07d6c
+  metadata.gz: 69809841cb9ede602ae08a7c3c57b777be895aa80795ecc6293961f5411ae3fd5872b7f1eb5f0ad8c06e33a0ee594897e1d08413866ecfbf34daf941db07a742
+  data.tar.gz: 00cd8080285c9e9a2809de32bb500585c641fdd740dd23895ee02f8767540be97cf36d1c34790a25bbfbc20071b782124a30ea185dd16dd62d8f83b8d6e3208b

data/definitions/features/sync_plans.rb

@@ -3,33 +3,11 @@ class Features::SyncPlans < ForemanMaintain::Feature
     label :sync_plans
   end
 
-  def required_new_implementation
-    @required_new_implementation ||=
-      feature(:foreman_database).query(
-        <<-SQL
-          SELECT COUNT(1) FROM information_schema.table_constraints
-          WHERE constraint_name='katello_sync_plan_foreman_tasks_recurring_logic_fk' AND table_name='katello_sync_plans'
-        SQL
-      ).first['count'].to_i > 0
-  end
-
-  def sync_plan_ids_by_status(enabled = true, filter_ids = nil)
-    if filter_ids
-      return [] if filter_ids.empty?
-
-      ids_condition = filter_ids.map { |id| "'#{id}'" }.join(',')
-    end
-
-    if required_new_implementation
-      query = <<-SQL
-        select sp.id as id from katello_sync_plans sp inner join foreman_tasks_recurring_logics rl on sp.foreman_tasks_recurring_logic_id = rl.id
-        where rl.state='#{enabled ? 'active' : 'disabled'}' #{ids_condition ? " AND sp.id IN (#{ids_condition})" : ''}
-      SQL
-    else
-      query = <<-SQL
-        SELECT id FROM katello_sync_plans WHERE enabled ='#{enabled ? 't' : 'f'}' #{ids_condition ? " AND id IN (#{ids_condition})" : ''}
-      SQL
-    end
+  def sync_plan_ids_by_status(enabled = true)
+    query = <<-SQL
+      select sp.id as id from katello_sync_plans sp inner join foreman_tasks_recurring_logics rl on sp.foreman_tasks_recurring_logic_id = rl.id
+      where rl.state='#{enabled ? 'active' : 'disabled'}'
+    SQL
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
@@ -41,14 +19,17 @@ class Features::SyncPlans < ForemanMaintain::Feature
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
-  def make_disable(ids)
-    update_records(ids, false)
+  def make_disable
+    cleanup_enabled_in_storage
+    update_records(sync_plan_ids_by_status(true), false)
+    @data[:disabled]
   end
 
   def make_enable
     # remove ids of sync plans which no longer exist in DB
     @data[:disabled] = validate_sync_plan_ids(@data[:disabled])
     update_records(@data[:disabled], true)
+    @data[:enabled]
   end
 
   def load_from_storage(storage)
@@ -80,11 +61,8 @@ class Features::SyncPlans < ForemanMaintain::Feature
   private
 
   def update_records(ids, enabled)
-    ids_not_required_update = sync_plan_ids_by_status(enabled, ids)
-    ids_required_update = ids - ids_not_required_update
-    make_data_key_empty(enabled) if !ids_not_required_update.empty? && ids_required_update.empty?
     updated_record_ids = []
-    ids_required_update.each do |sp_id|
+    ids.each do |sp_id|
       result = feature(:hammer).run("sync-plan update --id #{sp_id} --enabled #{enabled}")
       if result.include?('Sync plan updated')
         updated_record_ids << sp_id
@@ -92,29 +70,29 @@ class Features::SyncPlans < ForemanMaintain::Feature
         raise result
       end
     end
-    updated_record_ids
   ensure
     update_data(enabled, updated_record_ids)
   end
 
   def data
     raise 'Use load_from_storage before accessing the data' unless defined? @data
-
     @data
   end
 
-  def make_data_key_empty(enabled)
-    key_name = enabled ? 'disabled' : 'enabled'
-    @data[:"#{key_name}"] = []
+  def cleanup_enabled_in_storage
+    @data[:enabled] = []
   end
 
   def update_data(enabled, new_ids)
+    # init data
+    @data[:disabled] = [] unless @data[:disabled]
+    @data[:enabled] = [] unless @data[:enabled]
+
     if enabled
       @data[:disabled] -= new_ids
-      @data[:enabled] = new_ids
+      @data[:enabled].concat(new_ids).uniq!
     else
-      @data[:disabled] = [] unless @data[:disabled]
-      @data[:enabled] = [] if @data[:disabled].empty?
+      @data[:enabled] -= new_ids
       @data[:disabled].concat(new_ids).uniq!
     end
   end

data/definitions/procedures/foreman_maintain_features.rb

@@ -0,0 +1,10 @@
+class Procedures::ForemanMaintainFeatures < ForemanMaintain::Procedure
+  metadata do
+    description 'List detected Foreman Maintain features'
+  end
+
+  def run
+    features = ForemanMaintain.available_features
+    output << features.map(&:inspect).join("\n")
+  end
+end

data/definitions/procedures/sync_plans/disable.rb

@@ -21,9 +21,8 @@ module Procedures::SyncPlans
       default_storage = ForemanMaintain.storage(:default)
       feature(:sync_plans).load_from_storage(default_storage)
       with_spinner('disabling sync plans') do |spinner|
-        ids = feature(:sync_plans).sync_plan_ids_by_status(true)
-        feature(:sync_plans).make_disable(ids)
-        spinner.update "Total #{ids.length} sync plans are now disabled."
+        record_ids = feature(:sync_plans).make_disable
+        spinner.update "Total #{record_ids.length} sync plans are now disabled."
       end
     ensure
       feature(:sync_plans).save_to_storage(default_storage)

data/definitions/scenarios/backup.rb

@@ -58,7 +58,6 @@ module ForemanMaintain::Scenarios
                   Procedures::Backup::CompressData => :backup_dir,
                   Procedures::Backup::Pulp => :backup_dir,
                   Procedures::Backup::Online::Mongo => :backup_dir,
-                  Procedures::Backup::Online::PgGlobalObjects => :backup_dir,
                   Procedures::Backup::Online::CandlepinDB => :backup_dir,
                   Procedures::Backup::Online::ForemanDB => :backup_dir,
                   Procedures::Backup::Online::PulpcoreDB => :backup_dir,
@@ -160,9 +159,6 @@ module ForemanMaintain::Scenarios
     end
 
     def include_dumps
-      if feature(:instance).postgresql_local?
-        add_step_with_context(Procedures::Backup::Online::PgGlobalObjects)
-      end
       if feature(:instance).database_local?(:candlepin_database)
         add_step_with_context(Procedures::Backup::Online::CandlepinDB)
       end
@@ -217,7 +213,6 @@ module ForemanMaintain::Scenarios
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
       add_steps_with_context(
         Procedures::Backup::Online::Mongo,
-        Procedures::Backup::Online::PgGlobalObjects,
         Procedures::Backup::Online::CandlepinDB,
         Procedures::Backup::Online::ForemanDB,
         Procedures::Backup::Online::PulpcoreDB

data/definitions/scenarios/restore.rb

@@ -73,9 +73,6 @@ module ForemanMaintain::Scenarios
     end
 
     def restore_sql_dumps(backup)
-      if backup.file_map[:pg_globals][:present]
-        add_steps_with_context(Procedures::Restore::PgGlobalObjects)
-      end
       if backup.file_map[:candlepin_dump][:present]
         add_steps_with_context(Procedures::Restore::CandlepinDump)
       end
@@ -108,7 +105,6 @@ module ForemanMaintain::Scenarios
                   Checks::Restore::ValidateInterfaces => :backup_dir,
                   Procedures::Restore::Configs => :backup_dir,
                   Procedures::Restore::DropDatabases => :backup_dir,
-                  Procedures::Restore::PgGlobalObjects => :backup_dir,
                   Procedures::Restore::CandlepinDump => :backup_dir,
                   Procedures::Restore::ForemanDump => :backup_dir,
                   Procedures::Restore::PulpcoreDump => :backup_dir,

data/definitions/scenarios/self_upgrade.rb

@@ -69,6 +69,8 @@ module ForemanMaintain::Scenarios
     end
 
     def downstream_self_upgrade(pkgs_to_update)
+      ForemanMaintain.enable_maintenance_module
+
       if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
         yum_options = req_repos_to_update_pkgs.map do |id|
           "--enablerepo=#{id}"
@@ -106,7 +108,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      pkgs_to_update = %w[rubygem-foreman_maintain]
+      pkgs_to_update = [ForemanMaintain.main_package_name]
       if feature(:instance).downstream
         pkgs_to_update << 'satellite-maintain'
         downstream_self_upgrade(pkgs_to_update)

data/lib/foreman_maintain/concerns/base_database.rb

@@ -108,11 +108,6 @@ module ForemanMaintain
         end
       end
 
-      def restore_pg_globals(pg_globals, config = configuration)
-        execute!(base_command(config, 'psql') + " -f #{pg_globals} postgres 2>/dev/null",
-                 :hidden_patterns => [config['password']])
-      end
-
       def backup_local(backup_file, extra_tar_options = {})
         dir = extra_tar_options.fetch(:data_dir, data_dir)
         command = extra_tar_options.fetch(:command, 'create')
@@ -139,10 +134,6 @@ module ForemanMaintain
         @backup_dir ||= File.expand_path(ForemanMaintain.config.db_backup_dir)
       end
 
-      def backup_global_objects(file)
-        execute!("runuser - postgres -c 'pg_dumpall -g > #{file}'")
-      end
-
       def perform_backup(config = configuration)
         file_path = backup_file_path(config)
         backup_cmd = backup_db_command(file_path, config)

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -30,7 +30,7 @@ module ForemanMaintain
       end
 
       def systemd_installed?
-        File.exist?('/usr/bin/systemctl')
+        File.exist?('/run/systemd/system/')
       end
 
       def check_min_version(name, minimal_version)

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -9,6 +9,24 @@ module ForemanMaintain::PackageManager
       true
     end
 
+    def module_enabled?(name)
+      _status, result = info(name)
+      result.match?(/Stream.+\[e\].+/)
+    end
+
+    def enable_module(name)
+      dnf_action('module enable', name, assumeyes: true)
+    end
+
+    def module_exists?(name)
+      status, _result = info(name)
+      status == 0
+    end
+
+    def info(name)
+      dnf_action('module info', name, with_status: true, assumeyes: true)
+    end
+
     private
 
     def dnf_action(action, packages, with_status: false, assumeyes: false)

data/lib/foreman_maintain/utils/backup.rb

@@ -42,7 +42,6 @@ module ForemanMaintain
           :candlepin_dump => map_file(@backup_dir, 'candlepin.dump'),
           :mongo_dump => map_file(@backup_dir, 'mongo_dump'),
           :config_files => map_file(@backup_dir, 'config_files.tar.gz'),
-          :pg_globals => map_file(@backup_dir, 'pg_globals.dump'),
           :metadata => map_file(@backup_dir, 'metadata.yml'),
           :pulpcore_dump => map_file(@backup_dir, 'pulpcore.dump')
         }

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.2.8'.freeze
 end

data/lib/foreman_maintain.rb

@@ -178,6 +178,9 @@ module ForemanMaintain
       package_name, command = pkg_and_cmd_name
 
       puts "Checking for new version of #{package_name}..."
+
+      enable_maintenance_module
+
       if ForemanMaintain.package_manager.update_available?(main_package_name)
         puts "\nUpdating #{package_name} package."
         ForemanMaintain.package_manager.update(main_package_name, :assumeyes => true)
@@ -188,8 +191,21 @@ module ForemanMaintain
       puts "Nothing to update, can't find new version of #{package_name}."
     end
 
+    def enable_maintenance_module
+      return unless el? && !el7?
+
+      maintenance_module = 'satellite-maintenance:el8'
+      package_manager = ForemanMaintain.package_manager
+
+      if package_manager.module_exists?(maintenance_module) &&
+         !package_manager.module_enabled?(maintenance_module)
+        puts "\nEnabling #{maintenance_module} module"
+        package_manager.enable_module(maintenance_module)
+      end
+    end
+
     def main_package_name
-      'rubygem-foreman_maintain'
+      el? ? 'rubygem-foreman_maintain' : 'ruby-foreman-maintain'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -241,7 +241,6 @@ files:
 - definitions/procedures/backup/online/candlepin_db.rb
 - definitions/procedures/backup/online/foreman_db.rb
 - definitions/procedures/backup/online/mongo.rb
-- definitions/procedures/backup/online/pg_global_objects.rb
 - definitions/procedures/backup/online/pulpcore_db.rb
 - definitions/procedures/backup/online/safety_confirmation.rb
 - definitions/procedures/backup/prepare_directory.rb
@@ -270,6 +269,7 @@ files:
 - definitions/procedures/foreman/remove_duplicate_obsolete_roles.rb
 - definitions/procedures/foreman/remove_duplicate_permissions.rb
 - definitions/procedures/foreman_docker/remove_foreman_docker.rb
+- definitions/procedures/foreman_maintain_features.rb
 - definitions/procedures/foreman_openscap/invalid_report_associations.rb
 - definitions/procedures/foreman_proxy/features.rb
 - definitions/procedures/foreman_tasks/delete.rb
@@ -321,7 +321,6 @@ files:
 - definitions/procedures/restore/foreman_dump.rb
 - definitions/procedures/restore/installer_reset.rb
 - definitions/procedures/restore/mongo_dump.rb
-- definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/regenerate_queues.rb

data/definitions/procedures/backup/online/pg_global_objects.rb

@@ -1,29 +0,0 @@
-module Procedures::Backup
-  module Online
-    class PgGlobalObjects < ForemanMaintain::Procedure
-      include ForemanMaintain::Concerns::SystemHelpers
-
-      metadata do
-        description 'Backup Postgres global objects online'
-        tags :backup
-        param :backup_dir, 'Directory where to backup to', :required => true
-        confine do
-          feature(:foreman_database) || feature(:candlepin_database)
-        end
-      end
-
-      def run
-        if feature(:instance).postgresql_local?
-          local_db = if feature(:instance).database_local?(:foreman_database)
-                       :foreman_database
-                     else
-                       :candlepin_database
-                     end
-          feature(local_db).backup_global_objects(File.join(@backup_dir, 'pg_globals.dump'))
-        else
-          skip 'Backup of global objects is not supported for remote databases.'
-        end
-      end
-    end
-  end
-end

data/definitions/procedures/restore/pg_global_objects.rb

@@ -1,36 +0,0 @@
-module Procedures::Restore
-  class PgGlobalObjects < ForemanMaintain::Procedure
-    include ForemanMaintain::Concerns::SystemHelpers
-
-    metadata do
-      description 'Restore any existing postgresql global objects from backup'
-
-      param :backup_dir,
-            'Path to backup directory',
-            :required => true
-
-      confine do
-        feature(:foreman_database) || feature(:candlepin_database)
-      end
-    end
-
-    def run
-      backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
-      restore_global_objects(backup.file_map[:pg_globals][:path])
-    end
-
-    def restore_global_objects(pg_global_file)
-      if feature(:instance).postgresql_local?
-        with_spinner('') do |spinner|
-          feature(:service).handle_services(spinner, 'start', :only => ['postgresql'])
-
-          spinner.update('Restoring postgresql global objects')
-          local_db = feature(:foreman_database).local? ? :foreman_database : :candlepin_database
-          feature(local_db).restore_pg_globals(pg_global_file)
-        end
-      else
-        skip 'Restore of global objects is not supported for remote databases.'
-      end
-    end
-  end
-end