foreman_discovery 26.1.3 → 26.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a3c47ba004165224710132b067bcd2fb2f240fa7fd684c788891730e2efc77
-  data.tar.gz: 21bb4c7c7f00cc7431e7c490d74d5789ae1229b52be1a1e63d504896d573ec5a
+  metadata.gz: db9a40b5eced1c71a3724f822961f21e18ec8f785da702eb3ec9618bfb5ac68a
+  data.tar.gz: 44e6f535f5c82c87dcbd66283cd7c2184b39279bd9280946b0ff59a4d9e6b397
 SHA512:
-  metadata.gz: b15b447fab37b8bf9447bc4337827ad3ea688107013e938487e2719a9d5ec8d3a4a97abdfed8df5cd84dc84ea91745d8402a21671a7fb346b3626b9043ebe35f
-  data.tar.gz: faeec5cbd30ca4d9cbac9f50fe14a38cb60fa088fcfb4f7bfafecf6bf35f8dfdd2667efd8cf15408baf9953f38182159e0fe2da9e79900b518cd1cb393368870
+  metadata.gz: dd5dda0f43e6173fefbfaf295b9da9d6ba5c6b4d4099aee461796616da9f6a57fd6fa2d74724cd397f16069387cf479f9bb4a501083ceccbb684a71bfcbae2c8
+  data.tar.gz: 10dfc2528a92aacc77c741b6a1d623912ba9592f37625c819be6e8f5993037780e1fe3713528a470b3617f76df070d2824eacaa72ef3681159f9552fc5709699

data/app/controllers/foreman_discovery/concerns/hosts_controller_extensions.rb

@@ -19,6 +19,16 @@ module ForemanDiscovery
 
         @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, host_params) if @host.is_a?(Host::Discovered)
       end
+
+      def find_resource
+        if (id = params[:id]).blank?
+          not_found
+          return false
+        end
+        @host = Host::Discovered.authorized(:edit_discovered_hosts, Host::Discovered).find_by(id: id)
+        @host ||= super
+        @host
+      end
     end
   end
 end

data/app/services/foreman_discovery/host_converter.rb

@@ -55,7 +55,7 @@ class ForemanDiscovery::HostConverter
   end
 
   def self.ip_for_subnet(subnet, mac, ip)
-    return ip if ip && subnet&.unused_ip(mac)&.ip_include?(ip)
+    return ip if ip.present? && subnet&.unused_ip(mac)&.ip_include?(ip)
 
     unused_ip_for_subnet(subnet, mac, ip)
   end

data/db/seeds.d/60_discovery_proxy_feature.rb

@@ -1,2 +1,2 @@
 f = Feature.unscoped.where(:name => 'Discovery').first_or_create
-raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+raise "Unable to create proxy feature: #{SeedHelper.format_errors(f)}" if f.nil? || f.errors.any?

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "26.1.3"
+  VERSION = "26.2.0"
 end

data/package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "lint": "tfm-lint --plugin -d /webpack",
-    "test": "tfm-test --plugin",
-    "test:watch": "tfm-test --plugin --watchAll",
-    "test:current": "tfm-test --plugin --watch",
+    "test": "tfm-test --plugin --config jest.config.js",
+    "test:watch": "tfm-test --plugin --config jest.config.js --watchAll",
+    "test:current": "tfm-test --plugin --config jest.config.js --watch",
     "publish-coverage": "tfm-publish-coverage",
     "create-react-component": "yo react-domain"
   },
@@ -25,6 +25,7 @@
     "@babel/core": "^7.7.0",
     "@theforeman/builder": ">= 0",
     "@theforeman/eslint-plugin-foreman": ">= 0",
+    "@theforeman/find-foreman": ">= 0",
     "@theforeman/test": ">= 0",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",

data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb

@@ -50,6 +50,47 @@ module ForemanDiscovery
           assert_instance_of Host::Managed, assigns(:host)
         end
       end
+
+      describe 'find_resource' do
+        include FactImporterIsolation
+        allow_transactions_for_any_importer
+
+        setup do
+          @facts = {
+            "interfaces" => "lo,eth0",
+            "ipaddress" => "192.168.100.42",
+            "ipaddress_eth0" => "192.168.100.42",
+            "macaddress_eth0" => "AA:BB:CC:DD:EE:FF",
+            "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
+            "physicalprocessorcount" => "42",
+            "discovery_version" => "3.0.0",
+          }
+        end
+
+        test 'finds a discovered host directly without converting it' do
+          host = discover_host_from_facts(@facts)
+          get :build_errors, params: { id: host.id }, session: set_session_user
+
+          assert_response :success
+          assert_instance_of Host::Discovered, assigns(:host)
+          assert_equal host, assigns(:host)
+        end
+
+        test 'falls back to the core lookup for a managed host' do
+          host = FactoryBot.create(:host, :managed)
+          get :build_errors, params: { id: host.id }, session: set_session_user
+
+          assert_response :success
+          assert_instance_of Host::Managed, assigns(:host)
+          assert_equal host, assigns(:host)
+        end
+
+        test 'renders not found for an unknown host id' do
+          get :build_errors, params: { id: 0 }, session: set_session_user
+
+          assert_response :not_found
+        end
+      end
     end
   end
 end

data/test/unit/discovered_extensions_test.rb

@@ -238,8 +238,8 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     ::ForemanDiscovery::HostConverter.unstub(:unused_ip_for_host)
     facts = @facts_ipv6.merge({"somefact" => "abc"})
     domain = FactoryBot.create(:domain)
-    subnet = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db8::/32", :mask => "ffff:ffff::", :name => "ipv6_discovered", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
-    subnet2 = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db9::/32", :mask => "ffff:ffff::", :name => "ipv6_provision", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    subnet = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db8::", :mask => "ffff:ffff::", :name => "ipv6_discovered", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
+    subnet2 = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db9::", :mask => "ffff:ffff::", :name => "ipv6_provision", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet6
     hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :with_os, :pxe_loader => "PXELinux BIOS", :subnet6 => subnet2, :domain => domain)

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js

@@ -1,12 +1,37 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/testHelpers';
 
 import ForemanEmptyState from '../EmptyState';
 
-const fixtures = {
-  'render with Props': { docUrl: 'https://foreman.example.com' },
-};
+const docUrl = 'https://foreman.example.com';
 
 describe('ForemanEmptyState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ForemanEmptyState, fixtures));
+  it('renders discovered hosts empty state content', () => {
+    rtlHelpers.renderWithStore(<ForemanEmptyState docUrl={docUrl} />);
+
+    expect(
+      screen.getByRole('heading', { name: 'Foreman Discovery', level: 5 })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned.'
+      )
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText('For more information please see')
+    ).toBeInTheDocument();
+
+    const docLink = screen.getByRole('link', { name: 'documentation' });
+    expect(docLink).toHaveAttribute('href', docUrl);
+    expect(docLink).toHaveAttribute('target', '_blank');
+    expect(docLink).toHaveAttribute('rel', 'external noreferrer noopener');
+
+    expect(screen.queryByText('Create Rule')).not.toBeInTheDocument();
+    expect(
+      document.querySelector(
+        '[data-ouia-component-id="empty-state-action-button"]'
+      )
+    ).not.toBeInTheDocument();
+  });
 });

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js

@@ -1,19 +1,37 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import ForemanEmptyState from '../EmptyState';
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { rtlHelpers } from 'foremanReact/common/testHelpers';
 
-const action = {
-  title: 'action-title',
-  url: `action-url`,
-};
+import ForemanEmptyState from '../EmptyState';
 
-const fixtures = {
-  'render with Props': {
-    docUrl: 'https://foreman.example.com',
-    action,
-  },
-};
+const docUrl = 'https://foreman.example.com';
 
 describe('ForemanEmptyState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ForemanEmptyState, fixtures));
+  it('renders discovery rules empty state content', () => {
+    rtlHelpers.renderWithStore(<ForemanEmptyState docUrl={docUrl} />);
+
+    expect(
+      screen.getByRole('heading', { name: 'Discovery Rules', level: 5 })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts'
+      )
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText('For more information please see')
+    ).toBeInTheDocument();
+
+    const docLink = screen.getByRole('link', { name: 'documentation' });
+    expect(docLink).toHaveAttribute('href', docUrl);
+    expect(docLink).toHaveAttribute('target', '_blank');
+    expect(docLink).toHaveAttribute('rel', 'external noreferrer noopener');
+
+    const actionButton = screen.getByText('Create Rule');
+    expect(actionButton).toBeInTheDocument();
+    expect(actionButton).toHaveAttribute(
+      'data-ouia-component-id',
+      'empty-state-action-button'
+    );
+  });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 26.1.3
+  version: 26.2.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -295,23 +295,14 @@ files:
 - test/unit/managed_extensions_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
-- webpack/__mocks__/foremanReact/common/I18n.js
-- webpack/__mocks__/foremanReact/common/helpers.js
-- webpack/__mocks__/foremanReact/common/index.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState/index.js
 - webpack/index.js
 - webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js
 - webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/EmptyState.test.js
-- webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap
 - webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/index.js
 - webpack/src/ForemanDiscovery/DiscoveredHosts/index.js
 - webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js
 - webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/index.js
 - webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/EmptyState.test.js
-- webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap
 - webpack/src/ForemanDiscovery/DiscoveryRules/index.js
 - webpack/src/reducers.js
 homepage: https://github.com/theforeman/foreman_discovery
@@ -332,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.20
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -1,3 +0,0 @@
-export const translate = s => s;
-
-export const ngettext = s => s;

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -1 +0,0 @@
-export const foremanUrl = path => `${window.URL_PREFIX}${path}`;

data/webpack/__mocks__/foremanReact/common/index.js

@@ -1,5 +0,0 @@
-import EmptyStatePattern from '../components/common/EmptyState/EmptyStatePattern';
-import DefaultEmptyState from '../components/common/EmptyState/DefaultEmptyState';
-
-export default DefaultEmptyState;
-export { EmptyStatePattern };

data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js

@@ -1,71 +0,0 @@
-import React from 'react';
-import { useDispatch } from 'react-redux';
-import { push } from 'connected-react-router';
-import { Button } from '@patternfly/react-core';
-import EmptyStatePattern from './EmptyStatePattern';
-import { defaultEmptyStatePropTypes } from './EmptyStatePropTypes';
-
-const DefaultEmptyState = props => {
-  const {
-    icon,
-    iconType,
-    header,
-    description,
-    documentation,
-    action,
-    secondaryActions,
-  } = props;
-
-  const dispatch = useDispatch();
-  const actionButtonClickHandler = ({ url, onClick }) => {
-    if (onClick) onClick();
-    else if (url) dispatch(push(url));
-  };
-
-  const ActionButton = action ? (
-    <Button
-      component="a"
-      onClick={() => actionButtonClickHandler(action)}
-      variant="primary"
-      ouiaId="empty-state-primary-action-button"
-    >
-      {action.title}
-    </Button>
-  ) : null;
-
-  const SecondaryButton = secondaryActions
-    ? secondaryActions.map(({ title, url, onClick }) => (
-        <Button
-          component="a"
-          key={`sec-button-${title}`}
-          onClick={() => actionButtonClickHandler({ url, onClick })}
-          variant="secondary"
-          ouiaId="empty-state-secondary-action-button"
-        >
-          {title}
-        </Button>
-      ))
-    : null;
-
-  return (
-    <EmptyStatePattern
-      icon={icon}
-      iconType={iconType}
-      header={header}
-      description={description}
-      documentation={documentation}
-      action={ActionButton}
-      secondaryActions={SecondaryButton}
-    />
-  );
-};
-
-DefaultEmptyState.propTypes = defaultEmptyStatePropTypes;
-
-DefaultEmptyState.defaultProps = {
-  icon: 'add-circle-o',
-  secondaryActions: [],
-  iconType: 'pf',
-};
-
-export default DefaultEmptyState;

data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js

@@ -1,76 +0,0 @@
-import React from 'react';
-import { Icon } from 'patternfly-react';
-import {
-  EmptyState,
-  EmptyStateVariant,
-  EmptyStateBody,
-  EmptyStateActions,
-  EmptyStateHeader,
-  EmptyStateFooter,
-} from '@patternfly/react-core';
-import { emptyStatePatternPropTypes } from './EmptyStatePropTypes';
-import { translate as __ } from '../../../common/I18n';
-
-const EmptyStatePattern = props => {
-  const {
-    documentation,
-    action,
-    secondaryActions,
-    iconType,
-    icon,
-    header,
-    description,
-  } = props;
-
-  const DocumentationBlock = () => {
-    if (!documentation) {
-      return null;
-    }
-    // The documentation prop can also be a customized node
-    if (React.isValidElement(documentation)) {
-      return documentation;
-    }
-    const {
-      label = __('For more information please see '), // eslint-disable-line react/prop-types
-      buttonLabel = __('documentation'), // eslint-disable-line react/prop-types
-      url, // eslint-disable-line react/prop-types
-    } = documentation;
-    return (
-      <span>
-        {label}
-        <a href={url}>{buttonLabel}</a>
-      </span>
-    );
-  };
-
-  return (
-    <EmptyState variant={EmptyStateVariant.xl}>
-      <span className="empty-state-icon">
-        {/* TODO: Add pf4 icons, Redmine issue: #30865 */}
-        <Icon name={icon} type={iconType} size="2x" />
-      </span>
-      <EmptyStateHeader titleText={<>{header}</>} headingLevel="h5" />
-      <EmptyStateBody>
-        <div className="empty-state-description">{description}</div>
-        <DocumentationBlock />
-      </EmptyStateBody>
-      <EmptyStateFooter>
-        {action}
-        <EmptyStateActions>{secondaryActions}</EmptyStateActions>
-      </EmptyStateFooter>
-    </EmptyState>
-  );
-};
-
-EmptyStatePattern.propTypes = emptyStatePatternPropTypes;
-
-EmptyStatePattern.defaultProps = {
-  icon: 'add-circle-o',
-  secondaryActions: [],
-  documentation: {
-    url: '#',
-  },
-  iconType: 'pf',
-};
-
-export default EmptyStatePattern;

data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePropTypes.js

@@ -1,29 +0,0 @@
-import PropTypes from 'prop-types';
-
-export const actionButtonPropTypes = {
-  title: PropTypes.node.isRequired,
-  url: PropTypes.string,
-  onChange: PropTypes.func,
-};
-
-export const emptyStatePatternPropTypes = {
-  icon: PropTypes.string.isRequired,
-  header: PropTypes.string.isRequired,
-  documentation: PropTypes.oneOfType([
-    PropTypes.shape({
-      label: PropTypes.string,
-      buttonLabel: PropTypes.string,
-      url: PropTypes.string.isRequired,
-    }),
-    PropTypes.node,
-  ]),
-  description: PropTypes.string.isRequired,
-  action: PropTypes.node,
-  secondaryActions: PropTypes.node,
-};
-
-export const defaultEmptyStatePropTypes = {
-  ...emptyStatePatternPropTypes,
-  action: PropTypes.shape(actionButtonPropTypes),
-  secondaryActions: PropTypes.arrayOf(PropTypes.shape(actionButtonPropTypes)),
-};

data/webpack/__mocks__/foremanReact/components/common/EmptyState/index.js

@@ -1,5 +0,0 @@
-import EmptyStatePattern from './EmptyStatePattern';
-import DefaultEmptyState from './DefaultEmptyState';
-
-export default DefaultEmptyState;
-export { EmptyStatePattern };

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/__test__/__snapshots__/EmptyState.test.js.snap

@@ -1,16 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ForemanEmptyState rendering render with Props 1`] = `
-<DefaultEmptyState
-  description="No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
-  documentation={
-    Object {
-      "url": "https://foreman.example.com",
-    }
-  }
-  header="Foreman Discovery"
-  icon="gears"
-  iconType="fa"
-  secondaryActions={Array []}
-/>
-`;

data/webpack/src/ForemanDiscovery/DiscoveryRules/Components/__test__/__snapshots__/EmptyState.test.js.snap

@@ -1,22 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ForemanEmptyState rendering render with Props 1`] = `
-<DefaultEmptyState
-  action={
-    Object {
-      "title": "Create Rule",
-      "url": "/discovery_rules/new",
-    }
-  }
-  description="No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
-  documentation={
-    Object {
-      "url": "https://foreman.example.com",
-    }
-  }
-  header="Discovery Rules"
-  icon="gavel"
-  iconType="fa"
-  secondaryActions={Array []}
-/>
-`;