foreman_maintain 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e00cf48a6dfb5684ac74e789ba933225d4c380a2b83d3e8df8cd607d537c8c
-  data.tar.gz: c639bf3716c44df18b63125880f6521558ee754992e21eac73021e14e3ebfd5c
+  metadata.gz: 7bdeafd7ba1aab60a20589ff8cf9e35ef9baf40405df6151a1cf9ef63436b4a3
+  data.tar.gz: ea9b5aa95b3ac88fbc796d5a6882a5df6a746a79fcb8eb08e8f3f4a788fe9104
 SHA512:
-  metadata.gz: 1899bd4d44b5ab634dfdd516c9db1e0cf4c45ced30b3de818bcbaa0b45bdedafe690a6e42eff5643e2b2e986c8289c792db34f3609161e33c9c773c27414cb93
-  data.tar.gz: 68ee21c7b7e59cbc9a8d944fdebba54e82b72a5b67c4fbf5284f36caab4926f1223d0c5168d6303e624f4ed49b87c5167bbec6c222dc8d874a8b8fdb4d5af9ef
+  metadata.gz: 558b7b493fb0da9f6ec6d3290167db5df2e58844462a3c590d3e482e2646b4ae950b5858918e2ec0e6e89d424de92dae33c475d551243b5b39e29bc88cb694b9
+  data.tar.gz: 2e43180a586c591d161a56fd17f1d30fe16d3d46a26773e5c518d552a436d13f09cd28a4a1ffbbf0b6768193e7ed3d562f3fa83e8e8359e7eba0b3d1fd2e7220

data/definitions/features/sync_plans.rb

@@ -34,10 +34,10 @@ class Features::SyncPlans < ForemanMaintain::Feature
   end
 
   def validate_sync_plan_ids(ids)
+    return [] if ids.empty?
+
     ids_condition = ids.map { |id| "'#{id}'" }.join(',')
-    query = <<-SQL
-      SELECT id FROM katello_sync_plans WHERE id IN (#{ids_condition})
-    SQL
+    query = "SELECT id FROM katello_sync_plans WHERE id IN (#{ids_condition})"
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 

data/definitions/scenarios/self_upgrade.rb

@@ -58,7 +58,9 @@ module ForemanMaintain::Scenarios
       manual_detection
     end
 
-    def compose
+    def compose(pkgs_to_update)
+      ForemanMaintain.enable_maintenance_module
+
       if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
         pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
         yum_options = req_repos_to_update_pkgs.map do |id|

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/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.11'.freeze
+  VERSION = '1.1.13'.freeze
 end

data/lib/foreman_maintain.rb

@@ -175,6 +175,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)
@@ -185,6 +188,19 @@ 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'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp