foreman_ansible 2.3.6 → 3.0.0

data/package.json

@@ -7,34 +7,75 @@
     "test": "test"
   },
   "dependencies": {
-    "react-json-tree": "^0.11.0"
+    "babel-polyfill": "^6.26.0",
+    "classnames": "^2.2.6",
+    "lodash": "4.17.10",
+    "patternfly": "^3.58.0",
+    "patternfly-react": "^2.25.4",
+    "prop-types": "^15.7.2",
+    "react": "^16.6.3",
+    "react-bootstrap": "^0.32.4",
+    "react-dom": "^16.6.3",
+    "react-json-tree": "^0.11.0",
+    "reselect": "^3.0.1",
+    "seamless-immutable": "7.1.2"
   },
   "devDependencies": {
     "babel-eslint": "^8.2.1",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
     "babel-plugin-lodash": "^3.3.2",
-    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-react": "^6.24.1",
+    "enzyme": "^3.7.0",
+    "enzyme-adapter-react-16": "^1.7.0",
+    "enzyme-to-json": "^3.3.5",
     "eslint": "^4.18.1",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jest": "^21.2.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0"
+    "eslint-plugin-patternfly-react": "^0.2.1",
+    "eslint-plugin-react": "^7.4.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^23.6.0",
+    "prettier": "^1.16.4",
+    "react-redux": "^6.0.0",
+    "react-redux-test-utils": "^0.1.1",
+    "redux": "^4.0.1",
+    "redux-thunk": "^2.3.0"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node node_modules/.bin/jest webpack",
+    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/ || exit 0"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bastilian/foreman_ansible.git"
+    "url": "git+https://github.com/theforeman/foreman_ansible.git"
   },
   "author": "",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/bastilian/foreman_ansible/issues"
+    "url": "https://projects.theforeman.org/projects/ansible"
   },
-  "homepage": "https://github.com/bastilian/foreman_ansible#readme"
+  "homepage": "https://theforeman.org/plugins/foreman_ansible/",
+  "jest": {
+    "verbose": true,
+    "moduleDirectories": [
+      "node_modules",
+      "webpack"
+    ],
+    "setupFiles": [
+      "raf/polyfill",
+      "./webpack/test_setup.js"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "<rootDir>/foreman/"
+    ],
+    "moduleNameMapper": {
+      "^.+\\.(css|scss)$": "identity-obj-proxy"
+    }
+  }
 }

data/test/factories/ansible_variables.rb

@@ -3,6 +3,7 @@
 FactoryBot.define do
   factory :ansible_variable do
     sequence(:key) { |n| "ansible_variable_#{n}" }
+    sequence(:default_value) { |n| "default_value_#{n}" }
     ansible_role
     imported true
   end

data/test/functional/ui_ansible_roles_controller_test.rb

@@ -0,0 +1,14 @@
+require 'test_plugin_helper'
+
+class UiAnsibleRolesControllerTest < ActionController::TestCase
+  setup do
+    @role = FactoryBot.create(:ansible_role)
+  end
+
+  test 'should respond with roles' do
+    get :index, :params => {}, :session => set_session_user
+    assert_response :success
+    res = JSON.parse @response.body
+    assert_equal res['total'], res['results'].size
+  end
+end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -7,24 +7,24 @@ require 'test_helper'
 class PlaybookRunnerTest < ActiveSupport::TestCase
   context 'roles dir' do
     test 'reads default when none provided' do
-      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:unknown_hosts).
+      ForemanAnsibleCore::Runner::Playbook.any_instance.stubs(:unknown_hosts).
         returns([])
       File.expects(:exist?).with(Dir.home).returns(true)
-      runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+      runner = ForemanAnsibleCore::Runner::Playbook.new(nil, nil, :suspended_action => nil)
       assert '/etc/ansible', runner.instance_variable_get('@ansible_dir')
     end
   end
 
   context 'working_dir' do
     setup do
-      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:unknown_hosts).
+      ForemanAnsibleCore::Runner::Playbook.any_instance.stubs(:unknown_hosts).
         returns([])
     end
 
     test 'creates temp one if not provided' do
       Dir.expects(:mktmpdir)
       File.expects(:exist?).with(Dir.home).returns(true)
-      ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+      ForemanAnsibleCore::Runner::Playbook.new(nil, nil, :suspended_action => nil)
     end
 
     test 'reads it when provided' do
@@ -32,7 +32,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       ForemanAnsibleCore.expects(:settings).returns(settings)
       File.expects(:exist?).with(settings[:ansible_dir]).returns(true)
       Dir.expects(:mktmpdir).never
-      runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
+      runner = ForemanAnsibleCore::Runner::Playbook.new(nil, nil, :suspended_action => nil)
       assert '/foo', runner.instance_variable_get('@working_dir')
     end
   end
@@ -42,24 +42,24 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       @inventory = { 'all' => { 'hosts' => ['foreman.example.com'] } }.to_json
       @output = StringIO.new
       logger = Logger.new(@output)
-      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:logger).
+      ForemanAnsibleCore::Runner::Playbook.any_instance.stubs(:logger).
         returns(logger)
     end
 
     test 'ignores known hosts' do
       Net::SSH::KnownHosts.expects(:search_for).
         with('foreman.example.com').returns(['somekey'])
-      ForemanAnsibleCore::PlaybookRunner.any_instance.
+      ForemanAnsibleCore::Runner::Playbook.any_instance.
         expects(:add_to_known_hosts).never
-      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+      ForemanAnsibleCore::Runner::Playbook.new(@inventory, nil, :suspended_action => nil)
     end
 
     test 'adds unknown hosts to known_hosts' do
       Net::SSH::KnownHosts.expects(:search_for).
         with('foreman.example.com').returns([])
-      ForemanAnsibleCore::PlaybookRunner.any_instance.
+      ForemanAnsibleCore::Runner::Playbook.any_instance.
         expects(:add_to_known_hosts).with('foreman.example.com')
-      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+      ForemanAnsibleCore::Runner::Playbook.new(@inventory, nil, :suspended_action => nil)
     end
 
     test 'logs error when it cannot add to known_hosts' do
@@ -67,7 +67,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
         with('foreman.example.com').returns([])
       Net::SSH::Transport::Session.expects(:new).with('foreman.example.com').
         raises(Net::Error)
-      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+      ForemanAnsibleCore::Runner::Playbook.new(@inventory, nil, :suspended_action => nil)
       assert_match(
         /ERROR.*Failed to save host key for foreman.example.com: Net::Error/,
         @output.string

data/test/unit/services/inventory_creator_test.rb

@@ -137,35 +137,86 @@ module ForemanAnsible
                    inventory.to_hash['all']['vars'])
     end
 
-    context 'top-level parameters sent as variables' do
-      setup do
-        # Fetching the Host parameters requires this Setting, since
-        # this plugin does not provide fixtures
-        Setting.create(:name => 'top_level_ansible_vars',
-                       :description => 'sample description',
-                       :default => true)
-        @template_invocation = OpenStruct.new(
-          :job_invocation => OpenStruct.new(:password => 'foobar'),
-          :input_values => []
-        )
+    test 'parameters are passed as top-level "hostvars"' do
+      @host.expects(:host_params).returns('hello' => 'foreman').at_least_once
+      inventory = ForemanAnsible::InventoryCreator.new([@host],
+                                                       @template_invocation)
+      hostvar = inventory.to_hash['_meta']['hostvars'][@host.name]['hello']
+      assert_equal 'foreman', hostvar
+    end
+
+    test 'ansible_roles are passed as top-level "hostvars"' do
+      roles = [].tap do |array|
+        2.times { array << FactoryBot.create(:ansible_role) }
       end
 
-      test 'parameters are passed as top-level "hostvars" by default' do
-        @host.expects(:host_params).returns('hello' => 'foreman').at_least_once
-        inventory = ForemanAnsible::InventoryCreator.new([@host],
-                                                         @template_invocation)
-        hostvar = inventory.to_hash['_meta']['hostvars'][@host.name]['hello']
-        assert_equal 'foreman', hostvar
+      host = FactoryBot.create(:host, :ansible_roles => roles)
+      inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
+      inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman_ansible_roles']
+      assert_equal 2, inventory_roles.count
+      assert_includes inventory_roles, roles.first.name
+    end
+
+    test 'inventory can be generated without template invocation' do
+      inventory = ForemanAnsible::InventoryCreator.new([@host]).to_hash
+      assert_equal({}, inventory['all']['vars'])
+      assert_equal(@host.name, inventory['all']['hosts'].first)
+    end
+
+    test 'ansible variables are passed as top-level "hostvars"' do
+      role = FactoryBot.create :ansible_role
+      variables = [].tap do |array|
+        2.times do |num|
+          array << FactoryBot.create(:ansible_variable,
+                                     :ansible_role_id => role.id,
+                                     :default_value => "value_#{num}",
+                                     :override => true)
+        end
       end
 
-      test 'parameters NOT passed as top-level "hostvars" if false' do
-        Setting['top_level_ansible_vars'] = false
-        @host.expects(:host_params).returns('hello' => 'foreman').at_least_once
-        inventory = ForemanAnsible::InventoryCreator.new([@host],
-                                                         @template_invocation)
-        hostvar = inventory.to_hash['_meta']['hostvars'][@host.name]['hello']
-        refute_equal 'foreman', hostvar
+      host = FactoryBot.create(:host, :ansible_roles => [role])
+      inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
+      host_inventory = inventory['_meta']['hostvars'][host.name]
+      assert host_inventory[variables.first.key]
+      assert host_inventory[variables.last.key]
+    end
+
+    test 'ansible variables are not passed in "foreman"' do
+      role = FactoryBot.create :ansible_role
+      variables = [].tap do |array|
+        2.times do |num|
+          array << FactoryBot.create(:ansible_variable,
+                                     :ansible_role_id => role.id,
+                                     :default_value => "value_#{num}",
+                                     :override => true)
+        end
       end
+
+      host = FactoryBot.create(:host, :ansible_roles => [role])
+      inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
+      inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman']
+      refute inventory_roles[variables.first.key]
+      refute inventory_roles[variables.last.key]
+    end
+
+    test 'ansible variables can override host params' do
+      role = FactoryBot.create :ansible_role
+      FactoryBot.create(:ansible_variable,
+                        :key => 'test_var',
+                        :ansible_role_id => role.id,
+                        :default_value => "variable value",
+                        :override => true)
+      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host.expects(:host_params).returns('test_var' => 'param value').at_least_once
+      inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
+      assert_equal 'variable value', inventory['_meta']['hostvars'][host.name]['test_var']
+    end
+
+    test 'params from host info have correct nesting' do
+      org = FactoryBot.create(:organization)
+      host = FactoryBot.create(:host, :organization => org)
+      inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
+      assert_equal org.name, inventory['_meta']['hostvars'][host.name]['foreman']['organization']
     end
   end
   # rubocop:enable ClassLength

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -0,0 +1,2 @@
+const PaginationWrapper = () => jest.fn();
+export default PaginationWrapper;

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

@@ -0,0 +1,5 @@
+const EmptyState = () => jest.fn();
+
+export const EmptyStatePattern = () => jest.fn();
+
+export default EmptyState;

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -0,0 +1,140 @@
+import React from 'react';
+import { Grid, Row, Col } from 'patternfly-react';
+import { lowerCase } from 'lodash';
+import PropTypes from 'prop-types';
+
+import AvailableRolesList from './components/AvailableRolesList';
+import AssignedRolesList from './components/AssignedRolesList';
+import AnsibleRolesSwitcherError from './components/AnsibleRolesSwitcherError';
+import { excludeAssignedRolesSearch } from './AnsibleRolesSwitcherHelpers';
+
+class AnsibleRolesSwitcher extends React.Component {
+  componentDidMount() {
+    const {
+      initialAssignedRoles,
+      availableRolesUrl,
+      inheritedRoleIds,
+      resourceId,
+      resourceName,
+    } = this.props.data;
+
+    this.props.getAnsibleRoles(
+      availableRolesUrl,
+      initialAssignedRoles,
+      inheritedRoleIds,
+      resourceId,
+      resourceName,
+      { page: 1, perPage: 10 },
+      excludeAssignedRolesSearch(initialAssignedRoles)
+    );
+  }
+
+  render() {
+    const {
+      loading,
+      pagination,
+      itemCount,
+      addAnsibleRole,
+      removeAnsibleRole,
+      getAnsibleRoles,
+      changeAssignedPage,
+      assignedPagination,
+      assignedRolesCount,
+      assignedRoles,
+      allAssignedRoles,
+      unassignedRoles,
+      error,
+    } = this.props;
+
+    const {
+      availableRolesUrl,
+      inheritedRoleIds,
+      resourceId,
+      resourceName,
+    } = this.props.data;
+
+    const onListingChange = paginationArgs =>
+      getAnsibleRoles(
+        availableRolesUrl,
+        allAssignedRoles,
+        inheritedRoleIds,
+        resourceId,
+        resourceName,
+        paginationArgs,
+        excludeAssignedRolesSearch(allAssignedRoles)
+      );
+
+    return (
+      <Grid bsClass="container-fluid" id="ansibleRolesSwitcher">
+        <Row className="row-eq-height">
+          <AnsibleRolesSwitcherError error={error} />
+          <Col sm={6} className="available-roles-container">
+            <div className="available-roles-header">
+              <h2>{__('Available Ansible Roles')}</h2>
+            </div>
+            <AvailableRolesList
+              unassignedRoles={unassignedRoles}
+              pagination={pagination}
+              itemCount={itemCount}
+              onListingChange={onListingChange}
+              onAddRole={addAnsibleRole}
+              loading={loading}
+            />
+          </Col>
+
+          <Col sm={6} className="assigned-roles-container">
+            <div className="assigned-roles-header">
+              <h2>{__('Assigned Ansible Roles')}</h2>
+            </div>
+            <AssignedRolesList
+              assignedRoles={assignedRoles}
+              pagination={assignedPagination}
+              itemCount={assignedRolesCount}
+              onPaginationChange={changeAssignedPage}
+              onRemoveRole={removeAnsibleRole}
+              resourceName={lowerCase(resourceName || '')}
+            />
+          </Col>
+        </Row>
+      </Grid>
+    );
+  }
+}
+
+AnsibleRolesSwitcher.propTypes = {
+  data: PropTypes.shape({
+    initialAssignedRoles: PropTypes.arrayOf(PropTypes.object),
+    availableRolesUrl: PropTypes.string,
+    inheritedRoleIds: PropTypes.arrayOf(PropTypes.number),
+    resourceId: PropTypes.number,
+    resourceName: PropTypes.string,
+  }).isRequired,
+  getAnsibleRoles: PropTypes.func.isRequired,
+  loading: PropTypes.bool.isRequired,
+  pagination: PropTypes.shape({
+    page: PropTypes.number,
+    perPage: PropTypes.number,
+  }).isRequired,
+  itemCount: PropTypes.number.isRequired,
+  addAnsibleRole: PropTypes.func.isRequired,
+  removeAnsibleRole: PropTypes.func.isRequired,
+  changeAssignedPage: PropTypes.func.isRequired,
+  assignedPagination: PropTypes.shape({
+    page: PropTypes.number,
+    perPage: PropTypes.number,
+  }).isRequired,
+  assignedRolesCount: PropTypes.number.isRequired,
+  assignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  allAssignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  unassignedRoles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  error: PropTypes.shape({
+    errorMsg: PropTypes.string,
+    statusText: PropTypes.string,
+  }),
+};
+
+AnsibleRolesSwitcher.defaultProps = {
+  error: {},
+};
+
+export default AnsibleRolesSwitcher;

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.scss

@@ -0,0 +1,45 @@
+@import '~patternfly/dist/sass/patternfly/_color-variables';
+@import '~patternfly/dist/sass/patternfly/_variables';
+@import '~patternfly/dist/sass/patternfly/_loading-state';
+
+#ansibleRolesSwitcher {
+  .list-view-pf {
+    .list-group-item.ansible-role-disabled {
+      background-color: $color-pf-black-200;
+      color: $color-pf-black-500;
+      border-left-color: $color-pf-black-200;
+      border-right-color: $color-pf-black-200;
+    }
+
+    .list-group-item.ansible-role-movable:hover {
+      cursor: pointer;
+    }
+  }
+
+  .loading-state-pf {
+    padding-top: 5%;
+    background-color: $color-pf-white;
+  }
+
+  .role-add-remove-btn {
+    background-color: initial;
+    border: none;
+    color: #0388ce;
+  }
+
+  .list-view-pf-main-info {
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+
+  .list-view-pf-actions {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
+  .list-group-item-heading {
+    margin-bottom: 0;
+    font-size: 12px;
+    font-weight: normal;
+  }
+}