foreman_maintain 0.8.17 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f613ab2a7afc435fa01364dac9c15825723b336336676056d7f796b57a21e841
-  data.tar.gz: fd709a9384cb55f2ccf9a9a7e3be34bf239b24748f8fff49fd2921c08df4c228
+  metadata.gz: 455f573cec6321cd19ca9116d9f1482cd16f63406c460646fe20dc10ec84952d
+  data.tar.gz: ac42424b2f6aa0b6cf4133300c131333a46e7fa145bb814bb43884f8f9edbff7
 SHA512:
-  metadata.gz: 55958174a3e670b8ccfefeb09695a8fc84a323901c490f2dc0df88669c2f4d7e870f48a3d5c45f42f668f26fec8fe74d6478b29fcdb2a31f4bbd6b85137f8a41
-  data.tar.gz: 167635eec986782698efdaff762167d18e5a5f63d5f371ebe9600457ced03a6db849465d36c1c9e4fea377dcb47adfec1989e2ed67aaf71dba01d4dcce3a72b3
+  metadata.gz: f7675e2558fc4703674f70b001a67e2ec492cb1188e36a2a31d0f0cbd86d4ebb9272f5a35107be8e516de015c97663c39f3bd21407197cee896fa389cda26033
+  data.tar.gz: 7904e234c90ffef03834dd5fa695a96b7b315ccc69ae9bddeb00f4562babd15976886b6efcba7feac5380051c7fc0cec7f25558a46aedec19a9425434e4e757b

data/definitions/checks/check_for_newer_packages.rb

@@ -12,10 +12,7 @@ class Checks::CheckForNewerPackages < ForemanMaintain::Check
   end
 
   def run
-    exit_status, = ForemanMaintain.package_manager.check_update(packages: @packages,
-                                                                with_status: true)
-    assert(exit_status == 0, 'An update is available for one of these packages: '\
-                "#{@packages.join(',')}. Please update before proceeding.")
+    check_for_package_update
     if @manual_confirmation_version
       question = 'Confirm that you are running the latest minor release of Satellite '\
                 "#{@manual_confirmation_version}"
@@ -23,4 +20,45 @@ class Checks::CheckForNewerPackages < ForemanMaintain::Check
       abort! if answer != :yes
     end
   end
+
+  def check_for_package_update
+    exit_status, output = ForemanMaintain.package_manager.check_update(packages: @packages,
+                                                                       with_status: true)
+    packages_with_updates = []
+    if exit_status == 100
+      packages_with_updates = compare_pkg_versions(output).select do |_, result|
+        result == -1
+      end.keys
+    end
+
+    unless packages_with_updates.empty?
+      failure_message = 'An update is available for package(s): '\
+                        "#{packages_with_updates.join(',')}. Please update before proceeding!"
+      fail! failure_message
+    end
+  end
+
+  def packages_and_versions(output)
+    pkgs_versions = {}
+    pkg_details = output.split("\n\n")[1].split
+    @packages.each do |pkg|
+      pkg_details.each_with_index do |ele, index|
+        next unless ele.start_with?(pkg)
+        pkgs_versions[pkg] = version(pkg_details[index + 1].split('-').first)
+        break
+      end
+    end
+    pkgs_versions
+  end
+
+  def compare_pkg_versions(output)
+    compare_pkg_versions = {}
+    packages_and_versions = packages_and_versions(output)
+    pkg_versions610 = { 'python3-pulp-2to3-migration' => version('0.12'),
+                        'tfm-rubygem-katello' => version('4.1') }
+    packages_and_versions.each do |name, version|
+      compare_pkg_versions[name] = version.<=>(pkg_versions610[name])
+    end
+    compare_pkg_versions
+  end
 end

data/definitions/procedures/pulp/remove.rb

@@ -21,7 +21,8 @@ module Procedures::Pulp
         '/var/lib/pulp/content',
         '/var/lib/pulp/importers',
         '/var/lib/pulp/uploads',
-        '/var/lib/mongodb/'
+        '/var/lib/mongodb/',
+        '/var/cache/pulp'
       ]
     end
 

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -147,7 +147,7 @@ module ForemanMaintain
       end
 
       def format_shell_args(options = {})
-        options.map { |shell_optn, val| " #{shell_optn} '#{shellescape(val)}'" }.join
+        options.map { |shell_optn, val| " #{shell_optn} #{shellescape(val)}" }.join
       end
 
       def find_symlinks(dir_path)

data/lib/foreman_maintain/utils/backup.rb

@@ -77,11 +77,15 @@ module ForemanMaintain
       end
 
       def valid_fpc_backup?
-        fpc_online_backup? || fpc_standard_backup? || fpc_logical_backup?
+        fpc_online_backup? || fpc_standard_backup? || fpc_logical_backup? || \
+          # fpc can have setup where mongo or pulpcore db is external but not both
+          fpc_hybrid_db_backup?
       end
 
       def valid_katello_backup?
-        katello_online_backup? || katello_standard_backup? || katello_logical_backup?
+        katello_online_backup? || katello_standard_backup? || katello_logical_backup? || \
+          # Katello can have setup where some of dbs are external but not all
+          katello_hybrid_db_backup?
       end
 
       def valid_foreman_backup?
@@ -104,7 +108,6 @@ module ForemanMaintain
         true
       end
 
-      # TODO: Need to check for pulpcore feature?
       def katello_standard_backup?
         present = [:pgsql_data]
         absent = [:candlepin_dump, :foreman_dump, :pulpcore_dump, :mongo_dump]
@@ -155,6 +158,14 @@ module ForemanMaintain
                              :absent => absent)
       end
 
+      def katello_hybrid_db_backup?
+        all_dbs = { :pgsql_data => %w[candlepin foreman], :mongo_data => [] }
+        all_dbs[:pgsql_data] << 'pulpcore' if feature(:pulpcore_database)
+        all_dbs[:mongo_data] << 'mongo' if feature(:mongo)
+        present, absent = dumps_for_hybrid_db_setup(all_dbs)
+        check_file_existence(:present => present, :absent => absent)
+      end
+
       def fpc_standard_backup?
         present = []
         absent = [:candlepin_dump, :foreman_dump, :pulpcore_dump, :mongo_dump]
@@ -207,6 +218,15 @@ module ForemanMaintain
         check_file_existence(:present => present, :absent => absent)
       end
 
+      def fpc_hybrid_db_backup?
+        all_dbs = { :pgsql_data => [], :mongo_data => [] }
+        all_dbs[:pgsql_data] << 'pulpcore' if feature(:pulpcore_database)
+        all_dbs[:mongo_data] << 'mongo' if feature(:mongo)
+        present, absent = dumps_for_hybrid_db_setup(all_dbs)
+        absent.concat [:candlepin_dump, :foreman_dump]
+        check_file_existence(:present => present, :absent => absent)
+      end
+
       def foreman_standard_backup?
         check_file_existence(:present => [:pgsql_data],
                              :absent => [:candlepin_dump, :foreman_dump, :pulpcore_dump,
@@ -224,6 +244,27 @@ module ForemanMaintain
                              :absent => [:candlepin_dump, :mongo_data, :mongo_dump, :pulpcore_dump])
       end
 
+      # rubocop:disable Metrics/MethodLength
+      def dumps_for_hybrid_db_setup(dbs_hash)
+        present = []
+        absent = []
+        dbs_hash.each do |data_file, dbs|
+          dbs.each do |db|
+            feature_label = db == 'mongo' ? db : "#{db}_database"
+            dump_file = "#{db}_dump"
+            if feature(feature_label.to_sym).local?
+              present |= [data_file]
+              absent << dump_file.to_sym
+            else
+              present << dump_file.to_sym
+            end
+          end
+          absent |= [data_file] unless present.include?(data_file)
+        end
+        [present, absent]
+      end
+      # rubocop:enable Metrics/MethodLength
+
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
         config_tarball = file_map[:config_files][:path]

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.17'.freeze
+  VERSION = '0.8.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp