foreman_rh_cloud 5.0.31 → 5.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de242348c67166e20efabc42ca1c4f1db9728fa456f17b2acdd8943df685e88
-  data.tar.gz: 6077615ad33a58f582e1c0f16e85df6b0c50b58d1956415d90be37bb236b3aee
+  metadata.gz: 5991354b7fcd361491a962af732a7543402245af2516964876fee68b1bfd6e07
+  data.tar.gz: 6232fd7c367092e0afb3591c313f3347c751610fa2a3b4d38e2f59de08cd2313
 SHA512:
-  metadata.gz: b30c352883db5a9100846d9eb3e0fec08853706129d3ddf7d1faef8e5d825345faa4c11240e3afd61e5d422100a1691fafc7564a43a8e09ecf9849377a0a1a75
-  data.tar.gz: 1aa622b93f13b5a938ae3ab7680967e9f677f0b421358e5c1f3400e77e3f26f8f45f0bac44b2c312793c72705863afb19c2515e982402a517cdac8acd62e057e
+  metadata.gz: d38647081b45704673ed8c77b51ade6e90ee8955bf5bd8433bdca9f3072667d505b314ece193e1dd488af51c8cdf6396de5d987acb718693e6c0cecd7e1c7a18
+  data.tar.gz: 2622868402ef0d3a0fa55d74652e1985b97c95b1dd42bab865e86dd8b68929e95ebd5dd1bc3bba8fb9fef2fa8d7e4af23b9f00c959d5aca8eb4d4ee180722fb6

data/app/helpers/foreman_inventory_upload_host_helper.rb

@@ -5,8 +5,9 @@ module ForemanInventoryUploadHostHelper
 
   def hits_counts_cell(host)
     host_hits = hits_counts[host.id]
+    host_link = Setting['host_details_ui'] ? "#{host_details_page_path(host)}#/Insights" : "#{host_path(host)}#insights"
     tag.td class: ['hidden-xs', 'ellipsis', 'text-center'] do
-      link_to(host_hits, "#{host_path(host)}#insights") if host_hits
+      link_to(host_hits, host_link) if host_hits
     end
   end
 end

data/app/services/foreman_rh_cloud/cloud_ping_service.rb

@@ -39,6 +39,9 @@ module ForemanRhCloud
         certs = candlepin_id_cert(@org)
         return StandardError.new('certificate missing') unless certs
 
+        cert_checker = Katello::UpstreamConnectionChecker.new(@org)
+        cert_checker.assert_connection
+
         execute_cloud_request(
           method: :get,
           url: ForemanRhCloud.cert_base_url + "/api/apicast-tests/ping",
@@ -72,7 +75,7 @@ module ForemanRhCloud
               org,
               {
                 success: cert_response.is_a?(RestClient::Response),
-                error: (cert_response.is_a?(Exception) ? cert_response.inspect : nil),
+                error: (cert_response.is_a?(Exception) ? cert_response&.message || cert_response.inspect : nil),
               },
             ]
           end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -104,7 +104,9 @@ module ForemanInventoryUpload
       end
 
       def obfuscate_ip(ip, ips_dict)
-        "10.230.230.#{ips_dict.count + 1}"
+        max_obfuscated = ips_dict.values.map { |v| IPAddr.new(v).to_i }.max || IPAddr.new('10.230.230.0').to_i
+
+        IPAddr.new(max_obfuscated + 1, Socket::AF_INET).to_s
       end
 
       def bios_uuid(host)

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.31'.freeze
+  VERSION = '5.0.32'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -109,7 +109,13 @@ module ForemanRhCloud
   end
 
   def self.foreman_host_name
-    ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || ::SmartProxy.default_capsule.name
+    ENV['SATELLITE_RH_CLOUD_FOREMAN_HOST'] || marked_foreman_host&.name || ::SmartProxy.default_capsule.name
+  end
+
+  def self.marked_foreman_host
+    ::Host.unscoped.search_for('infrastructure_facet.foreman = true').first
+  rescue ScopedSearch::QueryNotSupported
+    nil
   end
 
   def self.legacy_insights_ca

data/package.json

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

data/test/controllers/inventory_upload/cloud_status_controller_test.rb

@@ -29,6 +29,8 @@ class CloudStatusControllerTest < ActionController::TestCase
       RestClient::Response.new('TEST RESPONSE ORG 1')
     )
 
+    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).twice.returns(true)
+
     get :index, session: set_session_user
 
     assert_response :success

data/test/unit/fact_helpers_test.rb

@@ -30,13 +30,13 @@ class FactHelpersTest < ActiveSupport::TestCase
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
     @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(
-      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.2", "original": "224.0.0.251"}]'
+      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.255", "original": "224.0.0.251"}]'
     )
 
     actual = @instance.obfuscated_ips(host)
 
     assert_equal '10.230.230.1', actual['224.0.0.1']
-    assert_equal '10.230.230.3', actual['224.0.0.2']
+    assert_equal '10.230.231.0', actual['224.0.0.2']
   end
 
   test 'obfuscates ips without insights-client data' do

data/test/unit/foreman_rh_cloud_self_host_test.rb

@@ -25,4 +25,11 @@ class ForemanRhCloudSelfHostTest < ActiveSupport::TestCase
 
     assert_not_nil actual
   end
+
+  test 'finds host by infrastructure facet' do
+    @host = FactoryBot.create(:host, :managed, :with_infrastructure_facet)
+    actual = ForemanRhCloud.foreman_host
+
+    assert_equal @host, actual
+  end
 end

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

@@ -28,6 +28,8 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       RestClient::Response.new('TEST RESPONSE ORG 1')
     )
 
+    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).twice.returns(true)
+
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 
@@ -55,6 +57,8 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
       'TEST RESPONSE ORG 0'
     )
 
+    Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection).returns(true)
+
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -46,7 +46,7 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
                       isPending={status === STATUS.PENDING}
                       authStatus={cert}
                     />{' '}
-                    {cert.org_name}
+                    {cert.org_name} {cert.error}
                   </>
                 ),
               },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.31
+  version: 5.0.32
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello