foreman_maintain 1.7.11 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4943a31799b110a35f93236554fbeb25969a145f316bd97445b6c8a88d4bd3cc
-  data.tar.gz: 4b8aeb1d31fdc7b79b90ee2407fb8fcd8c5e509150d017f78e7eed776884aea2
+  metadata.gz: 8e99ddc1408ae68f584bbfc6e8798367e623e38f981682666f40cac91bb8f5f4
+  data.tar.gz: 173ee0cd4fbce206437d53937eaf0489111e4c6b57eac8b04943c9468eb5ab40
 SHA512:
-  metadata.gz: c92f1b9cb4b1a72efcfe395a0500b28687a2ffd554f9249131ea2ffde0dbb67e1897052c01b2ae042fe4c958978d1e95100fe96a8a676a2043563e866b1e5ea7
-  data.tar.gz: 4a4ae91c74d948e5cac7a663c59d2740b8b3e6d72786cca4632991b6cb9f2b71b2dddf2fe933d2b9a41aba3715b1f04c8db4a356c78c95f3932e7e1a2a38b198
+  metadata.gz: 60a28996480d8564f5900a56d3f1494f9eb756d0a54c1bf3fee4c37fb5096a848db3a4ed2a6700e65d2fd4193bda13bebb4a50368ca0dbfd2ca1dccf9ea76d8e
+  data.tar.gz: c323322a2e40d116c34de3ed7430742caa127250024957aa4b2579b14bbc27fb271312a6d973d82533ef091ca77ead05de0cf61c005475da8e3766e910e35562

data/README.md

@@ -20,6 +20,7 @@ Subcommands:
       check --target-version TARGET_VERSION   Run pre-upgrade checks for upgrading to specified version
             --disable-self-upgrade            Disable automatic self upgrade (default: false)
       run --target-version TARGET_VERSION     Run the full upgrade
+          [--phase=phase TARGET_VERSION]      Run just a specific phase of the upgrade
           --disable-self-upgrade              Disable automatic self upgrade (default: false)
 
     advanced                      Advanced tools for server maintenance

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

@@ -25,14 +25,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def running_tasks
-    tasks = cli('task list --state-in running --state-in canceling')
-    # cli() uses parse_json() which swallows JSON::ParserError and returns nil
-    # but running_tasks should return an Array
-    if tasks.nil?
-      []
-    else
-      tasks
-    end
+    cli('task list --state-in running --state-in canceling')
   rescue ForemanMaintain::Error::ExecutionError
     []
   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/procedures/pulpcore/container_handle_image_metadata.rb

@@ -14,7 +14,8 @@ module Procedures::Pulpcore
 
         feature(:service).handle_services(spinner, 'start', :only => necessary_services)
 
-        spinner.update('Adding image metadata to pulp.')
+        spinner.update('Adding image metadata to pulp. You can continue using the ' \
+               'system normally while the task runs in the background.')
         execute!(pulpcore_manager('container-handle-image-data'))
       end
     end

data/definitions/procedures/repositories/index_katello_repositories_container_metadata.rb

@@ -8,7 +8,8 @@ module Procedures::Repositories
     end
 
     def run
-      with_spinner('Adding image metadata to Katello.') do
+      with_spinner(('Adding image metadata. You can continue using the ' \
+                    'system normally while the task runs in the background.')) do
         execute!('foreman-rake katello:import_container_manifest_labels')
       end
     end

data/definitions/scenarios/foreman_upgrade.rb

@@ -53,7 +53,6 @@ module Scenarios::Foreman
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,
         Checks::CheckOrganizationContentAccessMode,
-        Checks::CheckSha1CertificateAuthority,
         Checks::Repositories::Validate
       )
     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
 
@@ -55,7 +54,6 @@ module Scenarios::Satellite
         Checks::CheckIpv6Disable,
         Checks::Disk::AvailableSpacePostgresql13,
         Checks::CheckOrganizationContentAccessMode,
-        Checks::CheckSha1CertificateAuthority,
         Checks::Repositories::Validate.new(:version => target_version),
       )
     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/upgrade_runner.rb

@@ -137,6 +137,7 @@ module ForemanMaintain
         @reporter.before_scenario_starts(scenario)
         @reporter.puts <<~MESSAGE
           Skipping #{skipped_phase} phase as it was already run before.
+          To enforce to run the phase, use `upgrade run --phase #{skipped_phase}`
         MESSAGE
         @reporter.after_scenario_finishes(scenario)
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.11'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.8.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -162,7 +162,6 @@ files:
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_ipv6_disable.rb
-- definitions/checks/check_sha1_certificate_authority.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb

data/definitions/checks/check_sha1_certificate_authority.rb

@@ -1,48 +0,0 @@
-class Checks::CheckSha1CertificateAuthority < ForemanMaintain::Check
-  metadata do
-    label :check_sha1_certificate_authority
-    description 'Check if server certificate authority is sha1 signed'
-
-    confine do
-      feature(:katello) || feature(:foreman_proxy)
-    end
-
-    do_not_whitelist
-  end
-
-  def run
-    installer_answers = feature(:installer).answers
-    server_ca = installer_answers['certs']['server_ca_cert']
-
-    return unless server_ca
-
-    begin
-      certificates = load_fullchain(server_ca)
-    rescue OpenSSL::X509::CertificateError
-      assert(false, "Error reading server CA certificate #{server_ca}.")
-    else
-      msg = <<~MSG
-        Server CA certificate #{server_ca} signed with sha1 which will break on upgrade.
-        Update the server CA certificate with one signed with sha256 or
-        stronger then proceed with the upgrade.
-      MSG
-
-      assert(
-        certificates.all? { |cert| cert.signature_algorithm != 'sha1WithRSAEncryption' },
-        msg
-      )
-    end
-  end
-
-  def load_fullchain(bundle_pem)
-    if OpenSSL::X509::Certificate.respond_to?(:load_file)
-      OpenSSL::X509::Certificate.load_file(bundle_pem)
-    else
-      # Can be removed when only Ruby with load_file support is supported
-      File.binread(bundle_pem).
-        lines.
-        slice_after(/END CERTIFICATE/).
-        map { |pem| OpenSSL::X509::Certificate.new(pem.join) }
-    end
-  end
-end