foreman_maintain 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e99fd5f893ec24f16eaea4c20b8260cd2878bf63149ddf830c29e15f0324cda0
-  data.tar.gz: 5f1e7e90783d76b45231d393e204f2588d5b4daf46723792186aaa14d9c525d9
+  metadata.gz: e5370b4ded072240b5012301589b25980ae0bdfe42eee5eae1edb9783f4d6065
+  data.tar.gz: 71621ff57cfd33902a2ce893141fba837ebf4abe97243784ae6f01427a76a19a
 SHA512:
-  metadata.gz: d5c950a2a4b110d1425f071a5532010f4b704267e3bde1d082ea1bed209ccf6f82bf5d2682ebbe444679edf85eb03e4b216ed7ba298dd3a6fd73904390ddce77
-  data.tar.gz: cccf743480372ef3b39e54ab995a9be077006dfe991a799021378371b3f58db1a04cac263f70e21bcd75b87e30892d55d390af17bb59cf0c57aee63030ae0543
+  metadata.gz: a9a73c5f97d1e83069aeca4f62763b27d1a261693b2ec88d9cafbf7cf41532d3aad32a53a29c89bd773bf1c62b77a8efef2d7ec63b65731b6f8aeaf8f6467867
+  data.tar.gz: d310f0537349c8ec86d38621563db56df19971460ad45682f92c2292ce593d2b126f3a5062929dd1ac44fde5d5b30d64ac041be6a08bc6011221cfdcbb9c2562

data/definitions/checks/container/podman_login.rb

@@ -10,7 +10,9 @@ module Checks::Container
     end
 
     def run
-      login_status, _output = execute_with_status('podman login --get-login registry.redhat.io')
+      login_status, _output = execute_with_status(
+        'podman login --get-login --authfile /etc/foreman/registry-auth.json registry.redhat.io'
+      )
       assert(
         login_status == 0,
         failure_message

data/definitions/reports/{advisor_on_prem_remediations.rb → iop_remediations.rb}

@@ -1,25 +1,23 @@
 module Reports
-  class AdvisorOnPremRemediations < ForemanMaintain::Report
+  class IopRemediations < ForemanMaintain::Report
     metadata do
-      description 'Report number of remediations based on advisor rules from advisor on premise'
+      description 'Report number of remediations based on advisor rules from IoP'
     end
 
     def run
-      data_field('advisor_on_prem_remediations_enabled') { advisor_on_prem_remediations_enabled }
-      data_field('advisor_on_prem_remediations_count') { advisor_on_prem_remediations_count }
+      data_field('iop_remediations_enabled') { iop_remediations_enabled }
+      data_field('iop_remediations_count') { iop_remediations_count }
     end
 
-    def advisor_on_prem_remediations_enabled
+    def iop_remediations_enabled
       if @iop_enabled.nil?
-        @iop_enabled = feature(:installer)&.answers&.dig(
-          'foreman::plugin::rh_cloud', 'enable_iop_advisor_engine'
-        ) || false
+        @iop_enabled = feature(:installer)&.answers&.fetch('iop', false) != false
       end
       @iop_enabled
     end
 
-    def advisor_on_prem_remediations_count
-      if advisor_on_prem_remediations_enabled
+    def iop_remediations_count
+      if iop_remediations_enabled
         return sql_count('
           job_invocations AS jobs
           INNER JOIN remote_execution_features AS rexf ON jobs.remote_execution_feature_id = rexf.id

data/lib/foreman_maintain/cli/report_command.rb

@@ -8,7 +8,7 @@ module ForemanMaintain
 
         # description can be used too
         report_data = scenario.steps.map(&:data).compact.reduce(&:merge).transform_keys(&:to_s)
-        report_data['version'] = 1
+        report_data['version'] = 2
         report_data
       end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.13.0'.freeze
+  VERSION = '1.13.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Ivan Nečas
@@ -335,7 +335,6 @@ files:
 - definitions/procedures/sync_plans/enable.rb
 - definitions/procedures/timer/start.rb
 - definitions/procedures/timer/stop.rb
-- definitions/reports/advisor_on_prem_remediations.rb
 - definitions/reports/alternate_content_sources.rb
 - definitions/reports/bookmarks.rb
 - definitions/reports/compliance.rb
@@ -346,6 +345,7 @@ files:
 - definitions/reports/image_mode_hosts.rb
 - definitions/reports/instance.rb
 - definitions/reports/inventory.rb
+- definitions/reports/iop_remediations.rb
 - definitions/reports/kerberos.rb
 - definitions/reports/lab_features.rb
 - definitions/reports/ldap_auth_source.rb