foreman_rh_cloud 3.0.24.1 → 3.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0157c9f96dcbfa67895f62e292af8f9171c6d90a60f3eb8fdca5de57bd42918c
-  data.tar.gz: 24c8de05e245d54d789bacbed59bf7bd8c85d40f7252a59b60b599ab8941f5e9
+  metadata.gz: fcdeab4d9295cecfb21182db7a6d67616a89ccf47a1a49b290058bcdfbc0f990
+  data.tar.gz: 0524546fe41d9ca57ce8a881dc011c8d0973a0900c79bdbf51a5ef69577d11c4
 SHA512:
-  metadata.gz: cd9e22b6176184b7c40d64229170458a59d2e70fbca128b892d299359c3e531afae0ebf760d07f57ba304bc042d86a601ef13472e8e8c3686eb670620185ee70
-  data.tar.gz: ca49d14fb99c6de0480cf180b1f38d7a70cca26808ef141cc6c504fbfc08daeda3f89127def3cc18e6d8ed2afbef835704d48ef4011442b33f7ec407def79fea
+  metadata.gz: 129e721b9ff7701d391189631a4782bccabd38d22e1d8bbf25093c9fda21c00d1c260489621a6f42b06dc2357e09cfc126f41deda9d367b931a082548bcb9665
+  data.tar.gz: 4544b0097e5131166c03cd68a35b9320f7ffbe770da6db99edc7693d2da3aafa4eb845a17de8d37bf7635038a8e9b7b26fb87e747317f82032459e4d8d7306e7

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -4,6 +4,10 @@ module ForemanRhCloud
 
     include CloudRequest
 
+    def cloud_auth_available?
+      Setting[:rh_cloud_token].present?
+    end
+
     def rh_credentials
       @rh_credentials ||= query_refresh_token
     end

data/app/services/foreman_rh_cloud/remediations_retriever.rb

@@ -12,6 +12,11 @@ module ForemanRhCloud
     end
 
     def create_playbook
+      unless cloud_auth_available?
+        logger.debug('Cloud authentication is not available, cannot continue')
+        return
+      end
+
       response = query_playbook
 
       logger.debug("Got playbook response: #{response.body}")

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -19,7 +19,9 @@ module ForemanInventoryUpload
       def generate_parameters
         return [] unless Setting[:include_parameter_tags]
 
-        (@host.host_inherited_params_objects || []).map { |item| [item.name, item.value] }
+        (@host.host_inherited_params_objects || [])
+          .map { |item| [item.name, item.value] }
+          .select { |_name, value| value.present? || value.is_a?(FalseClass) }
       end
 
       private

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.24.1'.freeze
+  VERSION = '3.0.25'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -6,6 +6,11 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping insights sync')
+          return
+        end
+
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -7,6 +7,15 @@ module InsightsCloud
 
       RULE_ID_REGEX = /[^:]*:(?<id>.*)/
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping resolutions sync')
+          return
+        end
+
+        plan_self
+      end
+
       def run
         InsightsResolution.transaction do
           InsightsResolution.delete_all

data/lib/insights_cloud/async/insights_rules_sync.rb

@@ -6,6 +6,11 @@ module InsightsCloud
       include ::ForemanRhCloud::CloudAuth
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping rules sync')
+          return
+        end
+
         plan_self
         plan_resolutions
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :update_statuses_batch
 
       def plan(organization)
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         plan_self(organization_id: organization.id)
       end
 

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -5,6 +5,11 @@ module InventorySync
       set_callback :step, :around, :create_facets
 
       def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping inventory hosts sync')
+          return
+        end
+
         # by default the tasks will be executed concurrently
         plan_self
         plan_self_host_sync

data/lib/inventory_sync/async/inventory_self_host_sync.rb

@@ -3,6 +3,15 @@ module InventorySync
     class InventorySelfHostSync < QueryInventoryJob
       set_callback :step, :around, :create_facets
 
+      def plan
+        unless cloud_auth_available?
+          logger.debug('Cloud authentication is not available, skipping self host sync')
+          return
+        end
+
+        plan_self
+      end
+
       def create_facets
         # get the results from the event
         results = yield

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.24.1",
+  "version": "3.0.25",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/jobs/insights_full_sync_test.rb

@@ -7,6 +7,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')

data/test/jobs/insights_resolutions_sync_test.rb

@@ -63,6 +63,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     }
 
     @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Resolutions data is replaced with data from cloud' do

data/test/jobs/insights_rules_sync_test.rb

@@ -112,6 +112,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
 
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Hits data is replaced with data from cloud' do

data/test/jobs/inventory_full_sync_test.rb

@@ -242,6 +242,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be SYNC for inventory hosts' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
@@ -253,6 +254,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
@@ -261,4 +263,12 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
   end
+
+  test 'Task should be aborted if token is not present' do
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: '')
+
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
+  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -6,6 +6,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)

data/test/jobs/inventory_self_host_sync_test.rb

@@ -6,6 +6,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(:host)

data/test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb

@@ -8,6 +8,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
+    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/tags_generator_test.rb

@@ -62,6 +62,47 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal false, actual.key?('content_view')
   end
 
+  test 'generates parameter tags' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 3, actual.count
+    assert_equal true, actual['bool_param']
+    assert_equal false, actual['false_param']
+    assert_equal 1, actual['int_param']
+  end
+
+  test 'skips parameter tags if include_parameter_tags setting is off' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'bool_param', value: true),
+        OpenStruct.new(name: 'false_param', value: false),
+        OpenStruct.new(name: 'int_param', value: 1),
+        OpenStruct.new(name: 'empty_param', value: nil),
+        OpenStruct.new(name: 'empty_str_param', value: ''),
+      ]
+    )
+
+    generator = create_generator
+    actual = generator.generate_parameters.group_by { |key, value| key }
+
+    assert_equal 0, actual.count
+  end
+
   private
 
   def create_generator

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.scss

@@ -6,4 +6,18 @@
       margin-top: 5px;
     }
   }
+
+  // applies to the backdrop parent of the modal
+  @at-root .pf-c-backdrop {
+    width: calc(100% - 200px) !important;
+    left: 200px !important;
+  }
+
+  // where the vertical nav breaks: https://github.com/theforeman/foreman/blob/3347fa49d500964f0209122d8d36c920d1feafcc/webpack/assets/javascripts/react_app/components/Layout/components/Toolbar/HeaderToolbar.scss#L26
+  @media (max-width: 768px) {
+    @at-root .pf-c-backdrop {
+      width: 100% !important;
+      left: 0 !important;
+    }
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.24.1
+  version: 3.0.25
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello