foreman_ansible 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3c4d8c1514c442f1da8c0c6ef356482f5edb63ca14df0e39ef83818076f22b
-  data.tar.gz: 253b5ef0614bb34d78ad96b7312537b496b4850ea34d6ba7a960f9df34da5e02
+  metadata.gz: bf08e369d1c4b9a445123a9fab3a02b1da8c3bfe9261b7027693959d90e1e1a3
+  data.tar.gz: 13ac8e3cb9b88bf5167a2fdeb9e95409ad9a93c6f4dce12f0500cc5c5bd787a9
 SHA512:
-  metadata.gz: b6f8201c41db492b56888c675cb460f88e5dae92aeb808487747783ba43031961a27f66eb2df975216385b8e003d2df645f4208f0a1f0d4bec44b0c02f878984
-  data.tar.gz: da19e080f0fa135ae2cb4757fae4a10a946989ecc953cf41eb774877b075bcfc68455707d4abc3a4265fdcb1421714572947bb14eefc709a8d825d6c23623987
+  metadata.gz: 8c515c517add1b91f020c63a50b6b58eaafdacfe08d52d39286ae79efd034cb8ca0ffc8ef4aa8aa2f5be9e5dcc6a797910dd9b32f444e61e525077c8239e3e56
+  data.tar.gz: 18fac58f8a1d119af822b6be9f28ce33b626b0951791d5c3ca201d6e2475f2399c52d21ba92b19335f267a183306e568cbc384910942f1d7d0de9d1d74a88ef2

data/app/models/concerns/foreman_ansible/hostgroup_extensions.rb

@@ -11,6 +11,9 @@ module ForemanAnsible
                -> { order('hostgroup_ansible_roles.position ASC') },
                :through => :hostgroup_ansible_roles,
                :dependent => :destroy
+      scoped_search :relation => :ansible_roles, :on => :name,
+                    :complete_value => true, :rename => :ansible_role,
+                    :only_explicit => true, :operators => ['= ', '!= ', '~ ', '!~ '], :ext_method => :search_by_role
       accepts_nested_attributes_for :hostgroup_ansible_roles, :allow_destroy => true
       audit_associations :ansible_roles
       include_in_clone :ansible_roles
@@ -38,6 +41,16 @@ module ForemanAnsible
         (inherited_ansible_roles + ansible_roles + host_ansible_roles).uniq
       end
     end
+
+    class_methods do
+      def search_by_role(_key, operator, value)
+        conditions = sanitize_sql_for_conditions(["ansible_roles.name #{operator} ?", value_to_sql(operator, value)])
+        hostgroup_ids = ::Hostgroup.joins(:ansible_roles).where(conditions).map(&:subtree_ids).flatten
+
+        conds = "hostgroups.id IN(#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
+        { conditions: conds.presence || '1 = 0' }
+      end
+    end
   end
 end
 

data/app/views/ansible_roles/index.html.erb

@@ -18,7 +18,7 @@
     <% @ansible_roles.each do |role| %>
       <tr>
         <td class="ellipsis"><%= role.name %></td>
-        <td class="ellipsis"><%= role.hostgroups.count %></td>
+        <td class="ellipsis"><%= link_to role.hostgroups.count, hostgroups_path(:search => "ansible_role = #{role.name}") %></td>
         <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "ansible_role = #{role.name}")%></td>
         <td class="ellipsis"><%= link_to(role.ansible_variables.count, ansible_variables_path(:search => "ansible_role = #{role}")) %></td>
         <td class="ellipsis"><%= import_time role %></td>

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '9.0.0'
+  VERSION = '9.0.1'
 end

data/package.json

@@ -15,12 +15,12 @@
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@testing-library/user-event": "^13.2.1",
-    "@theforeman/builder": "^8.4.1",
-    "@theforeman/eslint-plugin-foreman": "^8.4.1",
-    "@theforeman/find-foreman": "^8.4.1",
-    "@theforeman/stories": "^8.4.1",
-    "@theforeman/test": "^8.9.0",
-    "@theforeman/vendor-dev": "^8.4.1",
+    "@theforeman/builder": "^10.0",
+    "@theforeman/eslint-plugin-foreman": "^10.0",
+    "@theforeman/find-foreman": "^10.0",
+    "@theforeman/stories": "^10.0",
+    "@theforeman/test": "^10.0",
+    "@theforeman/vendor-dev": "^10.0",
     "@testing-library/user-event": "^13.2.1",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",

data/test/unit/concerns/hostgroup_extensions_test.rb

@@ -61,4 +61,9 @@ class HostgroupExtensionsTest < ActiveSupport::TestCase
       @hostgroup_parent.clone.all_ansible_roles.must_equal @hostgroup_parent.all_ansible_roles
     end
   end
+
+  test 'should find hostgroup with role' do
+    result = ::Hostgroup.search_for("ansible_role = #{@role1.name}").pluck(:id)
+    assert_include result, @hostgroup.id
+  end
 end

data/webpack/components/ReportJsonViewer.js

@@ -10,7 +10,17 @@ const theme = {
 
 const ReportJsonViewer = ({ data }) => (
   <div className="report-json-viewer">
-    <JSONTree data={data} hideRoot theme={theme} />
+    <JSONTree
+      data={data}
+      hideRoot
+      theme={theme}
+      shouldExpandNode={(keyPath, _myData, level) =>
+        keyPath[0] === '_meta' ||
+        keyPath[0] === 'hostvars' ||
+        level === 3 ||
+        keyPath[0] === 'foreman_ansible_roles'
+      }
+    />
   </div>
 );
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -495,55 +495,55 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
+- test/factories/ansible_proxy.rb
+- test/factories/ansible_roles.rb
+- test/factories/ansible_variables.rb
+- test/factories/host_ansible_enhancements.rb
+- test/fixtures/insights_playbook.yaml
+- test/fixtures/playbooks_example_output.json
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/fixtures/sample_playbooks.json
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_playbooks_controller_test.rb
-- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
-- test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
-- test/functional/hosts_controller_test.rb
+- test/functional/api/v2/hostgroups_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
 - test/functional/ansible_variables_controller_test.rb
+- test/functional/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
-- test/unit/services/inventory_creator_test.rb
+- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
+- test/graphql/queries/ansible_roles_query_test.rb
+- test/graphql/queries/host_ansible_roles_query_test.rb
+- test/unit/actions/run_ansible_job_test.rb
+- test/unit/actions/run_proxy_ansible_command_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/roles_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
-- test/unit/services/override_resolver_test.rb
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/inventory_creator_test.rb
+- test/unit/services/override_resolver_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ansible_role_test.rb
+- test/unit/ansible_variable_test.rb
 - test/unit/host_ansible_role_test.rb
-- test/unit/import_playbooks_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/config_reports_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/ignore_roles_test.rb
-- test/unit/ansible_variable_test.rb
+- test/unit/import_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
-- test/unit/lib/proxy_api/ansible_test.rb
-- test/unit/actions/run_ansible_job_test.rb
-- test/unit/actions/run_proxy_ansible_command_test.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/test_plugin_helper.rb
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_variables.rb
-- test/factories/host_ansible_enhancements.rb
-- test/factories/ansible_roles.rb
-- test/fixtures/playbooks_example_output.json
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
-- test/fixtures/insights_playbook.yaml
-- test/fixtures/sample_playbooks.json
-- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
-- test/graphql/queries/host_ansible_roles_query_test.rb
-- test/graphql/queries/ansible_roles_query_test.rb