foreman_rh_cloud 11.3.0 → 11.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabe6881c75f0293ff48b2a0dc207d8a0295c492cc7e1766659ef450a8eabcb5
-  data.tar.gz: df041730744b9ac3a63314d2e39bd431260cb10677eef2c3a71d18fe17017dac
+  metadata.gz: 9f8fc6102624f1f64c8417c8417d1ba48e5db528a0551027ba3fd2fac84cb11e
+  data.tar.gz: 9a8a361d435e8ad403937c50b46c6ed3f56f127342320d00258480bd9dfad194
 SHA512:
-  metadata.gz: 2bd4865e3035115965e97c4f240e8494aa3ca7e4fa64b731d8cf1b8631847b60eb8aade9619fde9068a61eb168bfb2c245837e4b4b893356c1237eba4541e343
-  data.tar.gz: c49768ca959a42d96a1efeb8eace4faf1516e676961f492006ca023e5fed4a464b082cc91248891bce7f594ea6dc22a6fbfd2537d3cf5973d0a6b66c826b4fd0
+  metadata.gz: b3d88a21a8bdb3990d0b5f76b20b9b43e1cac02d1c5f8c1adcbc565fa2291d67ede4c4fd5cc794b83db7569048853bf13dc1fa0eeb7fa0556c1e77c390ebf10e
+  data.tar.gz: 7309c277c4478897a0cf00d5fb2a18cf9007e2231bf6c63e16ee880feed2bc664ab340e9af84d092ae4b31bd8fe1e6e3c4f282a4628a56cd463eea2b3f234b2d

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -8,6 +8,10 @@ module ForemanRhCloud
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
+      if ForemanRhCloud.with_local_advisor_engine?
+        final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
+      end
+
       response = RestClient::Request.execute(final_params)
 
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -34,7 +34,13 @@ module ForemanRhCloud
         ),
       }
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
-      base_params.merge(path_params(requested_url, certs))
+      params = path_params(requested_url, certs)
+
+      if ForemanRhCloud.with_local_advisor_engine?
+        params[:ssl_ca_file] = ForemanRhCloud.ca_cert
+      end
+
+      base_params.merge(params)
     end
 
     def prepare_forward_payload(original_request, controller_name)
@@ -63,6 +69,12 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
+      when lightspeed?
+        {
+          url: ForemanRhCloud.cert_base_url + request_path,
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
+        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -95,6 +107,10 @@ module ForemanRhCloud
       headers
     end
 
+    def lightspeed?
+      ->(request_path) { request_path.include? '/lightspeed' }
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/services/foreman_rh_cloud/rules_ingester.rb

@@ -13,7 +13,18 @@ module ForemanRhCloud
 
     def fetch_rules_data
       advisor_url = "#{ForemanRhCloud.on_premise_url}/r/insights/v1/static/release/content.json"
-      JSON.parse(Net::HTTP.get(URI.parse(advisor_url)), symbolize_names: true)
+      uri = URI.parse(advisor_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      # Set CA certificate
+      http.ca_file = ForemanRhCloud.ca_cert
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = http.request(request)
+      JSON.parse(response.body, symbolize_names: true)
     end
 
     def fetch_rules_and_resolutions

data/config/routes.rb

@@ -49,6 +49,10 @@ Rails.application.routes.draw do
     end
   end
 
+  scope :module => :'insights_cloud/api' do
+    match '/api/lightspeed/*path', to: 'machine_telemetries#forward_request', via: :all
+  end
+
   # API routes
 
   namespace :api, :defaults => { :format => 'json' } do

data/lib/foreman_rh_cloud/engine.rb

@@ -212,4 +212,15 @@ module ForemanRhCloud
   def self.with_local_advisor_engine?
     SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
   end
+
+  def self.ca_cert
+    # The reference to candlepin ca_cert_file can be removed
+    # once the setting is dropped. Foreman 3.15 introduces
+    # a single CA file that bundles all CAs.
+    if ::SETTINGS.dig(:katello, :candlepin, :ca_cert_file)
+      ::SETTINGS[:katello][:candlepin][:ca_cert_file]
+    else
+      ::SETTINGS[:ssl_ca_file]
+    end
+  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.3.0'.freeze
+  VERSION = '11.4.1'.freeze
 end

data/package.json

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

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

@@ -3,6 +3,8 @@ require 'rest-client'
 
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
+    include KatelloCVEHelper
+
     setup do
       FactoryBot.create(:common_parameter, name: InsightsCloud.enable_client_param, key_type: 'boolean', value: true)
     end
@@ -122,9 +124,8 @@ module InsightsCloud::Api
       setup do
         UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
         User.current = User.find_by(login: 'secret_admin')
-
-        @env = FactoryBot.create(:katello_k_t_environment)
-        @env2 = FactoryBot.create(:katello_k_t_environment, organization: @env.organization)
+        env = FactoryBot.create(:katello_k_t_environment)
+        env2 = FactoryBot.create(:katello_k_t_environment, organization: env.organization)
 
         @host = FactoryBot.create(
           :host,
@@ -132,19 +133,8 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env
-            ),
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env2
-            ),
-          ],
-          organization: @env.organization
+          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          organization: env.organization
         )
 
         @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)

data/test/jobs/inventory_full_sync_test.rb

@@ -4,6 +4,7 @@ require 'foreman_tasks/test_helpers'
 class InventoryFullSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -11,15 +12,15 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     InventorySync::Async::InventoryFullSync.any_instance.stubs(:plan_self_host_sync)
     Organization.any_instance.stubs(:manifest_expired?).returns(false)
 
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -33,7 +34,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -46,7 +47,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

data/test/jobs/inventory_hosts_sync_test.rb

@@ -4,19 +4,19 @@ require 'foreman_tasks/test_helpers'
 class InventoryHostsSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
+    cv = cve.content_view
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -30,7 +30,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )

data/test/test_plugin_helper.rb

@@ -118,6 +118,20 @@ module CandlepinIsolation
   end
 end
 
+module KatelloCVEHelper
+  def make_cve(lifecycle_environment: nil, content_view: nil)
+    env = lifecycle_environment || FactoryBot.create(:katello_k_t_environment)
+    content_view ||= FactoryBot.create(:katello_content_view, organization: env.organization)
+    cvv = ::Katello::ContentViewVersion.create!(:major => 2, :content_view => content_view)
+    FactoryBot.create(
+      :katello_content_view_environment,
+      content_view_version: cvv,
+      content_view: content_view,
+      lifecycle_environment: env
+    )
+  end
+end
+
 module UpstreamOnlySettingsTestHelper
   def self.set_if_available(setting_name, value: true)
     Setting[setting_name] = value

data/test/unit/archived_report_generator_test.rb

@@ -2,18 +2,18 @@ require 'test_plugin_helper'
 
 class ArchivedReportGeneratorTest < ActiveSupport::TestCase
   include MockForemanHostname
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

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

@@ -1,21 +1,22 @@
 require 'test_plugin_helper'
 
 class BranchInfoTest < ActiveSupport::TestCase
+  include KatelloCVEHelper
+
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
-    @env = FactoryBot.create(:katello_k_t_environment)
-    cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
       :with_hostgroup,
       :with_parameter,
-      content_view: cv.first,
-      lifecycle_environment: @env,
-      organization: @env.organization
+      content_view: cve.content_view,
+      lifecycle_environment: env,
+      organization: env.organization
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)

data/test/unit/slice_generator_test.rb

@@ -3,13 +3,12 @@ require 'test_plugin_helper'
 class SliceGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     location = FactoryBot.create(:location)
 
     @host = FactoryBot.create(
@@ -17,7 +16,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :redhat,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization,
       location: location

data/test/unit/tags_generator_test.rb

@@ -3,6 +3,7 @@ require 'test_plugin_helper'
 class TagsGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
@@ -25,18 +26,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       organization: env.organization,
       location: @location2,
       hostgroup: @hostgroup2,
-      content_view_environments: [
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env
-        ),
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env2
-        ),
-      ]
+      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.3.0
+  version: 11.4.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -17,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +26,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
+- !ruby/object:Gem::Dependency
+  name: foreman_remote_execution
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 15.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 15.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 16.0.0
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +56,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement
@@ -649,7 +680,6 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -667,8 +697,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: