foreman_rh_cloud 4.0.25 → 4.0.25.1

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

@@ -2,41 +2,10 @@ require 'test_plugin_helper'
 require 'puma/null_io'
 
 class CloudRequestForwarderTest < ActiveSupport::TestCase
+  include MockCerts
+
   setup do
     @forwarder = ::ForemanRhCloud::CloudRequestForwarder.new
-
-    @cert1 = "-----BEGIN CERTIFICATE-----\r\n" +
-      "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\r\n" +
-      "osxMtcaZZ1E=\r\n" +
-      "-----END CERTIFICATE-----"
   end
 
   test 'should prepare correct cloud url' do
@@ -51,7 +20,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     }
 
     paths.each do |key, value|
-      actual_params = @forwarder.path_params(key, { cert: @cert1, key: OpenSSL::PKey::RSA.new(1024).to_pem })
+      actual_params = @forwarder.path_params(key, generate_certs_hash)
       assert_equal value, actual_params[:url]
     end
   end

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

@@ -0,0 +1,66 @@
+require 'test_plugin_helper'
+
+class CloudStatusServiceTest < ActiveSupport::TestCase
+  include MockCerts
+
+  setup do
+  end
+
+  test 'generates ping response for each org' do
+    organizations = FactoryBot.create_list(:organization, 2)
+
+    ForemanRhCloud::CloudPingService::TokenPing.any_instance.expects(:execute_cloud_request).returns(
+      RestClient::Response.new('TEST RESPONSE')
+    )
+
+    setup_certs_expectation do
+      ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:candlepin_id_cert).with(organizations[0])
+    end
+    ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:execute_cloud_request).returns(
+      RestClient::Response.new('TEST RESPONSE ORG 0')
+    )
+
+    setup_certs_expectation do
+      ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:candlepin_id_cert).with(organizations[1])
+    end
+
+    ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:execute_cloud_request).returns(
+      RestClient::Response.new('TEST RESPONSE ORG 1')
+    )
+
+    service = ForemanRhCloud::CloudPingService.new(organizations, nil)
+    actual = service.ping
+
+    assert actual[:token_auth][:success]
+    assert_nil actual[:token_auth][:error]
+    assert actual[:cert_auth][organizations[0]][:success]
+    assert_nil actual[:cert_auth][organizations[0]][:error]
+    assert actual[:cert_auth][organizations[1]][:success]
+    assert_nil actual[:cert_auth][organizations[1]][:error]
+  end
+
+  test 'generates ping error response for org and token' do
+    organizations = FactoryBot.create_list(:organization, 1)
+
+    ForemanRhCloud::CloudPingService::TokenPing.any_instance.expects(:execute_cloud_request).raises(
+      RuntimeError,
+      'TEST RESPONSE TOKEN'
+    )
+
+    setup_certs_expectation do
+      ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:candlepin_id_cert).with(organizations[0])
+    end
+    ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:execute_cloud_request).raises(
+      RuntimeError,
+      'TEST RESPONSE ORG 0'
+    )
+
+    service = ForemanRhCloud::CloudPingService.new(organizations, nil)
+    actual = service.ping
+
+    refute actual[:token_auth][:success]
+    assert_match /TEST RESPONSE TOKEN/, actual[:token_auth][:error]
+    refute actual[:cert_auth][organizations[0]][:success]
+    assert_match /TEST RESPONSE ORG 0/, actual[:cert_auth][organizations[0]][:error]
+  end
+end

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.scss

@@ -10,9 +10,5 @@
       margin-top: 0;
       font-weight: 600;
     }
-
-    .foreman-switcher {
-      display: block;
-    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js

@@ -9,14 +9,18 @@ import {
   INVENTORY_PAGE_TITLE,
   ACTIONS_HISTORY_BUTTON_TEXT,
   DOCS_BUTTON_TEXT,
+  CLOUD_PING_TITLE,
 } from '../../ForemanInventoryConstants';
 import {
   getActionsHistoryUrl,
   getInventoryDocsUrl,
 } from '../../ForemanInventoryHelpers';
+import CloudPingModal from './components/CloudPingModal';
 
 const PageTitle = () => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const [showPingModal, setPingModal] = useState(false);
+  const togglePingModal = () => setPingModal(v => !v);
   const dropdownItems = [
     <DropdownItem
       key="tasks-history-button"
@@ -34,6 +38,9 @@ const PageTitle = () => {
     >
       {DOCS_BUTTON_TEXT}
     </DropdownItem>,
+    <DropdownItem key="cloud-ping" onClick={togglePingModal}>
+      {CLOUD_PING_TITLE}
+    </DropdownItem>,
   ];
   return (
     <div className="row form-group inventory-upload-header-title">
@@ -47,6 +54,11 @@ const PageTitle = () => {
         dropdownItems={dropdownItems}
         position={DropdownPosition.right}
       />
+      <CloudPingModal
+        isOpen={showPingModal}
+        toggle={togglePingModal}
+        title={CLOUD_PING_TITLE}
+      />
     </div>
   );
 };

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageTitle.test.js.snap

@@ -27,6 +27,11 @@ exports[`PageTitle rendering render without Props 1`] = `
         >
           Documentation
         </DropdownItem>,
+        <DropdownItem
+          onClick={[Function]}
+        >
+          Connectivity test
+        </DropdownItem>,
       ]
     }
     isOpen={false}
@@ -39,5 +44,10 @@ exports[`PageTitle rendering render without Props 1`] = `
       />
     }
   />
+  <CloudPingModal
+    isOpen={false}
+    title="Connectivity test"
+    toggle={[Function]}
+  />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -0,0 +1,144 @@
+/* eslint-disable camelcase */
+import React, { useCallback, useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { Table, TableBody, TableHeader } from '@patternfly/react-table';
+import {
+  Card,
+  CardTitle,
+  CardBody,
+  Modal,
+  ModalVariant,
+  Spinner,
+  Text,
+} from '@patternfly/react-core';
+import {
+  CheckCircleIcon,
+  ExclamationCircleIcon,
+} from '@patternfly/react-icons';
+import { get } from 'foremanReact/redux/API';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
+import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
+import './index.scss';
+
+export const API_KEY = 'CLOUD_PING';
+
+const CloudPingModal = ({ title, isOpen, toggle }) => {
+  const [rows, setRows] = useState([]);
+  const [tokenStatus, setTokenStatus] = useState({});
+  const dispatch = useDispatch();
+  const handleSuccess = useCallback(
+    ({
+      data: {
+        ping: { cert_auth = [], token_auth = {} },
+      },
+    }) => {
+      cert_auth.length &&
+        setRows(
+          cert_auth.map(cert => ({
+            cells: [
+              {
+                title: (
+                  <>
+                    <StatusIcon
+                      isPending={status === STATUS.PENDING}
+                      authStatus={cert}
+                    />{' '}
+                    {cert.org_name}
+                  </>
+                ),
+              },
+            ],
+          }))
+        );
+      setTokenStatus(token_auth);
+    },
+    [status]
+  );
+
+  useEffect(() => {
+    isOpen &&
+      dispatch(
+        get({
+          key: API_KEY,
+          url: inventoryUrl('status'),
+          handleSuccess,
+        })
+      );
+  }, [isOpen, dispatch, handleSuccess]);
+
+  const status = useSelector(state => selectAPIStatus(state, API_KEY));
+  const isPending = status === STATUS.PENDING;
+  // const error = useSelector(state => selectAPIErrorMessage(state, API_KEY));
+
+  return (
+    <>
+      <Modal
+        id="cloud-ping-modal"
+        appendTo={document.getElementsByClassName('react-container')[0]}
+        variant={ModalVariant.large}
+        title={title}
+        isOpen={isOpen}
+        onClose={toggle}
+      >
+        <Card className="token-status">
+          <CardTitle>
+            <StatusIcon isPending={isPending} authStatus={tokenStatus} />{' '}
+            {__('API token status')}
+          </CardTitle>
+        </Card>
+        <Card className="certs-status">
+          <CardTitle>{__('Organization status')}</CardTitle>
+          <CardBody>
+            <Text>
+              {__('Displays manifest statuses per accessible organizations.')}
+            </Text>
+            {isPending ? (
+              <Spinner size="xl" />
+            ) : (
+              <>
+                <Text className="pull-right">
+                  {sprintf(__('%s organizations'), rows.length)}
+                </Text>
+                <Table aria-label="Simple Table" cells={['']} rows={rows}>
+                  <TableHeader />
+                  <TableBody />
+                </Table>{' '}
+              </>
+            )}
+          </CardBody>
+        </Card>
+      </Modal>
+    </>
+  );
+};
+
+const StatusIcon = ({ isPending, authStatus }) => {
+  if (isPending) return <Spinner size="sm" />;
+  if (authStatus.success) return <CheckCircleIcon color="green" />;
+  if (authStatus.error) return <ExclamationCircleIcon color="red" />;
+  return <Spinner size="sm" />;
+};
+
+StatusIcon.propTypes = {
+  isPending: PropTypes.bool,
+  authStatus: PropTypes.shape({
+    success: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+    error: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+  }),
+};
+
+StatusIcon.defaultProps = {
+  isPending: true,
+  authStatus: {},
+};
+
+CloudPingModal.propTypes = {
+  title: PropTypes.string.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+};
+
+export default CloudPingModal;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.scss

@@ -0,0 +1,5 @@
+#cloud-ping-modal {
+  .token-status {
+    margin-bottom: 24px;
+  }
+}

data/webpack/ForemanInventoryUpload/ForemanInventoryConstants.js

@@ -7,3 +7,5 @@ export const DOCS_BUTTON_TEXT = __('Documentation');
 export const ACTIONS_HISTORY_BUTTON_TEXT = __('Actions history');
 
 export const SYNC_BUTTON_TEXT = __(' Sync inventory status');
+
+export const CLOUD_PING_TITLE = __('Connectivity test');

data/webpack/InsightsCloudSync/Components/InsightsHeader/InsightsHeader.scss

@@ -1,4 +1,8 @@
 .insights-header {
-  margin-bottom: '15px';
   overflow: auto;
+  margin-bottom: 30px;
+
+  p {
+    font-size: 16px;
+  }
 }

data/webpack/InsightsCloudSync/Components/InsightsHeader/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Text, TextVariants } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import InsightsSettings from '../InsightsSettings';
 import './InsightsHeader.scss';
