foreman_maintain 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 548814bfe86ff4c1e83329ac60bbbf5b9502f6cc77c258d82cb7fa5777a00fdf
-  data.tar.gz: c16c7ee88083f281e69cedbe605990c9e3b54e5e15f3ba4aaa0b3e3b1d5acc10
+  metadata.gz: 1b13b3b3d17ba932466b1bee7b2de56dd7a83bb577236d8fba67dcd04674f595
+  data.tar.gz: 9f691170e95c2fbefb77db6218216b5d6dc0ec43d33fe4ca20dc84866f6dfd02
 SHA512:
-  metadata.gz: e37f22cb90fcd75430b186cb468dc58c7d625c52ec104427119f6e88d1f6d511d98dbedbfff1c9293abd29816156e936d3bb70ada7c21cfb4c1cdca61f2d255e
-  data.tar.gz: 236e8c299154a4d132506995933f30d8f11ccaf1fdba5756844bc5d9b978d0ce7bd1fa65a2fe5d51abd9e2925e54bf634c083897b1ef14d410e38f4d54ad032e
+  metadata.gz: 20e3f6408c0263c62a3bb2b11226f6d87bf6325fd5c14c980e0ca00af7375301e9d342700b400e4c4dca4915a14bac4cc68e006fea17ef5f6fa28120a2890987
+  data.tar.gz: 338362b5bbf7c82cd43ec5d20e18c15435a5c122b3d7d4a6c1c6e5cc99e7c795312ead32af13f94fbacd78a877d323396e602df6058b69e4e3256d14cad8f592

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/scenarios/upgrade_to_capsule_6_16.rb

@@ -39,18 +39,6 @@ module Scenarios::Capsule_6_16
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :dnf_options => ['--downloadonly']
-      ))
-
       add_steps(find_procedures(:pre_migrations))
     end
   end
@@ -66,6 +54,17 @@ module Scenarios::Capsule_6_16
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
+        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      end
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Run)

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
 
@@ -39,17 +40,6 @@ module Scenarios::Satellite_6_16
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :dnf_options => ['--downloadonly']
-      ))
       add_steps(find_procedures(:pre_migrations))
     end
   end
@@ -66,6 +56,17 @@ module Scenarios::Satellite_6_16
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
+        modules_to_enable = ["satellite:#{el_short_name}"]
+        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      end
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Run)

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.1'.freeze
+  VERSION = '1.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-04-09 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