foreman_maintain 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffec6895a006066de751609395b0f865e1dee34b90d01111d2792af59a6b893
-  data.tar.gz: 9388cc01c5be3b68685e7947676119c5fd648a02c0e73bdafb8f8752f7390c45
+  metadata.gz: dc4310d22dcb14b51945e3642cba4c7050e6660893dc09639064b013a2881380
+  data.tar.gz: d305fc1da3bd0a013d4455ec1ae578f22529fe5302261f82be251be5a0ee9a84
 SHA512:
-  metadata.gz: dcdee36a3f44d9809a65b7105f073ed79c10e60d16d34eb4300c1e4ebb4b32255d297b8d9c3eeca346d6865dd88f0c4a5dd66b297dbcea81f8b6d6c0a42ea039
-  data.tar.gz: 90be6369c664ca1fc46b81040a43599b02ba7c2fd26aed1ce628680d750147a3d982593d7cb8694fa3ea6935440ed8eec5bbcd1d78ce98dd79f5a8e8b7b347ac
+  metadata.gz: d10f290659e20460fffcebf72291e7260a6caf3c8d0964bdb3bd40d9f86ec9b8a5f70781c2f9de2d01778f09bdcda1421defb679a7f541d7ff4b21406368ca3c
+  data.tar.gz: c63898eece400b9d3813e06e070a3188c27ad5a06aaf57652c68e6f0887bf5b9173b6dd6eb9192acf37dff6b8d2b4c89285f65cf427de72a7a1aa69cc4b9f703

data/definitions/checks/sca_only.rb

@@ -0,0 +1,56 @@
+class Checks::CheckOrganizationContentAccessMode < ForemanMaintain::Check
+  metadata do
+    label :check_organization_content_access_mode
+    description 'Check if any organizations are using entitlement mode'
+
+    confine do
+      feature(:katello)
+    end
+  end
+
+  def run
+    doc_link = "https://access.redhat.com/articles/simple-content-access"
+
+    with_spinner('Checking organization content access modes') do
+      output = execute_org_check
+      orgs_to_migrate = parse_orgs_to_migrate(output)
+
+      assert(
+        orgs_to_migrate.empty?,
+        "\nThe following organizations are using entitlement mode:\n"\
+        "#{format_orgs_to_migrate(orgs_to_migrate)}\n\n"\
+        "As of Satellite 6.16, entitlement mode is removed, and these organizations"\
+        " will be automatically migrated to Simple Content Access during the upgrade."\
+        " Please ensure that you have reviewed the documentation and are prepared for this change."\
+        " Documentation for SCA mode is available at #{doc_link}"
+      )
+    end
+  end
+
+  private
+
+  # rubocop:disable Lint/InterpolationCheck
+  def execute_org_check
+    execute!(
+      'echo "Organization.all.each ' \
+      '{ |org| puts \"NONSCA: #{org.name}\" unless org.simple_content_access? }" ' \
+      '| foreman-rake console'
+    )
+  end
+  # rubocop:enable Lint/InterpolationCheck
+
+  def parse_orgs_to_migrate(output)
+    orgs = []
+    output.each_line do |line|
+      match = line.match(/NONSCA: (.+)/)
+      if match && !match[1].strip.start_with?('#{org.name}') # rubocop:disable Lint/InterpolationCheck
+        orgs << match[1].strip
+      end
+    end
+    orgs
+  end
+
+  def format_orgs_to_migrate(orgs_to_migrate)
+    orgs_to_migrate.join("\n")
+  end
+end

data/definitions/procedures/packages/update_all_confirmation.rb

@@ -13,10 +13,9 @@ module Procedures::Packages
           "It is recommended to update everything only as part of upgrade\n" \
           "of the #{feature(:instance).product_name} to the next version. \n" \
           "To Upgrade to next version use 'foreman-maintain upgrade'.\n\n" \
-          "NOTE: --assumeyes is not applicable for this check\n\n" \
           "Do you want to proceed with update of everything regardless\n" \
           'of the recommendations?'
-        answer = ask_decision(question, actions_msg: 'y(yes), q(quit)', ignore_assumeyes: true)
+        answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
         abort! unless answer == :yes
       end
     end

data/definitions/scenarios/packages.rb

@@ -97,25 +97,47 @@ module ForemanMaintain::Scenarios
         description 'update packages in unlocked session'
         param :packages, 'List of packages to Update', :array => true
         param :assumeyes, 'Do not ask for confirmation'
+        param :downloadonly, 'Download and cache packages'
         manual_detection
       end
 
+      # rubocop:disable  Metrics/MethodLength
       def compose
         if Packages.skip_installer_run?(context.get(:packages))
           add_step_with_context(Procedures::Packages::Update,
             :force => true, :warn_on_errors => true)
         else
-          add_steps_with_context(
-            Procedures::Packages::UpdateAllConfirmation,
-            Procedures::Packages::InstallerConfirmation
-          )
+          unless context.get(:downloadonly)
+            add_steps_with_context(
+              Procedures::Packages::UpdateAllConfirmation,
+              Procedures::Packages::InstallerConfirmation
+            )
+          end
+
           add_step_with_context(Procedures::Packages::UnlockVersions)
-          add_step_with_context(Procedures::Packages::Update,
-            :force => true, :warn_on_errors => true)
-          add_step_with_context(Procedures::Installer::Run)
+
+          if context.get(:downloadonly)
+            add_step_with_context(
+              Procedures::Packages::Update,
+              :force => true,
+              :warn_on_errors => true,
+              :dnf_options => ['--downloadonly']
+            )
+            add_step_with_context(Procedures::Packages::LockVersions)
+          else
+            add_step_with_context(
+              Procedures::Packages::Update,
+              :force => true,
+              :warn_on_errors => true
+            )
+
+            add_step_with_context(Procedures::Installer::Run)
+          end
+
           add_step(Procedures::Packages::LockingStatus)
         end
       end
+      # rubocop:enable  Metrics/MethodLength
 
       def set_context_mapping
         context.map(:packages,

data/definitions/scenarios/upgrade_to_satellite_6_16.rb

@@ -29,6 +29,7 @@ module Scenarios::Satellite_6_16
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Disk::AvailableSpacePostgresql13)
       add_step(Checks::Repositories::Validate.new(:version => '6.16'))
+      add_step(Checks::CheckOrganizationContentAccessMode)
     end
   end
 

data/extras/foreman_protector/dnf/foreman-protector.py

@@ -1,8 +1,10 @@
+import configparser
+import os
+
 import dnf
 import dnf.exceptions
 from dnfpluginscore import _, logger
 
-import configparser
 
 PROTECT_COMMANDS = ('install', 'downgrade', 'reinstall', 'distro-sync', 'swap', 'upgrade', 'upgrade-minimal')
 
@@ -53,6 +55,8 @@ class ForemanProtector(dnf.Plugin):
     def sack(self):
         if self.cli is not None and self.cli.command._basecmd not in PROTECT_COMMANDS:
             return
+        if os.environ.get('LEAPP_IPU_IN_PROGRESS') is not None:
+            return
         whitelist_and_obsoletes = self._add_obsoletes()
         all_available_packages = self.base.sack.query().available()
         excluded_pkgs_query = all_available_packages.difference(whitelist_and_obsoletes)

data/lib/foreman_maintain/cli/packages_command.rb

@@ -55,12 +55,15 @@ module ForemanMaintain
       subcommand 'update', 'Update packages in an unlocked session' do
         interactive_option(['assumeyes'])
         parameter '[PACKAGES] ...', 'packages to update', :attribute_name => :packages
+        option '--downloadonly', :flag, 'Downloads and caches package updates only',
+          :default => false
 
         def execute
           run_scenarios_and_exit(
             Scenarios::Packages::Update.new(
               :packages => packages,
-              :assumeyes => assumeyes?
+              :assumeyes => assumeyes?,
+              :downloadonly => @downloadonly
             )
           )
         end

data/lib/foreman_maintain/cli.rb

@@ -44,16 +44,10 @@ module ForemanMaintain
         end
 
         return @exit_code
-      ensure
-        log_exit_code_info(@exit_code)
       end
 
       private
 
-      def log_exit_code_info(exit_code)
-        logger.info("foreman-maintain command finished with #{exit_code}")
-      end
-
       def process_standard_error(error)
         if error.is_a?(Clamp::HelpWanted) ||
            error.is_a?(ArgumentError) ||
@@ -68,7 +62,6 @@ module ForemanMaintain
       end
 
       def process_usage_error(error)
-        log_exit_code_info(1)
         $stderr.puts error.message
         exit!
       end

data/lib/foreman_maintain/config.rb

@@ -21,7 +21,7 @@ module ForemanMaintain
         @options.fetch(:completion_cache_file, '~/.cache/foreman_maintain_completion.yml')
       )
       @disable_commands = @options.fetch(:disable_commands, [])
-      @foreman_url = @options.fetch(:foreman_url, `hostname -f`.chomp)
+      @foreman_url = @options.fetch(:foreman_url) { `hostname -f`.chomp }
       @foreman_port = @options.fetch(:foreman_port, 443)
     end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.2'.freeze
+  VERSION = '1.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -194,6 +194,7 @@ files:
 - definitions/checks/restore/validate_interfaces.rb
 - definitions/checks/restore/validate_postgresql_dump_permissions.rb
 - definitions/checks/root_user.rb
+- definitions/checks/sca_only.rb
 - definitions/checks/server_ping.rb
 - definitions/checks/services_up.rb
 - definitions/checks/system_registration.rb