katello 4.6.2.1 → 4.7.0.rc1

data/webpack/scenes/AlternateContentSources/Create/Steps/SelectSource.js

@@ -1,16 +1,32 @@
 import React, { useContext } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Flex, FlexItem, Form, FormGroup, FormSelect, FormSelectOption, Tile } from '@patternfly/react-core';
+import {
+  Alert,
+  ClipboardCopy,
+  Grid,
+  GridItem,
+  Form,
+  FormGroup,
+  FormSelect,
+  FormSelectOption,
+  Tile,
+} from '@patternfly/react-core';
+import { FormattedMessage } from 'react-intl';
 import ACSCreateContext from '../ACSCreateContext';
 import WizardHeader from '../../../ContentViews/components/WizardHeader';
 
 const SelectSource = () => {
   const {
-    acsType, setAcsType, contentType, setContentType,
+    acsType, setAcsType, contentType, setContentType, setAuthentication,
   } = useContext(ACSCreateContext);
 
   const onSelect = (event) => {
     setAcsType(event.currentTarget.id);
+    if (event.currentTarget.id === 'rhui') {
+      setAuthentication('content_credentials');
+    } else {
+      setAuthentication('');
+    }
   };
   const onKeyDown = (event) => {
     if (event.key === ' ' || event.key === 'Enter') {
@@ -19,16 +35,21 @@ const SelectSource = () => {
     }
   };
 
-  const typeOptions = [
-    { value: 'yum', label: __('Yum') },
-    { value: 'file', label: __('File') },
-  ];
+  const typeOptions = [{ value: 'yum', label: __('Yum') }];
+  if (acsType !== 'rhui') {
+    typeOptions.push({ value: 'file', label: __('File') });
+  }
 
   return (
     <>
       <WizardHeader
         title={__('Select source type')}
-        description={__('Indicate the source type.')}
+        description={__('Alternate content sources define new locations to download content from at repository or smart proxy sync time.')}
+      />
+      <FormattedMessage
+        className="acs-blurb"
+        id="acs-blurb"
+        defaultMessage={__('Content will be synced from the alternate content source first, then the original source if the ACS is not reachable.')}
       />
       <Form>
         <FormGroup
@@ -37,28 +58,47 @@ const SelectSource = () => {
           fieldId="source_type"
           isRequired
         >
-          <Flex>
-            <FlexItem>
+          <Grid hasGutter>
+            <GridItem span={4} rowSpan={2}>
               <Tile
                 title={__('Custom')}
                 isStacked
                 id="custom"
                 onClick={onSelect}
                 onKeyDown={onKeyDown}
+                style={{ height: '100%' }}
                 isSelected={acsType === 'custom'}
-              />{' '}
-            </FlexItem>
-            <FlexItem>
+              >
+                {__('Define repositories structured under a common web or filesystem path.')}
+              </Tile>
+            </GridItem>
+            <GridItem span={4} rowSpan={2}>
               <Tile
                 title={__('Simplified')}
                 isStacked
                 id="simplified"
                 onClick={onSelect}
                 onKeyDown={onKeyDown}
+                style={{ height: '100%' }}
                 isSelected={acsType === 'simplified'}
-              />{' '}
-            </FlexItem>
-          </Flex>
+              >
+                {__('Sync smart proxy content directly from upstream repositories by selecting the desired products.')}
+              </Tile>
+            </GridItem>
+            <GridItem span={4} rowSpan={2}>
+              <Tile
+                title={__('RHUI')}
+                isStacked
+                id="rhui"
+                onClick={onSelect}
+                onKeyDown={onKeyDown}
+                style={{ height: '100%' }}
+                isSelected={acsType === 'rhui'}
+              >
+                {__('Define RHUI repository paths with guided steps.')}
+              </Tile>
+            </GridItem>
+          </Grid>
         </FormGroup>
         <FormGroup
           label={__('Content type')}
@@ -68,6 +108,7 @@ const SelectSource = () => {
         >
           <FormSelect
             isRequired
+            isDisabled={acsType === 'rhui'}
             value={contentType}
             onChange={(value) => {
               setContentType(value);
@@ -75,16 +116,28 @@ const SelectSource = () => {
             aria-label="FormSelect Input"
           >
             {
-                            typeOptions.map(option => (
-                              <FormSelectOption
-                                key={option.value}
-                                value={option.value}
-                                label={option.label}
-                              />
-                            ))
-                        }
+              typeOptions.map(option => (
+                <FormSelectOption
+                  key={option.value}
+                  value={option.value}
+                  label={option.label}
+                />
+              ))
+            }
           </FormSelect>
         </FormGroup>
+        {acsType === 'rhui' &&
+        <>
+          <Alert variant="info" title={__('Generate RHUI certificates for the desired repositories as necessary.')} />
+          <ClipboardCopy hoverTip="Copy" clickTip="Copied" variant="inline-compact" isBlock>
+            rhui-manager client cert --name rhui-acs-certs --days 365 --dir /root
+            --repo_label rhui-repo-1,rhui-repo-2
+          </ClipboardCopy>
+          <a href="/content_credentials">
+            {__('Create content credentials with the generated SSL certificate and key.')}
+          </a>
+        </>
+        }
       </Form>
     </>
   );

data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js

@@ -9,7 +9,7 @@ import contentCredentialResult from './contentCredentials.fixtures';
 import smartProxyResult from './smartProxy.fixtures';
 import productsResult from './products.fixtures.json';
 
-const withACSRoute = component => <Route path="/labs/alternate_content_sources/">{component}</Route>;
+const withACSRoute = component => <Route path="/alternate_content_sources/">{component}</Route>;
 const ACSIndexPath = api.getApiUrl('/alternate_content_sources');
 const ACSCreatePath = api.getApiUrl('/alternate_content_sources');
 const contentCredentialPath = api.getApiUrl('/content_credentials');
@@ -28,6 +28,7 @@ const createCustomACSDetails = {
   content_type: 'yum',
   alternate_content_source_type: 'custom',
   verify_ssl: false,
+  use_http_proxies: false,
   ssl_ca_cert_id: '',
 };
 
@@ -38,6 +39,20 @@ const createSimplifiedACSDetails = {
   product_ids: [340, 19, 341],
   content_type: 'yum',
   alternate_content_source_type: 'simplified',
+  use_http_proxies: false,
+};
+
+const createRHUIACSDetails = {
+  name: 'acs_rhui_test',
+  description: '',
+  base_url: 'https://test_url.com/',
+  subpaths: ['test/repo1/', 'test/repo2/'],
+  smart_proxy_names: ['centos7-katello-devel-stable.example.com'],
+  content_type: 'yum',
+  alternate_content_source_type: 'rhui',
+  verify_ssl: false,
+  use_http_proxies: false,
+  ssl_ca_cert_id: '',
 };
 
 const noResults = {
@@ -46,11 +61,12 @@ const noResults = {
   page: 1,
   per_page: 20,
   results: [],
+  can_create: true,
 };
 
 const renderOptions = {
   routerParams: {
-    initialEntries: [{ pathname: '/labs/alternate_content_sources/' }],
+    initialEntries: [{ pathname: '/alternate_content_sources/' }],
   },
 };
 
@@ -66,7 +82,7 @@ afterEach(() => {
   assertNockRequest(autoSearchScope);
 });
 
-test('Can show add ACS button', async (done) => {
+test('Can show add ACS button if can_create is true', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(ACSIndexPath)
@@ -83,11 +99,31 @@ test('Can show add ACS button', async (done) => {
   act(done);
 });
 
+test('Can hide add ACS button if can_create is false', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  noResults.can_create = false;
+  const scope = nockInstance
+    .get(ACSIndexPath)
+    .query(true)
+    .reply(200, noResults);
+
+  const { queryByText } = renderWithRedux(<ACSTable />);
+
+  expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  expect(queryByText('Add source')).not.toBeInTheDocument();
+  noResults.can_create = true;
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  act(done);
+});
+
 test('Can display create wizard and create custom ACS', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(ACSIndexPath)
     .query(true)
+    .times(2)
     .reply(200, noResults);
 
   const contentCredentialScope = nockInstance
@@ -121,21 +157,24 @@ test('Can display create wizard and create custom ACS', async (done) => {
   // First step: Select source
   await patientlyWaitFor(() => {
     expect(getByText('Add an alternate content source')).toBeInTheDocument();
-    expect(queryByText('Indicate the source type.')).toBeInTheDocument();
+    expect(queryByText('Alternate content sources define new locations to download content from at repository or smart proxy sync time.')).toBeInTheDocument();
   });
 
-  // Choose ACS type, content_type defaults to yum
+  // Check that next is disabled until type is selected
+  expect(getByText('Next')).toHaveAttribute('disabled');
   fireEvent.click(getByText('Custom'));
-
+  expect(getByText('Next')).not.toHaveAttribute('disabled');
   // Go to next step: Name source
   fireEvent.click(getByText('Next'));
 
   await patientlyWaitFor(() => {
     expect(getByText('Enter a name for your source.')).toBeInTheDocument();
   });
+  // Check that next is disabled until name is entered
+  expect(getByText('Next')).toHaveAttribute('disabled');
   // Enter Name
   fireEvent.change(getByLabelText('acs_name_field'), { target: { value: 'acs_test' } });
-
+  expect(getByText('Next')).not.toHaveAttribute('disabled');
   // Mock smart proxy selector to go to next page
   const useSmartProxySelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSmartProxySelectorMock.mockReturnValue(smartProxyResult);
@@ -143,11 +182,25 @@ test('Can display create wizard and create custom ACS', async (done) => {
   await patientlyWaitFor(() => {
     expect(getByText('centos7-katello-devel-stable.example.com')).toBeInTheDocument();
   });
+
+  // Check that next is disabled until proxies are selected
+  expect(getByText('Next')).toHaveAttribute('disabled');
   fireEvent.click(getByLabelText('Add all'));
   useSmartProxySelectorMock.mockRestore();
   // Go to URL and subpath step
   fireEvent.click(getByText('Next'));
 
+  // Check that next is disabled until URL is entered
+  expect(getByText('Next')).toHaveAttribute('disabled');
+
+  // Test url/subpath validations
+  fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'ivalidUrlWithoutProtocol' } });
+  expect(getByText('http://, https:// or file://')).toBeInTheDocument();
+  fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'invalid/noTrailingSlash' } });
+  expect(getByText('Comma-separated list of subpaths. All subpaths must have a slash at the end and none at the front.')).toBeInTheDocument();
+  // Test that next is still diabled with invalid values
+  expect(getByText('Next')).toHaveAttribute('disabled');
+
   fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'https://test_url.com/' } });
   expect(getByLabelText('acs_base_url_field')).toHaveAttribute('value', 'https://test_url.com/');
   fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'test/repo1/,test/repo2/' } });
@@ -166,7 +219,100 @@ test('Can display create wizard and create custom ACS', async (done) => {
   fireEvent.change(getByLabelText('acs_password_field'), { target: { value: 'password' } });
   useContentCredentialSelectorMock.mockRestore();
   fireEvent.click(getByText('Next'));
-  fireEvent.click(getByText('Add'));
+  const addAcsButton = getAllByRole('button', { name: 'Add' })[0];
+  fireEvent.click(addAcsButton);
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(contentCredentialScope);
+  assertNockRequest(productScope);
+  assertNockRequest(smartProxyScope);
+  assertNockRequest(createScope, done);
+  act(done);
+});
+
+test('Can display create wizard and create RHUI ACS', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(ACSIndexPath)
+    .query(true)
+    .times(2)
+    .reply(200, noResults);
+
+  const contentCredentialScope = nockInstance
+    .get(contentCredentialPath)
+    .query(true)
+    .reply(200, contentCredentialResult);
+
+  const productScope = nockInstance
+    .get(productsPath)
+    .query(true)
+    .reply(200, productsResult);
+
+  const smartProxyScope = nockInstance
+    .get(smartProxyPath)
+    .query(true)
+    .reply(200, smartProxyResult);
+
+  const createScope = nockInstance
+    .post(ACSCreatePath, createRHUIACSDetails)
+    .reply(201, { id: 22 });
+
+  const {
+    getByLabelText, getByText, getAllByRole, queryByText,
+  } = renderWithRedux(withACSRoute(<ACSTable />), renderOptions);
+
+  expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
+  expect(queryByText('Add source')).toBeInTheDocument();
+  fireEvent.click(getByText('Add source'));
+
+  // First step: Select source
+  await patientlyWaitFor(() => {
+    expect(getByText('Add an alternate content source')).toBeInTheDocument();
+    expect(getByText('Alternate content sources define new locations to download content from at repository or smart proxy sync time.')).toBeInTheDocument();
+  });
+
+  // Choose ACS type, content_type defaults to yum
+  fireEvent.click(getByText('RHUI'));
+
+  // Go to next step: Name source
+  fireEvent.click(getByText('Next'));
+
+  await patientlyWaitFor(() => {
+    expect(getByText('Enter a name for your source.')).toBeInTheDocument();
+  });
+  // Enter Name
+  fireEvent.change(getByLabelText('acs_name_field'), { target: { value: 'acs_rhui_test' } });
+
+  // Mock smart proxy selector to go to next page
+  const useSmartProxySelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useSmartProxySelectorMock.mockReturnValue(smartProxyResult);
+  fireEvent.click(getByText('Next'));
+  await patientlyWaitFor(() => {
+    expect(getByText('centos7-katello-devel-stable.example.com')).toBeInTheDocument();
+  });
+  fireEvent.click(getByLabelText('Add all'));
+  useSmartProxySelectorMock.mockRestore();
+  // Go to URL and subpath step
+  fireEvent.click(getByText('Next'));
+
+  fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'https://test_url.com/' } });
+  expect(getByLabelText('acs_base_url_field')).toHaveAttribute('value', 'https://test_url.com/');
+  fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'test/repo1/,test/repo2/' } });
+
+  // Mock content credential data
+  const useContentCredentialSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useContentCredentialSelectorMock.mockReturnValue(contentCredentialResult.results);
+  fireEvent.click(getByText('Next'));
+  expect(queryByText('Manual authentication')).not.toBeInTheDocument();
+  expect(queryByText('Content credentials')).toBeInTheDocument();
+  const noAuthRadio = getAllByRole('radio', { name: 'None' })[0];
+  fireEvent.click(noAuthRadio);
+  useContentCredentialSelectorMock.mockRestore();
+  fireEvent.click(getByText('Next'));
+  const addAcsButton = getAllByRole('button', { name: 'Add' })[0];
+  fireEvent.click(addAcsButton);
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
@@ -182,6 +328,7 @@ test('Can display create wizard and create simplified ACS', async (done) => {
   const scope = nockInstance
     .get(ACSIndexPath)
     .query(true)
+    .times(2)
     .reply(200, noResults);
 
   const contentCredentialScope = nockInstance
@@ -204,7 +351,7 @@ test('Can display create wizard and create simplified ACS', async (done) => {
     .reply(201, { id: 22 });
 
   const {
-    getByLabelText, getByText, queryByText,
+    getByLabelText, getByText, queryByText, getAllByRole,
   } = renderWithRedux(withACSRoute(<ACSTable />), renderOptions);
 
   expect(queryByText("You currently don't have any alternate content sources.")).toBeNull();
@@ -215,7 +362,7 @@ test('Can display create wizard and create simplified ACS', async (done) => {
   // First step: Select source
   await patientlyWaitFor(() => {
     expect(getByText('Add an alternate content source')).toBeInTheDocument();
-    expect(queryByText('Indicate the source type.')).toBeInTheDocument();
+    expect(queryByText('Alternate content sources define new locations to download content from at repository or smart proxy sync time.')).toBeInTheDocument();
   });
 
   // Choose ACS type, content_type defaults to yum
@@ -244,7 +391,8 @@ test('Can display create wizard and create simplified ACS', async (done) => {
 
   fireEvent.click(getByText('Next'));
   useProductSelectorMock.mockClear();
-  fireEvent.click(getByText('Add'));
+  const addAcsButton = getAllByRole('button', { name: 'Add' })[0];
+  fireEvent.click(addAcsButton);
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);