foreman_rh_cloud 4.0.31 → 4.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14db9e6999496bcfba315a4cd476131e102c9694b479f8208938f021633c132
-  data.tar.gz: 74742e367059aa5b6e68aaae1eaf16a0de2f9df9e981215a070768654517e51b
+  metadata.gz: b11e8e007c7d982a5554b027916d26df635d1d3824ba8a586b794370f1828f1a
+  data.tar.gz: ac439b33efec89c1f939745de5470d8bcb12c9cc21dd8464527ecd400d9fe0a0
 SHA512:
-  metadata.gz: f89a0c377c341f85b3568e47a7939233c6ab0ad6b4455ea7774b8d4a1359da1b34b718b2e96d00ae30577e350aafd130e052cee73100094672e69764137d3022
-  data.tar.gz: 79969dfbae771637006974db3663d8d86804d4cb2b6056bbacbdaeb21b8d72ee15c34654ade1c0efa14aa6b955973f9ce33401b6ab8bafbcf764cc30882f6a76
+  metadata.gz: 05a8f783d13985048ec24dd4d9fe8037cb1a5d8af0b266739fbbc515c9542f2b9c14de8e6e2b209194f84c8b5902300ff6f0b746814a063e0ab45521d8139035
+  data.tar.gz: 632d536fa1056cc8fd69ee7375f7683da2675756151f890a3a6d1e42081225cbde5e71c8b3516e0804eabcda54ac61b340ae622f0f7cc63ebc0f4fc15026c809

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 = '4.0.31'.freeze
+  VERSION = '4.0.32'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "4.0.31",
+  "version": "4.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/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: 4.0.31
+  version: 4.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