foreman_rh_cloud 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff94b0740c89b0b945f90e7feba658b30341a7f8bb5c1fd2e59cdfc68d05969
-  data.tar.gz: b25c4f29a021b554b425d6d464971aed419e3021736730b696710c10e9804670
+  metadata.gz: 2cacfda4be0f9786225bb206cd63b4a1904867fb49383bb9b9f0e911cc948990
+  data.tar.gz: 3e973105f40419257f6a4555420286ef47955f74962e7798d6f329d7b5b47a01
 SHA512:
-  metadata.gz: 6c4b8398e71971b211bb7eb5a76f3d4acd2a274eb69cd9c6f33c8961e0824c8f9da3a34e7ae72c438ab9ddc5042f9a4e3aee53bf24c5ad07ce617b3bdba83eee
-  data.tar.gz: a0f2b3d8d0b1ddf1c0bccd5eeef2c818d8f81bf1a05eaa5e9f0a9bacd70368381d362343f5bc454023b258c238127664f4aaac709fe40feae03ae8b400f80f0c
+  metadata.gz: 7f30326a06444b4f746b129839a3e228d90cfe0237a26cb251d013e09a64ad9c20d530e7611d102082d1f2c252e19d748b058fab75f44649880395ccaa2fb1ec
+  data.tar.gz: 3b331d263956ff30f8da848ce249ea13a4b16f09a17dce7b70f01d37f92f516aaf2d9ecd4a0db65c5ffb053b02d6d1efa4d6197ad9abc7426a509627dcd70cf1

data/README.md

@@ -83,7 +83,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) *year* *your name*
+Copyright (c) 2013 - 2024 - The Foreman Team
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/controllers/concerns/insights_cloud/client_authentication.rb

@@ -17,7 +17,7 @@ module InsightsCloud
     end
 
     def subscribed_host_by_uuid(uuid)
-      @host = Host.unscoped.joins(:subscription_facet).where(:katello_subscription_facets => {:uuid => uuid }).first
+      @host = Host.unscoped.joins(:subscription_facet).where(:katello_subscription_facets => { :uuid => uuid }).first
     end
   end
 end

data/app/models/concerns/rh_cloud_host.rb

@@ -14,12 +14,12 @@ module RhCloudHost
 
     has_one :insights_client_report_status_object, :class_name => '::InsightsClientReportStatus', :foreign_key => 'host_id'
     scoped_search :relation => :insights_client_report_status_object, :on => :status, :rename => :insights_client_report_status,
-                  :complete_value => { :reporting => ::InsightsClientReportStatus::REPORTING,
-                                       :no_report => ::InsightsClientReportStatus::NO_REPORT }
+      :complete_value => { :reporting => ::InsightsClientReportStatus::REPORTING,
+                           :no_report => ::InsightsClientReportStatus::NO_REPORT }
 
     has_one :inventory_sync_status_object, :class_name => '::InventorySync::InventoryStatus', :foreign_key => 'host_id'
     scoped_search :relation => :inventory_sync_status_object, :on => :status, :rename => :insights_inventory_sync_status,
-                  :complete_value => { :disconnect => ::InventorySync::InventoryStatus::DISCONNECT,
-                                       :sync => ::InventorySync::InventoryStatus::SYNC }
+      :complete_value => { :disconnect => ::InventorySync::InventoryStatus::DISCONNECT,
+                           :sync => ::InventorySync::InventoryStatus::SYNC }
   end
 end

data/app/models/insights_client_report_status.rb

@@ -13,19 +13,19 @@ class InsightsClientReportStatus < HostStatus::Status
 
   def to_label(_options = {})
     case status
-      when REPORTING
-        N_('Reporting')
-      when NO_REPORT
-        N_('Not reporting')
+    when REPORTING
+      N_('Reporting')
+    when NO_REPORT
+      N_('Not reporting')
     end
   end
 
   def to_global(_options = {})
     case status
-      when REPORTING
-        ::HostStatus::Global::OK
-      when NO_REPORT
-        ::HostStatus::Global::ERROR
+    when REPORTING
+      ::HostStatus::Global::OK
+    when NO_REPORT
+      ::HostStatus::Global::ERROR
     end
   end
 

data/app/models/insights_facet.rb

@@ -4,5 +4,5 @@ class InsightsFacet < HostFacets::Base
     primary_key: :host_id,
     class_name: 'InsightsHit',
     dependent: :destroy
-  scope :for_organizations, ->(organization_ids) { joins(:host).where(hosts: { organization_id: organization_ids}) }
+  scope :for_organizations, ->(organization_ids) { joins(:host).where(hosts: { organization_id: organization_ids }) }
 end

data/app/models/insights_hit.rb

@@ -8,7 +8,7 @@ class InsightsHit < ApplicationRecord
   has_one :rule, class_name: 'InsightsRule', foreign_key: 'rule_id', primary_key: 'rule_id'
 
   scope :with_playbook, -> { joins(:rule) }
-  scope :for_organizations, ->(organization_ids) { joins(:host).where(hosts: { organization_id: organization_ids}) }
+  scope :for_organizations, ->(organization_ids) { joins(:host).where(hosts: { organization_id: organization_ids }) }
 
   scoped_search on: :title, complete_value: true
   scoped_search on: :total_risk, complete_value: true

data/app/models/inventory_sync/inventory_status.rb

@@ -20,10 +20,10 @@ module InventorySync
 
     def to_label
       case status
-        when DISCONNECT
-          N_('Host was not uploaded to your RH cloud inventory')
-        when SYNC
-          N_('Successfully uploaded to your RH cloud inventory')
+      when DISCONNECT
+        N_('Host was not uploaded to your RH cloud inventory')
+      when SYNC
+        N_('Successfully uploaded to your RH cloud inventory')
       end
     end
 

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -30,7 +30,8 @@ module ForemanRhCloud
             params: forward_params,
             user_agent: http_user_agent(original_request),
             content_type: original_request.media_type.presence || original_request.format.to_s,
-          }),
+          }
+        ),
       }
       base_params.merge(path_params(original_request.path, certs))
     end

data/app/services/foreman_rh_cloud/hit_remediations_retriever.rb

@@ -29,7 +29,7 @@ module ForemanRhCloud
     def remediations
       @remediations ||= Hash[
         InsightsResolution.where(id: remediation_ids).pluck(:id, :resolution_type, :rule_id).map do |id, resolution_type, rule_id|
-          [id, {resolution_type: resolution_type, rule_id: rule_id}]
+          [id, { resolution_type: resolution_type, rule_id: rule_id }]
         end
       ]
     end

data/config/routes.rb

@@ -47,8 +47,8 @@ Rails.application.routes.draw do
 
   # API routes
 
-  namespace :api, :defaults => {:format => 'json'} do
-    scope '(:apiv)', :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+  namespace :api, :defaults => { :format => 'json' } do
+    scope '(:apiv)', :module => :v2, :defaults => { :apiv => 'v2' }, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       resources :organizations, :only => [:show] do
         namespace 'rh_cloud' do
           get 'missing_hosts', to: 'inventory#get_hosts'

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -133,7 +133,7 @@ module ForemanInventoryUpload
 
       def uuid_value!(value)
         uuid = uuid_value(value)
-        raise Foreman::Exception.new(N_('Value %{value} is not a valid UUID') % {value: value}) if value && uuid.empty?
+        raise Foreman::Exception.new(N_('Value %{value} is not a valid UUID') % { value: value }) if value && uuid.empty?
 
         uuid
       end

data/lib/foreman_inventory_upload/generators/json_stream.rb

@@ -2,6 +2,7 @@ module ForemanInventoryUpload
   module Generators
     class JsonStream
       attr_reader :out
+
       def initialize(out)
         @out = out
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -47,6 +47,7 @@ module ForemanInventoryUpload
           @stream.simple_field('account', account_id(host.organization).to_s)
           @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
           @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
+          @stream.simple_field('convert2rhel_through_foreman', host.subscription_facet&.convert2rhel_through_foreman)
           @stream.simple_field('bios_uuid', bios_uuid(host))
           @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
           @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))

data/lib/foreman_rh_cloud/engine.rb

@@ -97,8 +97,8 @@ module ForemanRhCloud
                                                     generate a report, upload it to the cloud and download it locally'
 
         add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
-                                         Role::MANAGER => plugin_permissions,
-                                         Role::SYSTEM_ADMIN => plugin_permissions
+          Role::MANAGER => plugin_permissions,
+          Role::SYSTEM_ADMIN => plugin_permissions
 
         # Adding a sub menu after hosts menu
         divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu

data/lib/foreman_rh_cloud/version.rb

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

data/lib/foreman_rh_cloud.rb

@@ -94,13 +94,13 @@ module ForemanRhCloud
   # For testing purposes we can override the default hostname with an environment variable SATELLITE_RH_CLOUD_FOREMAN_HOST
   def self.foreman_host
     @foreman_host ||= begin
-                        fullname = foreman_host_name
-                        ::Host.unscoped.friendly.find(fullname)
-                      rescue ActiveRecord::RecordNotFound
-                        # fullname didn't work. Let's try shortname
-                        shortname = /(?<shortname>[^\.]*)\.?.*/.match(fullname)[:shortname]
-                        ::Host.unscoped.friendly.find(shortname)
-                      end
+      fullname = foreman_host_name
+      ::Host.unscoped.friendly.find(fullname)
+    rescue ActiveRecord::RecordNotFound
+      # fullname didn't work. Let's try shortname
+      shortname = /(?<shortname>[^\.]*)\.?.*/.match(fullname)[:shortname]
+      ::Host.unscoped.friendly.find(shortname)
+    end
   end
 
   def self.foreman_host_name

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -133,7 +133,7 @@ module InsightsCloud
           ]
         end.compact]
 
-        {task_state: {task_done_reported: task_done_state}, hosts_state: hosts_state}
+        { task_state: { task_done_reported: task_done_state }, hosts_state: hosts_state }
       end
 
       def task_status(host_task, host_name)

data/lib/insights_cloud/async/insights_generate_notifications.rb

@@ -41,7 +41,7 @@ module InsightsCloud
         Notification.create!(
           initiator: User.anonymous_admin,
           audience: ::Notification::AUDIENCE_ADMIN,
-          message: UINotifications::StringParser.new(blueprint.message, {hits_count: hits_count}).to_s,
+          message: UINotifications::StringParser.new(blueprint.message, { hits_count: hits_count }).to_s,
           notification_blueprint: blueprint,
           actions: {
             links: [

data/lib/insights_cloud/generators/playbook_progress_generator.rb

@@ -2,6 +2,7 @@ module InsightsCloud
   module Generators
     class PlaybookProgressGenerator
       attr_reader :correlation_id
+
       def initialize(correlation_id)
         @messages = []
         @correlation_id = correlation_id

data/package.json

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

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

@@ -42,7 +42,7 @@ module InsightsCloud::Api
         end.returns(res)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.expects(:cp_owner_id).returns('123')
 
-        post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => {"foo" => "bar"} }
+        post :forward_request, as: :json, params: { "path" => "static/v1/test", "machine_telemetry" => { "foo" => "bar" } }
         assert_equal @body, @response.body
       end
 
@@ -62,7 +62,7 @@ module InsightsCloud::Api
 
       test "should set etag header to response from cloud" do
         etag = '12345'
-        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org', :headers => { "If-None-Match": etag})
+        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org', :headers => { "If-None-Match": etag })
         net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
         net_http_resp[Rack::ETAG] = etag
         res = RestClient::Response.create(@body, net_http_resp, req)
@@ -107,6 +107,7 @@ module InsightsCloud::Api
 
     context '#branch_info' do
       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)
@@ -122,11 +123,13 @@ module InsightsCloud::Api
             FactoryBot.create(
               :katello_content_view_environment,
               content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env),
+              lifecycle_environment: @env
+            ),
             FactoryBot.create(
               :katello_content_view_environment,
               content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env2),
+              lifecycle_environment: @env2
+            ),
           ],
           organization: @env.organization
         )

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -14,7 +14,7 @@ module InventoryUpload::Api
         .expects(:start_report_generation)
         .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected}
+      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected }
 
       assert_response :success
     end

data/test/factories/inventory_upload_factories.rb

@@ -56,7 +56,7 @@ end
 
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % {n: n, r: rand(500)} }
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % { n: n, r: rand(500) } }
     facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/cloud_connector_announce_task_test.rb

@@ -60,8 +60,7 @@ class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
 
     template_invocation = FactoryBot.build(:template_invocation,
       :template => job_template,
-      :job_invocation => job_invocation
-    )
+      :job_invocation => job_invocation)
 
     template_invocation.input_values << FactoryBot.create(
       :template_invocation_input_value,

data/test/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -217,8 +217,7 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     template_invocation = FactoryBot.build(:template_invocation,
       :template => job_template,
-      :job_invocation => job_invocation
-    )
+      :job_invocation => job_invocation)
 
     template_invocation.input_values << FactoryBot.create(
       :template_invocation_input_value,

data/test/jobs/exponential_backoff_test.rb

@@ -27,7 +27,8 @@ class ExponentialBackoffTest < ActiveSupport::TestCase
       lambda do |instance|
         instance.done!
         raise ::Foreman::Exception('Foo')
-      end)
+      end
+    )
 
     ForemanTasks.sync_task(TestAction)
   end

data/test/test_plugin_helper.rb

@@ -117,3 +117,11 @@ module CandlepinIsolation
     end
   end
 end
+
+module UpstreamOnlySettingsTestHelper
+  def self.set_if_available(setting_name, value: true)
+    Setting[setting_name] = value
+  rescue Foreman::Exception
+    skip "Setting #{setting_name} is not available in Foreman"
+  end
+end

data/test/unit/rh_cloud_permissions_test.rb

@@ -10,5 +10,6 @@ class RhCloudPermissionsTest < ActiveSupport::TestCase
       'insights_cloud/api/machine_telemetries/forward_request',
       'insights_cloud/api/machine_telemetries/branch_info',
     ],
-    skip_patterns: [/^(?!foreman_inventory_upload|insights_cloud|.*rh_cloud).*/]) # include only plugin paths
+    skip_patterns: [/^(?!foreman_inventory_upload|insights_cloud|.*rh_cloud).*/]
+  ) # include only plugin paths
 end

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

@@ -15,7 +15,7 @@ class HitRemediationsRetrieverTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_facet, uuid: 'HOST2', host_id: @host2.id)
     host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
 
-    pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation1.id}]
+    pairs = [{ 'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id }, { 'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation1.id }]
     retriever = ForemanRhCloud::HitRemediationsRetriever.new(pairs)
 
     actual_request = retriever.send(:playbook_request)
@@ -38,7 +38,7 @@ class HitRemediationsRetrieverTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_facet, uuid: 'HOST2', host_id: @host2.id)
     host2_hit1 = FactoryBot.create(:insights_hit, rule_id: rule1.rule_id, host_id: @host2.id)
 
-    pairs = [{'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id}, {'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation2.id}]
+    pairs = [{ 'hit_id' => host1_hit1.id, 'resolution_id' => rule1_remediation1.id }, { 'hit_id' => host2_hit1.id, 'resolution_id' => rule1_remediation2.id }]
     retriever = ForemanRhCloud::HitRemediationsRetriever.new(pairs)
 
     actual_request = retriever.send(:playbook_request)

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

@@ -20,7 +20,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     hit = FactoryBot.create(:insights_hit, rule: rule, host_id: @host1.id)
     remediation = FactoryBot.create(:insights_resolution, rule: rule)
 
-    pairs = [{hit_id: hit.id, remediation_id: remediation.id}].to_json
+    pairs = [{ hit_id: hit.id, remediation_id: remediation.id }].to_json
 
     actual_playbook = remediations_playbook(pairs)
 

data/test/unit/tags_generator_test.rb

@@ -5,6 +5,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   include CandlepinIsolation
 
   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)
@@ -28,11 +29,13 @@ class TagsGeneratorTest < ActiveSupport::TestCase
         FactoryBot.create(
           :katello_content_view_environment,
           content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env),
+          lifecycle_environment: env
+        ),
         FactoryBot.create(
           :katello_content_view_environment,
           content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env2),
+          lifecycle_environment: env2
+        ),
       ]
     )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.14.0.rc1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.14.0.rc1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
 description: Foreman plugin that process & upload data to Red Hat Cloud
 email:
 - rlavi@redhat.com, sshtein@redhat.com