foreman_maintain 1.13.8 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971f7d2897d25c93c6572cc408ea39b6405ab7e415806177905c8ea383c5a525
-  data.tar.gz: c4ddc2fa82aa1cf316e9029163b009ef4a8d6a5eae80968f4648f9ddd17d0331
+  metadata.gz: 580f9ed6daf35b7d33e6882ed898e6f9e157cf2c1624d41d00b59307f946100f
+  data.tar.gz: ee891a1e0626efd104d723c5e1238aba4646e98b2ba3f2f4c1f6ad18fa6b5360
 SHA512:
-  metadata.gz: e72af4ddedfb3935e465d049accdea46aa4c9eb705c2ae62d5a1f0f60f3a8888847b3c38764b54fc3c2e67eeea898419c53848679dce781d92964efb5820d3aa
-  data.tar.gz: a52018932321bb92974c3e6ca4b3dd0fd0acded1394c63b66033c43d8e45ae0db408843bd6389a72e1e127faf0d2648c6ec3308f7f1528eb0828eb375c9117b4
+  metadata.gz: 1061e9ed5bf86aeb1e06f7443be45ba4537f09f7c098becfca7d525494b7bd8dcbe48fb0b3d8a1fd93e2bd902d46d721101006090f02cafd9c6bd6b25cf0631a
+  data.tar.gz: a4901ffda5a1ed71dabf18efd1910a4505713b946400bec86f76a9cd5e4338357afec55b41f758fd2a7ccc2f3c94c55e0b0cdde4fc639fa3a6dd5a9633f933f0

data/definitions/checks/foreman/check_corrupted_roles.rb

@@ -32,7 +32,6 @@ module Checks
                  filters.role_id,
                  filters.search,
                  filters.taxonomy_search,
-                 filters.override,
                  filterings.id AS filtering_id,
                  permissions.id AS permission_id,
                  permissions.name AS permission_name,
@@ -52,8 +51,7 @@ module Checks
                           first.permission_name,
                           first.resource_type,
                           first.search,
-                          first.taxonomy_search,
-                          first.override
+                          first.taxonomy_search
           FROM (#{subquery}) first JOIN (#{subquery}) second
             ON first.filter_id = second.filter_id AND
               ((first.resource_type IS NOT NULL AND second.resource_type IS NULL)

data/definitions/features/iop.rb

@@ -13,6 +13,7 @@ class Features::Iop < ForemanMaintain::Feature
       'insights-engine',
       'gateway',
       'host-inventory',
+      'host-inventory-frontend',
       'ingress',
       'puptoo',
       'yuptoo',

data/definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -34,8 +34,7 @@ module Procedures::Foreman
     def update_records(set)
       new_filter = create_filter set.first['role_id'],
         set.first['search'],
-        set.first['taxonomy_search'],
-        set.first['override']
+        set.first['taxonomy_search']
       set.each do |item|
         destroy_filtering item
         next if !new_filter || new_filter.empty?
@@ -43,9 +42,9 @@ module Procedures::Foreman
       end
     end
 
-    def create_filter(role_id, search, taxonomy_search, override)
+    def create_filter(role_id, search, taxonomy_search)
       feature(:foreman_database).query(
-        create_filter_query(search, role_id, taxonomy_search, override)
+        create_filter_query(search, role_id, taxonomy_search)
       ).first
     end
 
@@ -53,11 +52,11 @@ module Procedures::Foreman
       value ? "'#{value}'" : 'NULL'
     end
 
-    def create_filter_query(search, role_id, taxonomy_search, override)
+    def create_filter_query(search, role_id, taxonomy_search)
       <<-SQL
         WITH rows AS (
-          INSERT INTO filters (search, role_id, taxonomy_search, override, created_at, updated_at)
-          VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{override}', '#{Time.now}', '#{Time.now}')
+          INSERT INTO filters (search, role_id, taxonomy_search, created_at, updated_at)
+          VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{Time.now}', '#{Time.now}')
           RETURNING id
           )
         SELECT id

data/definitions/scenarios/foreman_upgrade.rb

@@ -111,7 +111,6 @@ module Scenarios::Foreman
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
-        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::Timer::Start,
         Procedures::SyncPlans::Enable,

data/definitions/scenarios/satellite_upgrade.rb

@@ -35,7 +35,6 @@ module Scenarios::Satellite
         Checks::SystemRegistration,
         Checks::CheckHotfixInstalled,
         Checks::CheckTmout,
-        Checks::CheckSubscriptionManagerRelease,
         Checks::CheckUpstreamRepository,
         Checks::Container::PodmanLogin, # if downstream, connected, containers used
         Checks::Disk::AvailableSpace,
@@ -116,7 +115,6 @@ module Scenarios::Satellite
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
-        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::Timer::Start,
         Procedures::SyncPlans::Enable,

data/definitions/scenarios/update.rb

@@ -33,7 +33,6 @@ module Scenarios::Update
         Checks::SystemRegistration,
         Checks::CheckHotfixInstalled,
         Checks::CheckTmout,
-        Checks::CheckSubscriptionManagerRelease,
         Checks::CheckIpv6Disable,
         Checks::CheckUpstreamRepository,
         Checks::Container::PodmanLogin, # if downstream, connected, containers used

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.13.8'.freeze
+  VERSION = '1.14.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.13.8
+  version: 1.14.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -55,16 +55,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,6 @@ files:
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_ipv6_disable.rb
 - definitions/checks/check_sha1_certificate_authority.rb
-- definitions/checks/check_subscription_manager_release.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/container/podman_login.rb
 - definitions/checks/disk/available_space.rb
@@ -241,7 +240,6 @@ files:
 - definitions/features/pulpcore_database.rb
 - definitions/features/puppet_server.rb
 - definitions/features/redis.rb
-- definitions/features/rh_cloud.rb
 - definitions/features/salt_server.rb
 - definitions/features/satellite.rb
 - definitions/features/service.rb
@@ -357,7 +355,6 @@ files:
 - definitions/reports/provisioning.rb
 - definitions/reports/rbac.rb
 - definitions/reports/recurring_logics.rb
-- definitions/reports/rh_cloud.rb
 - definitions/reports/selinux.rb
 - definitions/reports/template
 - definitions/reports/virt_who.rb
@@ -490,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []

data/definitions/checks/check_subscription_manager_release.rb

@@ -1,41 +0,0 @@
-class Checks::CheckSubscriptionManagerRelease < ForemanMaintain::Check
-  metadata do
-    label :check_subscription_manager_release
-    description 'Check if subscription-manager release is not set to a minor version'
-
-    confine do
-      feature(:instance).downstream
-    end
-  end
-
-  def run
-    status, output = execute_with_status('LC_ALL=C subscription-manager release --show')
-
-    # If command fails (subscription-manager not installed or system not registered), pass the check
-    return if status != 0
-
-    assert(valid_release?(output), error_message(output))
-  end
-
-  private
-
-  def valid_release?(output)
-    # Valid formats: "Release not set" or "Release: X" where X is a major version without dots
-    return true if output == 'Release not set'
-    return true if /^Release:\s+\d+$/.match?(output)
-
-    false
-  end
-
-  def extract_release(output)
-    match = output.match(/^Release:\s+(.+)$/)
-    match ? match[1] : output
-  end
-
-  def error_message(output)
-    subman_release = extract_release(output)
-    "Your system is configured to use RHEL #{subman_release}, but Satellite is only "\
-    "supported on the latest RHEL. Please unset the release in subscription-manager by "\
-    "calling `subscription-manager release --unset`."
-  end
-end

data/definitions/features/rh_cloud.rb

@@ -1,19 +0,0 @@
-class Features::RhCloud < ForemanMaintain::Feature
-  include ForemanMaintain::Concerns::Versions
-
-  metadata do
-    label :rh_cloud
-
-    confine do
-      find_package(foreman_plugin_name('foreman_rh_cloud'))
-    end
-  end
-
-  def current_version
-    @current_version ||= package_version(package_name)
-  end
-
-  def package_name
-    foreman_plugin_name('foreman_rh_cloud')
-  end
-end

data/definitions/reports/rh_cloud.rb

@@ -1,104 +0,0 @@
-module Reports
-  class Rhcloud < ForemanMaintain::Report
-    metadata do
-      description 'Check if rh_cloud is enabled and what features are in use'
-      confine do
-        feature(:rh_cloud)
-      end
-    end
-
-    # rubocop:disable Metrics/MethodLength
-    def run
-      data_field('rh_cloud_hosts_count') do
-        rh_cloud_hosts_count
-      end
-
-      data_field('rh_cloud_mismatched_hosts_count') do
-        rh_cloud_mismatched_hosts_count
-      end
-
-      data_field('rh_cloud_total_hits') do
-        rh_cloud_total_hits
-      end
-
-      data_field('rh_cloud_mismatched_auto_delete') do
-        rh_cloud_mismatched_auto_delete
-      end
-
-      data_field('rh_cloud_obfuscate_inventory_hostnames') do
-        obfuscate_inventory_hostnames_setting
-      end
-
-      data_field('rh_cloud_obfuscate_inventory_ips') do
-        obfuscate_inventory_ips_setting
-      end
-
-      data_field('rh_cloud_minimal_data_collection') do
-        minimal_data_collection
-      end
-
-      data_field('rh_cloud_exclude_host_package_info') do
-        exclude_host_package_info
-      end
-
-      data_field('rh_cloud_connector_enabled') do
-        cloud_connector_enabled
-      end
-
-      data_field('rh_cloud_inventory_upload_enabled') do
-        inventory_upload_enabled
-      end
-
-      data_field('rh_cloud_recommendations_sync_enabled') do
-        recommendations_sync_enabled
-      end
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    private
-
-    def rh_cloud_hosts_count
-      sql_count('hosts INNER JOIN insights_facets ON hosts.id = insights_facets.host_id')
-    end
-
-    def rh_cloud_mismatched_hosts_count
-      sql_count('insights_missing_hosts')
-    end
-
-    def rh_cloud_total_hits
-      sql_count('hosts INNER JOIN insights_hits ON hosts.id = insights_hits.host_id')
-    end
-
-    def obfuscate_inventory_hostnames_setting
-      !!sql_setting('obfuscate_inventory_hostnames')
-    end
-
-    def obfuscate_inventory_ips_setting
-      !!sql_setting('obfuscate_inventory_ips')
-    end
-
-    def minimal_data_collection
-      !!sql_setting('insights_minimal_data_collection')
-    end
-
-    def exclude_host_package_info
-      !!sql_setting('exclude_installed_packages')
-    end
-
-    def rh_cloud_mismatched_auto_delete
-      !!sql_setting('allow_auto_insights_mismatch_delete')
-    end
-
-    def cloud_connector_enabled
-      !!sql_setting('rhc_instance_id')
-    end
-
-    def inventory_upload_enabled
-      !sql_setting('allow_auto_inventory_upload')
-    end
-
-    def recommendations_sync_enabled
-      !sql_setting('allow_auto_insights_sync')
-    end
-  end
-end