foreman_rh_cloud 5.0.33 → 5.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc3c3d4f7552bd3c599539ccb241473e38654c058ad4951e0e668b20d4648c67
-  data.tar.gz: 4545a0307c6eb685c2f84543530af13a25c984d605b9fcb01b1e3eb82c3618f2
+  metadata.gz: '0389d4bf9e9af791b23a3ea7b271feca1385e2fcf4fc6acc7d954283477c8706'
+  data.tar.gz: 839cc45d7b92a308841f995152ae4a68503acd69feb95cd95b19772f99cec6c9
 SHA512:
-  metadata.gz: a147e2ceb11d2834af97ca954ea8c839bfe663a684fdac16e309ee4f003d3509f38dde84b75e3b06d837de390336541eb7b6c08259dfa9871d681a98cc717363
-  data.tar.gz: b176f027e036d865cdf31541af29fc09487407e3f8c95e83bb2c76a3989360e35939762e52de75d0a9df260eb7931ac5b0ca69fa32fe88d496896893103c2a9d
+  metadata.gz: 7b37d242c63e0260a76d06a6096ac569423237bf62f6e8685f79d6cf7b3e85246cfa92f35f0907a18b10539deb09f991189ea5914fa519236786aa2456e8aed6
+  data.tar.gz: e2baeab2eceeae447276db3ce9c8fa6c7236ff082eab418b835afea4c97ea9172a86eabeeb8ba430012f9662c26bd5a95cc86cc5f45e67a8f6ee4bb2d3a76ac8

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

@@ -37,8 +37,13 @@ module InsightsCloud::Api
         return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
       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)
-      assign_header(response, @cloud_response, :x_rh_insights_request_id, false)
+      headers[Rack::ETAG] = @cloud_response.headers[:etag]
 
       render json: @cloud_response, status: @cloud_response.code
     end

data/app/controllers/insights_cloud/hits_controller.rb

@@ -14,9 +14,16 @@ module InsightsCloud
 
     def show
       host = Host.where(id: host_id_param).first
+      hits = host.insights&.hits
+
+      unless hits
+        return render json: {
+          error: 'No recommendations were found for this host',
+        }, status: :not_found
+      end
 
       render json: {
-        hits: host.insights.hits,
+        hits: hits,
       }, status: :ok
     end
 

data/app/services/foreman_rh_cloud/cloud_connector.rb

@@ -16,7 +16,7 @@ module ForemanRhCloud
         composer = ::JobInvocationComposer.for_feature(
           CLOUD_CONNECTOR_FEATURE,
           [target_host.id],
-          {:satellite_user => service_user.login, :satellite_password => token_value}
+          {:satellite_cloud_connector_user => service_user.login, :satellite_cloud_connector_password => token_value}
         )
         composer.trigger!
       end

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -25,11 +25,12 @@ module ForemanRhCloud
       base_params = {
         method: original_request.method,
         payload: forward_payload,
-        headers: {
-          params: forward_params,
-          user_agent: http_user_agent(original_request),
-          content_type: original_request.media_type.presence || original_request.format.to_s,
-        },
+        headers: original_headers(original_request).merge(
+          {
+            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
@@ -80,6 +81,16 @@ module ForemanRhCloud
       end
     end
 
+    def original_headers(original_request)
+      headers = {
+        if_none_match: original_request.if_none_match,
+        if_modified_since: original_request.if_modified_since,
+      }.compact
+
+      logger.debug("Sending headers: #{headers}")
+      headers
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/views/job_templates/cloud_connector.erb

@@ -0,0 +1,30 @@
+<%#
+name: Configure Cloud Connector
+snippet: false
+template_inputs:
+- name: satellite_cloud_connector_user
+  required: true
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+- name: satellite_cloud_connector_password
+  required: true
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: true
+model: JobTemplate
+job_category: Maintenance Operations
+description_format: "%{template_name}"
+provider_type: Ansible
+kind: job_template
+feature: ansible_configure_cloud_connector
+%>
+
+---
+- hosts: all
+  vars:
+    satellite_cloud_connector_url: "<%= foreman_server_url %>"
+  roles:
+    - redhat.satellite_operations.cloud_connector

data/lib/foreman_rh_cloud/engine.rb

@@ -156,6 +156,13 @@ module ForemanRhCloud
           host_action_button: false,
           provided_inputs: ['playbook_url', 'report_url', 'correlation_id', 'report_interval']
         )
+        RemoteExecutionFeature.register(
+          :ansible_configure_cloud_connector,
+          N_('Configure Cloud Connector on given hosts'),
+          :description => N_('Configure Cloud Connector on given hosts'),
+          :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+        )
+
         # skip object creation when admin user is not present, for example in test DB
         if User.unscoped.find_by_login(User::ANONYMOUS_ADMIN).present?
           ::ForemanTasks.dynflow.config.on_init(false) do |world|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.33'.freeze
+  VERSION = '5.0.34'.freeze
 end

data/package.json

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

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js

@@ -8,8 +8,11 @@ import {
   INSIGHTS_SET_SELECTED_IDS,
   INSIGHTS_SET_SELECT_ALL_ALERT,
   INSIGHTS_SET_SELECT_ALL,
-  NEW_HOST_PATH,
 } from './InsightsTableConstants';
+import {
+  getServerQueryForHostname,
+  isNewHostPage,
+} from './InsightsTableHelpers';
 
 export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
   const state = getState();
@@ -34,13 +37,7 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     dispatch(setSelectAllAlert(false));
   }
 
-  let search = query;
-  if (isNewHostPage(uri)) {
-    const hostname = uri.pathname().split('/new/hosts/')[1];
-    const hostQuery = `hostname = ${hostname}`;
-    const q = query?.trim();
-    search = q ? `${hostQuery} AND (${q})` : hostQuery;
-  }
+  const search = getServerQueryForHostname(query);
 
   return dispatch(
     get({
@@ -151,11 +148,9 @@ const setSelectAllUrl = selectAllValue => dispatch => {
 
 const updateUrl = (uri, dispatch) => {
   const nextUrlParams = { search: uri.search() };
-  if (isNewHostPage(uri)) {
+  if (isNewHostPage()) {
     // we need to keep the hash so the insights tab will remain selected in the new host details page.
     nextUrlParams.hash = '/Insights';
   }
   dispatch(push(nextUrlParams));
 };
-
-const isNewHostPage = uri => uri.pathname().includes(NEW_HOST_PATH);

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableHelpers.js

@@ -1,4 +1,7 @@
 /* eslint-disable camelcase */
+import URI from 'urijs';
+import { NEW_HOST_PATH } from './InsightsTableConstants';
+
 export const modifySelectedRows = (
   hits,
   selectedIds,
@@ -54,3 +57,22 @@ export const getPerPageOptions = (urlPerPage, appPerPage) => {
   const options = [...initialValues].sort((a, b) => a - b);
   return options.map(value => ({ title: value.toString(), value }));
 };
+
+export const isNewHostPage = () => {
+  const uri = new URI();
+  const pathname = uri.pathname();
+  const isIncluded = pathname.includes(NEW_HOST_PATH);
+  return isIncluded ? pathname.split('/new/hosts/')[1] : false; // return hostname or false
+};
+
+// return query or specific hostname with query if it's in the new host page.
+export const getServerQueryForHostname = query => {
+  const isNewHost = isNewHostPage();
+  let serverQuery = query;
+  if (isNewHost) {
+    const hostQuery = `hostname = ${isNewHost}`;
+    const q = query?.trim();
+    serverQuery = q ? `${hostQuery} AND (${q})` : hostQuery;
+  }
+  return serverQuery;
+};

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

@@ -1,4 +1,5 @@
 import { get } from 'foremanReact/redux/API';
+import { getServerQueryForHostname } from '../InsightsTable/InsightsTableHelpers';
 import {
   REMEDIATIONS_API_KEY,
   REMEDIATIONS_PATH,
@@ -8,5 +9,9 @@ export const fetchRemediations = ({ selectedIds, isAllSelected, query }) =>
   get({
     key: REMEDIATIONS_API_KEY,
     url: REMEDIATIONS_PATH,
-    params: { ids: Object.keys(selectedIds), isAllSelected, query },
+    params: {
+      ids: Object.keys(selectedIds),
+      isAllSelected,
+      query: getServerQueryForHostname(query),
+    },
   });

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -19,10 +19,11 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   const dispatch = useDispatch();
   const API_KEY = `HOST_${id}_RECOMMENDATIONS`;
   const API_OPTIONS = useMemo(() => ({ key: API_KEY }), [API_KEY]);
+  const url = id && insightsCloudUrl(`hits/${id}`); // This will keep the API call from being triggered if there's no host id.
   const {
     status = STATUS.PENDING,
     response: { hits = [] },
-  } = useAPI('get', insightsCloudUrl(`hits/${id}`), API_OPTIONS);
+  } = useAPI('get', url, API_OPTIONS);
 
   useEffect(() => {
     if (status === STATUS.RESOLVED) {
@@ -116,7 +117,7 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
 
   return (
     <CardTemplate
-      header={__('Total Risks')}
+      header={__('Total risks')}
       dropdownItems={[
         <DropdownItem
           key="insights-tab"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.33
+  version: 5.0.34
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -176,6 +176,7 @@ files:
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
 - app/services/foreman_rh_cloud/url_remediations_retriever.rb
 - app/views/hosts/_insights_tab.html.erb
+- app/views/job_templates/cloud_connector.erb
 - app/views/job_templates/rh_cloud_download_playbook.erb
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb