foreman_rh_cloud 12.2.3 → 12.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2002305657053ddee42c958f1050b73e0d6b83bc9a41acadff095d216b07899
-  data.tar.gz: 5d4e414ae8ce2e25a4f3d845c226fe64e808471dd3ef96161f414f36ba0d1190
+  metadata.gz: 2081fbfa1331d1d17e96c000bfad7990a679973d5702ae47bc9f544591d1b27a
+  data.tar.gz: 5e33001a27be919fa1394b235ee4374ef8e8b7086eaffa898ddcd601acca5933
 SHA512:
-  metadata.gz: f8a0ec3ca0ce175a0f72a81a12a7b2457e6f68f894fa91434decd92e6bd484cbcb467538376dc41180dbf6cd65ef344fe121ec7d0c6dba7095095f779b0239cb
-  data.tar.gz: e60d883392d906b2de8d439989ed89062f4cceab79a46382229fec503d541209cc921ebcd09ed0b860418ef55df37771eb2388519ab81b43d0dbf27897623bb6
+  metadata.gz: d04457f59d4c0a027dcd87f996efb850e04db2f123753f5636c134f4e8c0c04226e96854bcb686a7200f83b4ee32fe75deba2c9af6680009dfb2e70a816502f8
+  data.tar.gz: 716f79c957a3a563374ba257f623b34bfdf30a5ef1a29f5404994cef658146e26d01fb0a52cf218d307734de85edce662f4ea63eb55c88de149b1c5bfd5d5899

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -253,7 +253,6 @@ module ForemanInventoryUpload
 
       def report_yum_repos(host)
         return unless host&.content_facet&.bound_repositories&.any?
-        return unless ForemanRhCloud.with_iop_smart_proxy?
 
         @stream.array_field('yum_repos') do
           host.content_facet.bound_repositories.each_with_index do |repo, index|

data/lib/foreman_inventory_upload.rb

@@ -58,7 +58,7 @@ module ForemanInventoryUpload
 
   def self.upload_url
     # for testing set ENV to 'https://ci.cloud.redhat.com/api/ingress/v1/upload'
-    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cert.cloud.redhat.com/api/ingress/v1/upload'
+    ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || "#{ForemanRhCloud.cert_base_url}/api/ingress/v1/upload"
   end
 
   def self.slice_size

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.3'.freeze
+  VERSION = '12.2.5'.freeze
 end

data/package.json

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

data/test/unit/slice_generator_test.rb

@@ -999,7 +999,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports yum repos' do
-    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
     FactoryBot.create(:katello_content, cp_content_id: '1', organization: @host.organization, name: 'Test Content', label: 'test-content')
     repo = FactoryBot.build(
       :katello_repository,

data/webpack/ForemanColumnExtensions/index.js

@@ -6,7 +6,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { CVECountCell } from '../InsightsVulnerabilityHostIndexExtensions/CVECountCell';
 
-const HostedRecommendationsCell = hostDetails => {
+const HostedRecommendationsCell = ({ hostDetails }) => {
   const insightsAttributes = propsToCamelCase(
     // eslint-disable-next-line camelcase
     hostDetails?.insights_attributes ?? {}
@@ -19,6 +19,10 @@ const HostedRecommendationsCell = hostDetails => {
   return <a href={hitsUrl}>{hitsCount}</a>;
 };
 
+HostedRecommendationsCell.propTypes = {
+  hostDetails: PropTypes.object.isRequired,
+};
+
 const IopRecommendationsCell = ({ hostDetails }) => {
   // eslint-disable-next-line camelcase
   const uuid = hostDetails?.insights_attributes?.uuid;

data/webpack/ForemanRhCloudFills.js

@@ -21,7 +21,7 @@ const fills = [
     weight: 400,
     metadata: {
       hideTab: isNotRhelHost,
-      title: __('Insights'),
+      title: __('Recommendations'),
     },
   },
   {

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js

@@ -3,8 +3,10 @@ import React from 'react';
 import { orderBy } from 'lodash';
 import Resolutions from './Resolutions';
 
-export const getResolutionId = (selectedResolution, id) =>
-  `${id}_${selectedResolution}`;
+export const getResolutionId = (selectedResolution, id, isIop = true) => {
+  if (isIop) return `${id}_${selectedResolution}`;
+  return selectedResolution;
+};
 
 export const modifyRows = (
   remediations,
@@ -25,20 +27,26 @@ export const modifyRows = (
     const selectedResolution = resolutions[0]?.id;
     /* eslint-disable spellcheck/spell-checker */
 
-    // For IoP: {
-    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d",
+    // For IoP:
+    // All of the values will be plain strings
+    // {
+    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d", <-- this refers to a host by insights ID
     //  rule_id: "hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE",
     //  resolution_type: "less_secure",
-    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure",
+    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure", <-- joined rule id and resolution type
     // }
-    // for Hosted, hit_id and rule_id will be Foreman database IDs
+    // For non-IoP:
+    // All of the values will be numeric Foreman database IDs
+    // hit_id refers to an InsightsHit
+    // rule_id refers to an InsightsRule
+    // resolution_type and resolution_id both refer to an InsightsResolution (InsightsHit.find(xx).rule.resolutions)
 
     /* eslint-enable spellcheck/spell-checker */
     resolutionToSubmit.push({
       hit_id: isIop ? host_id : id,
       rule_id: id,
       resolution_type: selectedResolution /** defaults to the first resolution if many */,
-      resolution_id: getResolutionId(selectedResolution, id),
+      resolution_id: getResolutionId(selectedResolution, id, isIop),
     });
     return {
       cells: [

data/webpack/InsightsCloudSync/Components/RemediationModal/Resolutions.js

@@ -22,7 +22,7 @@ const Resolutions = ({
           key={resolution_id}
           ouiaId={`resolution-radio-${resolution_id}`}
           className="resolution-radio"
-          id={resolution_id}
+          id={`${hit_id}_${resolution_id}`}
           isChecked={resolution_id === checkedID}
           onChange={() =>
             setResolutions(stateRes =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.3
+  version: 12.2.5
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team