foreman_maintain 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521d4872b92d49f2bfe38afcbb8113a33cc8b9470d3d3d983074761ed2001202
-  data.tar.gz: 4670a9b7913fb1c95d992e0e3234b66b2ade8e351c4180b8d7eacee9eb2b2b5b
+  metadata.gz: 05e00cf48a6dfb5684ac74e789ba933225d4c380a2b83d3e8df8cd607d537c8c
+  data.tar.gz: c639bf3716c44df18b63125880f6521558ee754992e21eac73021e14e3ebfd5c
 SHA512:
-  metadata.gz: b440223080a5882f69e273426769427b0351d81a0eb4ee49c6c4faa15f29116a6dcc71d978ac6657b54c3788d5f6f6eb5c2c66c8d2d3e581db67d3871b40320a
-  data.tar.gz: 1838ce95442878efa5444e8f643e716ec5251461692c43215d6418de20fa1b7caef195abbd562c4eb96426990c51b3d1c3dc08e75f8694a2072e5f6e5645f276
+  metadata.gz: 1899bd4d44b5ab634dfdd516c9db1e0cf4c45ced30b3de818bcbaa0b45bdedafe690a6e42eff5643e2b2e986c8289c792db34f3609161e33c9c773c27414cb93
+  data.tar.gz: 68ee21c7b7e59cbc9a8d944fdebba54e82b72a5b67c4fbf5284f36caab4926f1223d0c5168d6303e624f4ed49b87c5167bbec6c222dc8d874a8b8fdb4d5af9ef

data/definitions/features/foreman_proxy.rb

@@ -144,7 +144,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
 
     cmd = "curl -w '\n%{http_code}' -s "
     cmd += format_shell_args('--cert' => ssl_cert, '--key' => ssl_key, '--cacert' => ssl_ca)
-    cmd += " https://$(hostname):#{proxy_settings[:https_port]}"
+    cmd += " https://#{hostname}:#{proxy_settings[:https_port]}"
     cmd
   end
 

data/definitions/features/foreman_tasks.rb

@@ -17,6 +17,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     Actions::Candlepin::ListenOnCandlepinEvents
     Actions::Katello::EventQueue::Monitor
     Actions::Insights::EmailPoller
+    ForemanInventoryUpload::Async::GenerateAllReportsJob
     ForemanInventoryUpload::Async::GenerateReportJob
     ForemanInventoryUpload::Async::QueueForUploadJob
     ForemanInventoryUpload::Async::UploadReportJob
@@ -24,6 +25,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     InsightsCloud::Async::InsightsFullSync
     InsightsCloud::Async::InsightsResolutionsSync
     InsightsCloud::Async::InsightsRulesSync
+    InsightsCloud::Async::InsightsScheduledSync
     InventorySync::Async::InventoryFullSync
     InventorySync::Async::InventoryHostsSync
     InventorySync::Async::InventoryScheduledSync

data/definitions/features/sync_plans.rb

@@ -33,12 +33,22 @@ class Features::SyncPlans < ForemanMaintain::Feature
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
+  def validate_sync_plan_ids(ids)
+    ids_condition = ids.map { |id| "'#{id}'" }.join(',')
+    query = <<-SQL
+      SELECT id FROM katello_sync_plans WHERE id IN (#{ids_condition})
+    SQL
+    feature(:foreman_database).query(query).map { |r| r['id'].to_i }
+  end
+
   def make_disable(ids)
     update_records(ids, false)
   end
 
   def make_enable
-    update_records(data[:disabled], true)
+    # remove ids of sync plans which no longer exist in DB
+    @data[:disabled] = validate_sync_plan_ids(@data[:disabled])
+    update_records(@data[:disabled], true)
   end
 
   def load_from_storage(storage)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.10'.freeze
+  VERSION = '1.1.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -485,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt