foreman_rh_cloud 9.0.61 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4154539307307d18565103200ec4c32d56e75e87aca0b9dbc1539ae6e50c49fe
-  data.tar.gz: 338607b5ac88be16b3bad2d31b748c31b072a11a13075c194d75e5e3df055645
+  metadata.gz: 0ff94b0740c89b0b945f90e7feba658b30341a7f8bb5c1fd2e59cdfc68d05969
+  data.tar.gz: b25c4f29a021b554b425d6d464971aed419e3021736730b696710c10e9804670
 SHA512:
-  metadata.gz: 0e4c31e7b47d075c72953cad87ad82df02d59417dc6ff5161501b5ed93a7dbbe240b8e13a21195f6c781c5e09cf50d7fcd667b312b8a58d4150c46164055a8b7
-  data.tar.gz: 3d9567390cc9b87e85e361c182485037c31a91eea35caa23f71f951eab976ac1052796a87c038306ce9907df4413151a08e4a63da9d511bac1ca510d580b0618
+  metadata.gz: 6c4b8398e71971b211bb7eb5a76f3d4acd2a274eb69cd9c6f33c8961e0824c8f9da3a34e7ae72c438ab9ddc5042f9a4e3aee53bf24c5ad07ce617b3bdba83eee
+  data.tar.gz: a0f2b3d8d0b1ddf1c0bccd5eeef2c818d8f81bf1a05eaa5e9f0a9bacd70368381d362343f5bc454023b258c238127664f4aaac709fe40feae03ae8b400f80f0c

data/README.md

@@ -15,7 +15,7 @@ for how to install Foreman plugins
 
 #### Inventory upload
 
-In UI: Insights -> Inventory Upload -> select the organization -> Generate and upload report
+In UI: Configure -> Inventory Upload -> Restart
 
 From command-line:
 
@@ -38,7 +38,7 @@ From command-line:
 
 #### Fetch hosts remediation data
 
-In UI: Insights -> Recommendations -> Sync recommendations (under the vertical ellipsis)
+In UI: Configure -> Insights -> Sync now
 
 From command-line:
 
@@ -46,7 +46,7 @@ From command-line:
 
 #### Synchronize inventory status
 
-In UI: Insights -> Inventory Upload -> Sync all inventory status
+In UI: Configure -> Inventory Upload -> Sync inventory status
 
 From command-line:
 

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -16,41 +16,27 @@ module InsightsCloud::Api
     # The method that "proxies" requests over to Cloud
     def forward_request
       certs = candlepin_id_cert @organization
-      begin
-        @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
-      rescue RestClient::Exceptions::Timeout => e
-        response_obj = e.response.presence || e.exception
-        return render json: { message: response_obj.to_s, error: response_obj.to_s }, status: :gateway_timeout
-      rescue RestClient::Unauthorized => e
-        logger.warn("Forwarding request auth error: #{e}")
-        message = 'Authentication to the Insights Service failed.'
-        return render json: { message: message, error: message }, status: :unauthorized
-      rescue RestClient::NotModified => e
-        logger.info("Forwarding request not modified: #{e}")
-        message = 'Cloud request not modified'
-        return render json: { message: message, error: message }, status: :not_modified
-      rescue RestClient::ExceptionWithResponse => e
-        response_obj = e.response.presence || e.exception
-        code = response_obj.try(:code) || response_obj.try(:http_code) || 500
-        message = 'Cloud request failed'
+      @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
 
+      if @cloud_response.code == 401
         return render json: {
-          :message => message,
-          :error => response_obj.to_s,
+          :message => 'Authentication to the Insights Service failed.',
           :headers => {},
-          :response => response_obj,
-        }, status: code
-      rescue StandardError => e
-        # Catch any other exceptions here, such as Errno::ECONNREFUSED
-        logger.warn("Cloud request failed with exception: #{e}")
-        return render json: { error: e.to_s }, status: :bad_gateway
+        }, status: :bad_gateway
+      end
+
+      if @cloud_response.code >= 300
+        return render json: {
+          :message => 'Cloud request failed',
+          :headers => {},
+          :response => @cloud_response,
+        }, status: @cloud_response.code
       end
 
       # Append redhat-specific headers
       @cloud_response.headers.each do |key, value|
         assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
       end
-
       # Append general headers
       assign_header(response, @cloud_response, :x_resource_count, true)
       headers[Rack::ETAG] = @cloud_response.headers[:etag]
@@ -60,8 +46,8 @@ module InsightsCloud::Api
         # content type
         send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       elsif @cloud_response.headers[:content_type] =~ /zip/
-        # If there is no Content-Disposition, but the content type is binary according to Content-Type, send the raw data
-        # with proper content type
+        # if there is no Content-Disposition, but the content type is binary according the content type,
+        # forward the request as binry too
         send_data @cloud_response, type: @cloud_response.headers[:content_type]
       else
         render json: @cloud_response, status: @cloud_response.code

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -13,15 +13,9 @@ module ForemanRhCloud
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")
 
       response
-    rescue RestClient::Exceptions::Timeout => ex
-      logger.debug("Timeout exception raised for request url #{final_params[:url]}: #{ex}")
-      raise
-    rescue RestClient::ExceptionWithResponse => ex
-      logger.debug("Response headers for request url #{final_params[:url]} with status code #{ex.http_code} are: #{ex.http_headers} and body: #{ex.http_body}")
-      raise
-    rescue StandardError => ex
-      logger.debug("Exception raised for request url #{final_params[:url]}: #{ex}")
-      raise
+    rescue RestClient::Exception => ex
+      logger.debug("Failed response with code #{ex.http_code} headers for request url #{final_params[:url]} are: #{ex.http_headers} and body: #{ex.http_body}")
+      raise ex
     end
   end
 end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,6 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
+    rescue RestClient::Exception => error_response
+      error_response.response
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -48,9 +50,7 @@ module ForemanRhCloud
 
     def prepare_forward_params(original_request, branch_id)
       forward_params = original_request.query_parameters
-      compliance_request = original_request.path.match?(/compliance\/v2(\/.*)?/)
-      user_agent = original_request.user_agent.present? && !original_request.user_agent.include?('redhat_access_cfme')
-      if user_agent && !compliance_request
+      if original_request.user_agent && !original_request.user_agent.include?('redhat_access_cfme')
         forward_params = forward_params.merge(:branch_id => branch_id)
       end
 

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
       extend ActiveSupport::Concern
 
       CLOUD_AMAZON = 'aws'
-      CLOUD_GOOGLE = 'google'
+      CLOUD_GOOGLE = 'gcp'
       CLOUD_AZURE = 'azure'
       CLOUD_ALIBABA = 'alibaba'
 

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -126,7 +126,6 @@ module ForemanInventoryUpload
         ) { |v| os_release_value(*v) }
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
-        @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', false)
         @stream.simple_field(
           'infrastructure_type',

data/lib/foreman_inventory_upload.rb

@@ -75,7 +75,7 @@ module ForemanInventoryUpload
   end
 
   def self.inventory_export_url
-    tags = URI.encode("satellite/satellite_instance_id=#{Foreman.instance_id}")
+    tags = CGI.escape("satellite/satellite_instance_id=#{Foreman.instance_id}")
     inventory_base_url + "?tags=#{tags}"
   end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '9.0.61'.freeze
+  VERSION = '10.0.1'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -9,11 +9,10 @@ module InsightsCloud
 
       def plan(organizations)
         organizations = organizations.select do |organization|
-          checker = ::Katello::UpstreamConnectionChecker.new(organization)
-          if cert_auth_available?(organization) && !organization.manifest_expired? && checker.can_connect?
+          if cert_auth_available?(organization)
             true
           else
-            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
+            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
             false
           end
         end
@@ -21,23 +20,19 @@ module InsightsCloud
         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
-          valid_organizations = organizations.reject(&:manifest_expired?)
-          if valid_organizations.any?
-            plan_hosts_sync(organizations)
-            plan_self(organization_ids: organizations.map(&:id))
-            concurrence do
-              plan_rules_sync(organizations)
-              plan_notifications
-            end
+          plan_hosts_sync(organizations)
+          plan_self(organization_ids: organizations.map(&:id))
+          concurrence do
+            plan_rules_sync(organizations)
+            plan_notifications
           end
         end
       end
 
       def try_execute
         organizations.each do |organization|
-          checker = ::Katello::UpstreamConnectionChecker.new(organization)
-          if !cert_auth_available?(organization) && organization.manifest_expired && !checker.can_connect?
-            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
+          unless cert_auth_available?(organization)
+            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
             next
           end
 

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -13,11 +13,7 @@ module InsightsCloud
           InsightsResolution.delete_all
           rule_ids = relevant_rules
           Organization.all.each do |organization|
-            checker = ::Katello::UpstreamConnectionChecker.new(organization)
-            if !cert_auth_available?(organization) || organization.manifest_expired? || !checker.can_connect?
-              logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping resolutions sync")
-              next
-            end
+            next if !cert_auth_available?(organization) || organization.manifest_expired?
             api_response = query_insights_resolutions(rule_ids, organization) unless rule_ids.empty?
             written_rules = write_resolutions(api_response) if api_response
             rule_ids -= Array(written_rules)
@@ -64,7 +60,13 @@ module InsightsCloud
 
       def write_resolutions(response)
         all_resolutions = response.map do |rule_id, rule_details|
-          rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+          if rule_details
+            rule_details['resolutions'].map { |resolution| to_resolution_hash(to_rule_id(rule_id), resolution) }
+          else
+            logger.info("Rules response: #{rule_id} #{rule_details}")
+            logger.debug("Response: #{response}\n Failed id #{rule_id}")
+            []
+          end
         end.flatten
 
         InsightsResolution.create(all_resolutions)

data/lib/tasks/insights.rake

@@ -15,9 +15,10 @@ namespace :rh_cloud_insights do
     end
 
     cleaner = ForemanRhCloud::InsightsStatusCleaner.new
-    deleted_count = cleaner.clean(hosts_search)
-
-    puts "Deleted #{deleted_count} insights statuses"
+    User.as_anonymous_admin do
+      deleted_count = cleaner.clean(hosts_search)
+      puts "Deleted #{deleted_count} insights statuses"
+    end
   end
 
   desc "Re-announce all organizations into Sources on RH cloud."

data/package.json

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

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -83,46 +83,13 @@ module InsightsCloud::Api
         assert_equal net_http_resp[:content_type], @response.headers['Content-Type']
       end
 
-      test "should handle StandardError" do
-        error_message = "Connection refused"
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(Errno::ECONNREFUSED.new)
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 502, @response.status
-        body = JSON.parse(@response.body)
-        assert_equal error_message, body['error']
-      end
-
-      test "should handle 304 cloud" do
-        net_http_resp = Net::HTTPResponse.new(1.0, 304, "Not Modified")
-        res = RestClient::Response.create(@body, net_http_resp, @http_req)
-
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotModified.new(res))
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 304, @response.status
-        assert_equal 'Cloud request not modified', JSON.parse(@response.body)['message']
-      end
-
-      test "should handle RestClient::Exceptions::Timeout" do
-        timeout_message = "execution expired"
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Exceptions::Timeout.new(timeout_message))
-
-        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 504, @response.status
-        body = JSON.parse(@response.body)
-        assert_equal timeout_message, body['message']
-        assert_equal timeout_message, body['error']
-      end
-
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)
-
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Unauthorized.new(res))
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 401, @response.status
+        assert_equal 502, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
 