@@ -6,10 +7,11 @@ import './InsightsHeader.scss';
 const InsightsHeader = () => (
   <div className="insights-header">
     <InsightsSettings />
-    <p>
-      {__(`Insights synchronization process is used to provide Insights
-             recommendations output for hosts managed here`)}
-    </p>
+    <Text component={TextVariants.p}>
+      {__(
+        'Insights synchronization process is used to provide Insights recommendations output for hosts managed here.'
+      )}
+    </Text>
   </div>
 );
 

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import InsightsSyncSwitcher from '../InsightsSyncSwitcher';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 import './insightsSettings.scss';
 
 class InsightsSettings extends Component {
@@ -14,10 +14,14 @@ class InsightsSettings extends Component {
     const { insightsSyncEnabled, setInsightsSyncEnabled } = this.props;
     return (
       <div className="insights_settings">
-        <h3>{__('Settings')}</h3>
-        <InsightsSyncSwitcher
-          insightsSyncEnabled={insightsSyncEnabled}
-          setInsightsSyncEnabled={setInsightsSyncEnabled}
+        <SwitcherPF4
+          id="insights_sync_switcher"
+          label={__('Sync automatically')}
+          tooltip={__(
+            'Enable automatic synchronization of Insights recommendations from the Red Hat cloud'
+          )}
+          isChecked={insightsSyncEnabled}
+          onChange={() => setInsightsSyncEnabled(!insightsSyncEnabled)}
         />
       </div>
     );

data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettings.test.js.snap

@@ -4,12 +4,12 @@ exports[`InsightsSettings rendering render without Props 1`] = `
 <div
   className="insights_settings"
 >
-  <h3>
-    Settings
-  </h3>
-  <InsightsSyncSwitcher
-    insightsSyncEnabled={false}
-    setInsightsSyncEnabled={[Function]}
+  <SwitcherPF4
+    id="insights_sync_switcher"
+    isChecked={false}
+    label="Sync automatically"
+    onChange={[Function]}
+    tooltip="Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
   />
 </div>
 `;

data/webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss

@@ -1,17 +1,3 @@
 .insights_settings {
-  margin-left: 10px;
-  border: 1px solid #ededed;
-  border-radius: 4px;
-  padding: 10px;
-  margin-bottom: 15px;
   float: right;
-
-  h3 {
-    margin-top: 0;
-    font-weight: 600;
-  }
-
-  .bootstrap-switch {
-    float: right;
-  }
 }