foreman_rh_cloud 13.2.10 → 13.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4301f698357e719f6ba5d08677bdeaf3ccefb995835dcf86f3e253cb0c01d599
-  data.tar.gz: 77f3bc1ef3e85cc1d8988a53f2cd5fdcd65b99a9fb6d6da1cc5f366bbfebc6d3
+  metadata.gz: 2139dff816242e974e133f964b393409a65962f4dc5a5de0651b85d1d3c4bcb7
+  data.tar.gz: f362df63107b1a8834c6984654bedef584875e6d1d226dcab130c1d8fa11d181
 SHA512:
-  metadata.gz: 000fad5efc5a8bd42e03045e33bc10795a5d658aa3ef1098e6f95fa2a0476630cc85fe6b7b40929e817a4ca0d166fd88c8073b4faa972b72a84d0a146eb7aa70
-  data.tar.gz: 06fe93496e585831f593b8d31223577eb236adf7d1e4d90342cd203ddc9fbf9a80e9b58636b033fa04adefc806885feba8326a4e34dc38844bbaacd083df9c91
+  metadata.gz: 1a06fbaad9e79093b83f8ac8454ffcbf0ffa875f1978ef04697b8cfcf58c0a35812a7eee649f08b45df4c938a20e6784bffcba5bbc702c73a5bf224fe8958b47
+  data.tar.gz: d5c4b920bc78b449ddca4b080be077a24c3766950de46f30f9611745a85927e37e44c18d7aea6223b91e2faa4e3a6eb39fe9fab139207d9c73a1917c6910b0cd

data/app/models/concerns/rh_cloud_host.rb

@@ -10,7 +10,8 @@ module RhCloudHost
     )
 
     has_many :insights_hits, through: :insights, source: :hits
-    scoped_search :relation => :insights, :on => :hits_count, :only_explicit => true, :rename => :insights_recommendations_count
+    scoped_search :on => :id, :rename => :insights_recommendations_count, :only_explicit => true,
+      :ext_method => :search_by_insights_recommendations_count, :complete_value => false
 
     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,
@@ -46,6 +47,40 @@ module RhCloudHost
   end
 
   module ClassMethods
+    def search_by_insights_recommendations_count(_key, operator, value)
+      if ForemanRhCloud.with_iop_smart_proxy?
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Searching by recommendations count is not available in IoP mode.')
+        )
+      end
+
+      unless ScopedSearch::QueryBuilder::SQL_OPERATORS.value?(operator)
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Unsupported operator for recommendations count search: %s') % operator
+        )
+      end
+
+      facet_table = InsightsFacet.table_name
+      hits_count_col = "COALESCE(#{facet_table}.hits_count, 0)"
+
+      if ['IN', 'NOT IN'].include?(operator)
+        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
+        placeholders = (['?'] * values.size).join(',')
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} (#{placeholders})", *values]
+        )
+      else
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} ?", value_to_sql(operator, value)]
+        )
+      end
+
+      {
+        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
+        conditions: condition,
+      }
+    end
+
     def search_by_insights_uuid(_key, operator, value)
       # Determine which facet table to search based on IoP mode
       facet_table = ForemanRhCloud.with_iop_smart_proxy? ? Katello::Host::SubscriptionFacet.table_name : InsightsFacet.table_name

data/app/services/foreman_rh_cloud/url_remediations_retriever.rb

@@ -1,11 +1,24 @@
 module ForemanRhCloud
   class URLRemediationsRetriever < RemediationsRetriever
-    attr_reader :url, :payload, :headers
+    attr_reader :url, :headers
 
     def initialize(url:, organization_id:, payload: '', headers: {}, logger: Logger.new(IO::NULL))
       super(logger: logger)
 
-      @url = url
+      parsed_url = URI.parse(url)
+      query_params = parsed_url.query ? CGI.parse(parsed_url.query) : {}
+      hosts_param = query_params.delete('hosts')
+
+      if hosts_param.present?
+        @host_uuids = hosts_param.flat_map { |v| v.split(',') }.map(&:strip).reject(&:blank?)
+        @host_uuids = nil if @host_uuids.empty?
+        parsed_url.query = query_params.any? ? URI.encode_www_form(query_params) : nil
+        @url = parsed_url.to_s
+      else
+        @host_uuids = nil
+        @url = url
+      end
+
       @payload = payload
       @headers = headers
       @organization_id = organization_id
@@ -14,7 +27,7 @@ module ForemanRhCloud
     private
 
     def query_playbook
-      logger.debug("Querying playbook at: #{url} with payload: #{payload} and headers: #{headers}")
+      logger.debug("Querying playbook via #{method.to_s.upcase} at: #{url} with payload: #{payload} and headers: #{headers}")
 
       super
     end
@@ -28,11 +41,12 @@ module ForemanRhCloud
     end
 
     def payload
-      @payload.present? ? @payload.to_json : @payload # don't run .to_json if @payload is ''
+      return @host_uuids.to_json if @host_uuids.present?
+      @payload.present? ? @payload.to_json : @payload
     end
 
     def method
-      :get
+      @host_uuids.present? ? :post : :get
     end
 
     def organization

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -59,11 +59,13 @@ module ForemanInventoryUpload
       def try_execute
         if content_disconnected?
           logger.info("Upload canceled: connection to Insights is not enabled. Report location: #{filename}")
+          done!
           return
         end
 
         unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
           logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          done!
           return
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.10'.freeze
+  VERSION = '13.2.11'.freeze
 end

data/package.json

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

data/test/jobs/upload_report_direct_job_test.rb

@@ -401,4 +401,33 @@ class UploadReportDirectJobTest < ActiveSupport::TestCase
       file.close
     end
   end
+
+  test 'mark as done when upload aborted due to missing certificate' do
+    # Remove certificate from organization
+    Organization.any_instance.stubs(:owner_details).returns({})
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
+
+  test 'mark as done when upload aborted due to disconnected mode' do
+    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(false)
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
 end

data/test/unit/insights_facet_test.rb

@@ -6,6 +6,10 @@ class InsightsFacetTest < ActiveSupport::TestCase
     InsightsFacet.reset_counters(@host.insights.id, :hits_count)
   end
 
+  teardown do
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+  end
+
   test 'host with hits can be deleted' do
     assert_equal 1, @host.insights.hits.count
 
@@ -16,6 +20,7 @@ class InsightsFacetTest < ActiveSupport::TestCase
   end
 
   test 'search host by recommendations_count' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
     FactoryBot.create(:host) # create another host with no recommendations
 
     assert_equal 1, Host.search_for('insights_recommendations_count = 1').count

data/test/unit/rh_cloud_host_test.rb

@@ -343,6 +343,74 @@ class RhCloudHostTest < ActiveSupport::TestCase
     end
   end
 
+  context 'scoped search on insights_recommendations_count' do
+    setup do
+      @org = FactoryBot.create(:organization)
+    end
+
+    teardown do
+      ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    end
+
+    test 'searches insights_facets.hits_count in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'supports greater-than operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count > 0')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'raises QueryNotSupported in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+      error = assert_raises(ScopedSearch::QueryNotSupported) do
+        Host::Managed.search_for('insights_recommendations_count = 1')
+      end
+
+      assert_match(/not available in IoP mode/, error.message)
+    end
+
+    test 'supports IN operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count ^ (1,2,3)')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'handles hosts without insights facets in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_without_facet = FactoryBot.create(:host, :managed, organization: @org)
+      host_with_facet = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_facet.insights.id, :hits_count)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_facet
+      assert_not_includes results, host_without_facet
+    end
+  end
+
   test 'scoped search for user_omitted inventory status works' do
     host1 = FactoryBot.create(:host, :managed)
     host2 = FactoryBot.create(:host, :managed)

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

@@ -1,8 +1,8 @@
 require 'test_plugin_helper'
 
 class URLRemediationsRetrieverTest < ActiveSupport::TestCase
-  test 'Calls the given url' do
-    retreiver = ForemanRhCloud::URLRemediationsRetriever.new(
+  test 'Calls the given url with GET when no hosts in URL' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
       organization_id: FactoryBot.create(:organization).id,
       url: 'http://test.example.com',
       payload: 'TEST_PAYLOAD',
@@ -11,19 +11,96 @@ class URLRemediationsRetrieverTest < ActiveSupport::TestCase
       }
     )
 
-    retreiver.stubs(:cert_auth_available?).returns(true)
+    retriever.stubs(:cert_auth_available?).returns(true)
 
     response = mock('response')
     response.stubs(:body).returns('TEST_RESPONSE')
-    retreiver.expects(:execute_cloud_request).with do |params|
+    retriever.expects(:execute_cloud_request).with do |params|
       params[:method] == :get &&
       params[:url] == 'http://test.example.com' &&
       params[:headers][:custom1] == 'TEST_HEADER' &&
       params[:payload] == "\"TEST_PAYLOAD\""
     end.returns(response)
 
-    actual = retreiver.create_playbook
+    actual = retriever.create_playbook
 
     assert_equal 'TEST_RESPONSE', actual
   end
+
+  test 'Uses POST with hosts in body when URL contains hosts query param' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2,uuid-3'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2', 'uuid-3']
+    end.returns(response)
+
+    actual = retriever.create_playbook
+
+    assert_equal 'TEST_PLAYBOOK', actual
+  end
+
+  test 'Preserves other query params when extracting hosts' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2&localhost=false'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url].include?('localhost=false') &&
+      !params[:url].include?('hosts=') &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Merges multiple hosts query params into a single array' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1&hosts=uuid-2'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Falls back to GET when hosts query param is empty' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts='
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :get
+    end.returns(response)
+
+    retriever.create_playbook
+  end
 end

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/__tests__/EmptyResults.test.js

@@ -1,13 +1,14 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import EmptyResults from '../EmptyResults';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('EmptyResults', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(EmptyResults, fixtures));
+  it('renders the empty results message', () => {
+    render(<EmptyResults />);
+    expect(
+      screen.getByText(
+        "Oops! Couldn't find organization that matches your query"
+      )
+    ).toBeTruthy();
+  });
 });

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/__tests__/EmptyState.test.js

@@ -1,13 +1,17 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import EmptyState from '../EmptyState';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('EmptyState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(EmptyState, fixtures));
+  it('renders fetching data message', () => {
+    render(<EmptyState />);
+    expect(
+      screen.getByText('Fetching data about your accounts')
+    ).toBeTruthy();
+  });
+
+  it('renders loading indicator', () => {
+    render(<EmptyState />);
+    expect(screen.getByText('Loading...')).toBeTruthy();
+  });
 });

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/__tests__/ErrorState.test.js

@@ -1,13 +1,24 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import ErrorState from '../ErrorState';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('ErrorState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ErrorState, fixtures));
+  it('renders the error message heading', () => {
+    render(<ErrorState error="Something went wrong" />);
+    expect(
+      screen.getByText(
+        'Encountered an error while trying to access the server:'
+      )
+    ).toBeTruthy();
+  });
+
+  it('renders the error description', () => {
+    render(<ErrorState error="Connection refused" />);
+    expect(screen.getByText('Connection refused')).toBeTruthy();
+  });
+
+  it('renders with empty error by default', () => {
+    const { container } = render(<ErrorState />);
+    expect(container.querySelector('.error_description')).toBeTruthy();
+  });
 });

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/ListItem.test.js

@@ -1,13 +1,36 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { Accordion } from '@patternfly/react-core';
 import ListItem from '../ListItem';
-import { props } from '../ListItem.fixtures';
 
-const fixtures = {
-  'render with Props': props,
-};
+jest.mock('../../../../Dashboard', () => () => null);
+
+const renderListItem = props =>
+  render(
+    <Accordion>
+      <ListItem {...props} />
+    </Accordion>
+  );
 
 describe('ListItem', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ListItem, fixtures));
+  const defaultProps = {
+    label: 'test-org',
+    account: {
+      generated_status: 'unknown',
+      uploaded_status: 'unknown',
+      id: 1,
+    },
+  };
+
+  it('renders the account label', () => {
+    renderListItem(defaultProps);
+    expect(screen.getByText('test-org')).toBeTruthy();
+  });
+
+  it('renders Generated and Uploaded status labels', () => {
+    renderListItem(defaultProps);
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
+
 });

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/ListItemStatus.test.js

@@ -1,14 +1,30 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import ListItemStatus from '../ListItemStatus';
-import { props } from '../ListItemStatus.fixtures';
-
-const fixtures = {
-  'render without Props': {},
-  'render with Props': props,
-};
 
 describe('ListItemStatus', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ListItemStatus, fixtures));
+  it('renders Generated and Uploaded labels', () => {
+    render(<ListItemStatus />);
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
+
+  it('shows dash placeholders for unknown status', () => {
+    render(
+      <ListItemStatus
+        account={{ generated_status: 'unknown', uploaded_status: 'unknown' }}
+      />
+    );
+    expect(screen.getAllByText('--')).toHaveLength(2);
+  });
+
+  it('renders with provided account statuses', () => {
+    render(
+      <ListItemStatus
+        account={{ generated_status: 'success', uploaded_status: 'running' }}
+      />
+    );
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
 });

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountList.test.js

@@ -1,14 +1,38 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import AccountList from '../AccountList';
-import { props } from '../AccountList.fixtures';
+import { accounts } from '../AccountList.fixtures';
 
-const fixtures = {
-  'render with props': props,
-  'show empty results': { ...props, filterTerm: 'not_matching_term' },
-};
+jest.mock('../Components/ListItem', () => ({ label }) => (
+  <div>{label}</div>
+));
 
 describe('AccountList', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(AccountList, fixtures));
+  it('renders account labels', () => {
+    render(<AccountList accounts={accounts} />);
+    Object.keys(accounts).forEach(label => {
+      expect(screen.getByText(label)).toBeTruthy();
+    });
+  });
+
+  it('shows empty results when filterTerm matches nothing', () => {
+    render(<AccountList accounts={accounts} filterTerm="not_matching_term" />);
+    expect(
+      screen.getByText(
+        "Oops! Couldn't find organization that matches your query"
+      )
+    ).toBeTruthy();
+  });
+
+  it('shows empty state when accounts are empty', () => {
+    render(<AccountList accounts={{}} />);
+    expect(
+      screen.getByText('Fetching data about your accounts')
+    ).toBeTruthy();
+  });
+
+  it('shows error state when error is present', () => {
+    render(<AccountList accounts={{}} error="Server error" />);
+    expect(screen.getByText('Server error')).toBeTruthy();
+  });
 });