data/test/jobs/insights_full_sync_test.rb

@@ -65,8 +65,6 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits data is replaced with data from cloud' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
@@ -81,31 +79,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     assert_equal 1, @host2.insights.hits.count
   end
 
-  test 'Manifest is expired do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(true)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
-
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-  end
-
-  test 'Manifest is deleted do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
-
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
-    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
-  end
-
   test 'Hits counters are reset correctly' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
 
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
@@ -123,8 +97,6 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits ignoring non-existent hosts' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     hits_json = <<-HITS_JSON
     [
         {

data/test/jobs/insights_resolutions_sync_test.rb

@@ -73,7 +73,6 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
   end
 
   test 'Resolutions data is replaced with data from cloud' do
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
 
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
@@ -83,28 +82,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 2, @rule.resolutions.count
   end
 
-  test 'Manifest is deleted do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(false)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
-    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
-
-    assert_equal 0, InsightsResolution.all.count
-  end
-
-  test 'Manifest is expired do not run task steps' do
-    Organization.any_instance.stubs(:manifest_expired?).returns(true)
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
-    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
-
-    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
-
-    assert_equal 0, InsightsResolution.all.count
-  end
-
   test 'Skips pinging the cloud if no rule ids were found' do
-    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
     InsightsRule.all.delete_all
 

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

@@ -112,30 +112,6 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
 
-  test 'should NOT add branch id into forwarded params for compliance urls' do
-    user_agent = { :foo => :bar }
-    params = { :page => 5, :per_page => 42 }
-
-    uris = [
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/policies/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID",
-      "/redhat_access/r/insights/platform/compliance/v2/policies",
-      "/redhat_access/r/insights/platform/compliance/v2/",
-    ]
-    uris.each do |uri|
-      req = ActionDispatch::Request.new(
-        'REQUEST_URI' => uri,
-        'REQUEST_METHOD' => 'GET',
-        'HTTP_USER_AGENT' => user_agent,
-        'rack.input' => ::Puma::NullIO.new,
-        'action_dispatch.request.query_parameters' => params
-      )
-      req.stubs(:path).returns(uri)
-      refute @forwarder.prepare_forward_params(req, 74).key?(:branch_id), "Branch id should not be added for #{uri}"
-    end
-  end
-
   test 'should reuse BranchInfo identifiers for user_agent' do
     user_agent = { :foo => :bar }
     params = { :page => 5, :per_page => 42 }

data/test/unit/slice_generator_test.rb

@@ -594,7 +594,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
-    assert_equal 'google', actual_profile['cloud_provider']
+    assert_equal 'gcp', actual_profile['cloud_provider']
   end
 
   test 'Identifies Azure cloud provider' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 9.0.61
+  version: 10.0.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -28,16 +28,16 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement