foreman_puppet 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e59cf0e5991e1889b33b6691d0e537b98e5860f0a959e662352c11d0d9405a8e
-  data.tar.gz: 17341daec79f8ebb38287fd5fd32bbd079630d79abcc72a662bdc54b80eadd51
+  metadata.gz: 68939e16cae1564207cb39add5c7fec7cac4e94c8ebf118dc61621197907a745
+  data.tar.gz: 5058a3df645b3c30aa9d0845b47c7a07286fa1c87aa261b582a6153e1533965b
 SHA512:
-  metadata.gz: 17db46ed6f8e0274e9a14fe7cc40de45878fedac0bc5284356706b6e66b18da587fd41454116fe8a69cb3c4fc39f88b770e3878407d08987154aa5c93b1c81b9
-  data.tar.gz: 28a410202cea50308d6b963b24f44c27c3e190536551a4ebaf1b7dcd68ca75dc103354e7e26a0a22caf0b58f4dbada0b0aa111f8abc0390a17da526f4ad22cf4
+  metadata.gz: d03b3cf704fb1c44d598f2cdd07f0eb4a42bcbd5f588083b8c47ae8ac91f3c60ed809104321f4942f2adfa4601126883dc973cb9181bcd469136f94c1ccdc748
+  data.tar.gz: 10dceada6b636553d2b29ca4e7e76965e6235ba3227765e0a71ea1144d86d09e332ae2aab22c22d3554f81cef933c50a8d2979d818234ff261588b3cdd8736cd

data/README.md

@@ -33,7 +33,8 @@ Some features will remain in core:
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.5        | ~> 5.0       | Required                                 |
+| >= 3.7        | ~> 6.0       | Required                                 |
+| ~> 3.5, 3.6   | ~> 5.0       | Required                                 |
 | ~> 3.4        | ~> 4.1       | Required                                 |
 | ~> 3.3        | ~> 4.0       | Required                                 |
 | ~> 3.2        | ~> 3.0       | Required                                 |
@@ -51,7 +52,7 @@ You can manually install this plugin using:
 
 ```sh
 # On RedHat/CentOS
-yum install tfm-rubygem-foreman_puppet
+dnf install rubygem-foreman_puppet
 
 # On Debian
 apt install ruby-foreman-puppet
@@ -77,7 +78,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) *2022* *The Foreman developers*
+Copyright (c) *2020-2023* *The Foreman developers*
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/models/concerns/foreman_puppet/extensions/host.rb

@@ -13,8 +13,6 @@ module ForemanPuppet
         include_in_clone puppet: %i[config_groups host_config_groups host_classes]
 
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment
-        scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ '],
-          ext_method: :search_by_deprecated_class
         scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ '],
           ext_method: :search_by_puppetclass
         scoped_search relation: :config_groups, on: :name, complete_value: true, rename: :config_group, only_explicit: true, operators: ['= ', '~ '],
@@ -22,11 +20,6 @@ module ForemanPuppet
       end
 
       class_methods do
-        def search_by_deprecated_class(key, operator, value)
-          Foreman::Deprecation.deprecation_warning('3.2', 'search by `class` has been deprecated, please search by `puppetclass` instead')
-          search_by_puppetclass(key, operator, value)
-        end
-
         def search_by_puppetclass(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
           config_group_ids = ForemanPuppet::ConfigGroup.joins(:puppetclasses).where(conditions).pluck(:id)

data/app/models/concerns/foreman_puppet/extensions/hostgroup.rb

@@ -16,7 +16,12 @@ module ForemanPuppet
 
         # will need through relation to work properly
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment, only_explicit: true
-        scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ ']
+        scoped_search relation: :puppetclasses, on: :name,
+          complete_value: true,
+          rename: :puppetclass,
+          only_explicit: true,
+          operators: ['= ', '~ '],
+          ext_method: :search_by_puppetclass
         scoped_search relation: :config_groups, on: :name,
           complete_value: true,
           rename: :config_group,
@@ -29,11 +34,22 @@ module ForemanPuppet
       module PatchedClassMethods
         def search_by_config_group(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["config_groups.name #{operator} ?", value_to_sql(operator, value)])
-          hostgroup_ids = ::Hostgroup.unscoped.with_taxonomy_scope.joins(puppet: :config_groups).where(conditions).map(&:subtree_ids).flatten.uniq
+          hostgroup_ids = ::Hostgroup.joins(puppet: :config_groups).where(conditions).map(&:subtree_ids).flatten.uniq
+
+          conds = 'hostgroups.id < 0'
+          conds = "hostgroups.id IN(#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
+
+          { conditions: conds }
+        end
+
+        def search_by_puppetclass(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
+          hostgroup_ids = ::Hostgroup.joins(puppet: :puppetclasses).where(conditions).map(&:subtree_ids)
+
+          conds = []
+          conds << "hostgroups.id IN (#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
 
-          opts = 'hostgroups.id < 0'
-          opts = "hostgroups.id IN(#{hostgroup_ids.join(',')})" if hostgroup_ids.present?
-          { conditions: opts }
+          { conditions: conds.join(' OR ').presence || 'hostgroups.id < 0' }
         end
       end
     end

data/app/models/foreman_puppet/config_group.rb

@@ -17,7 +17,7 @@ module ForemanPuppet
     validates :name, presence: true, uniqueness: true
 
     scoped_search on: :name, complete_value: true
-    scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ ']
+    scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ ']
 
     default_scope -> { order('config_groups.name') }
 

data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb

@@ -1,4 +1,9 @@
-<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(obj.environment.present? ? obj.environment : @environment))] do %>
+<%
+  id = "selected_puppetclass_#{klass.id}"
+  css = [dom_class(klass, 'selected'), cycle('even', 'odd')]
+  css << 'unavailable' unless klass.environments.include?(obj.try(:environment).presence || @environment)
+%>
+<%= content_tag :li, id: id, class: css do %>
   <%= link_to_remove_puppetclass(klass, obj) %>
   <%= hidden_field_tag "#{resource_type}[puppetclass_ids][]", klass.id %>
 <% end %>

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.1.0'.freeze
 end

data/package.json

@@ -9,8 +9,6 @@
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
     "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
     "create-react-component": "yo react-domain"
   },
   "repository": {
@@ -29,7 +27,6 @@
     "@theforeman/builder": ">= 10.1.0",
     "@theforeman/eslint-plugin-foreman": ">= 10.1.0",
     "@theforeman/find-foreman": ">= 10.1.0",
-    "@theforeman/stories": ">= 10.1.0",
     "@theforeman/test": ">= 10.1.0",
     "@theforeman/vendor-dev": ">= 10.1.0",
     "babel-eslint": "^10.0.3",

data/test/models/foreman_puppet/host_test.rb

@@ -48,23 +48,31 @@ module ForemanPuppet
         assert_equal results, results2
       end
 
+      test 'deprecated search by class throws error' do
+        exception = assert_raises(Exception) do
+          host
+          Host.search_for("class = #{host.puppet.puppetclass_names.first}")
+        end
+        assert_equal("Field 'class' not recognized for searching!", exception.message)
+      end
+
       test 'can be found by puppetclass' do
         host
-        result = Host.search_for("class = #{host.puppet.puppetclass_names.first}")
+        result = Host.search_for("puppetclass = #{host.puppet.puppetclass_names.first}")
         assert_includes result, host
       end
 
       test 'search by puppetclass returns only host within that puppetclass' do
         host
         puppetclass = FactoryBot.create(:puppetclass)
-        result = Host.search_for("class = #{puppetclass.name}")
+        result = Host.search_for("puppetclass = #{puppetclass.name}")
         assert_not_includes result, host
       end
 
       test 'search hosts by inherited puppetclass from a hostgroup' do
         hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_puppetclass)
         host_with_hg = FactoryBot.create(:host, hostgroup: hostgroup)
-        result = Host.search_for("class = #{hostgroup.puppet.puppetclass_names.first}")
+        result = Host.search_for("puppetclass = #{hostgroup.puppet.puppetclass_names.first}")
         assert_includes result, host_with_hg
       end
 
@@ -72,7 +80,7 @@ module ForemanPuppet
         parent_hg = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_puppetclass)
         hg = FactoryBot.create(:hostgroup, parent: parent_hg)
         host = FactoryBot.create(:host, hostgroup: hg)
-        result = Host.search_for("class = #{parent_hg.puppet.puppetclass_names.first}")
+        result = Host.search_for("puppetclass = #{parent_hg.puppet.puppetclass_names.first}")
         assert_equal 1, result.count
         assert_includes result, host
       end
@@ -82,7 +90,7 @@ module ForemanPuppet
         host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup, environment: hostgroup.puppet.environment)
         config_group = FactoryBot.create(:config_group, :with_puppetclass)
         hostgroup.puppet.config_groups << config_group
-        result = Host.search_for("class = #{config_group.puppetclass_names.first}")
+        result = Host.search_for("puppetclass = #{config_group.puppetclass_names.first}")
         assert_equal 1, result.count
         assert_includes result, host
       end

data/webpack/src/foreman_puppet_host_form.js

@@ -82,6 +82,9 @@ export function updatePuppetclasses(element) {
 export function reloadPuppetclassParams() {
   const hostId = $('form.hostresource-form').data('id');
   const url = $('#puppet_klasses_parameters').data('url');
+  if (!url) {
+    return;
+  }
   let data = window.serializeForm().replace('method=patch', 'method=post');
   if (url.match('hostgroups')) {
     data += `&hostgroup_id=${hostId}`;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -436,76 +436,76 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
 - test/controllers/foreman_puppet/config_groups_controller_test.rb
-- test/controllers/foreman_puppet/environments_controller_test.rb
 - test/controllers/foreman_puppet/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/hosts_controller_test.rb
 - test/controllers/foreman_puppet/puppet_smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/puppetclass_lookup_keys_controller_test.rb
 - test/controllers/foreman_puppet/puppetclasses_controller_test.rb
+- test/controllers/foreman_puppet/environments_controller_test.rb
+- test/controllers/foreman_puppet/hosts_controller_test.rb
 - test/controllers/provisioning_templates_controller_test.rb
 - test/factories/foreman_puppet_factories.rb
 - test/factories/host_puppet_enhancements.rb
 - test/factories/proxy_puppet_enhancements.rb
 - test/graphql/mutations/hosts/create_mutation_test.rb
-- test/graphql/queries/environment_query_test.rb
 - test/graphql/queries/environments_query_test.rb
 - test/graphql/queries/host_puppet_query_test.rb
 - test/graphql/queries/hostgroup_puppet_query_test.rb
 - test/graphql/queries/location_query_test.rb
 - test/graphql/queries/organization_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb
+- test/graphql/queries/environment_query_test.rb
+- test/graphql/queries/puppetclass_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
-- test/integration/foreman_puppet/host_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/puppetclass_js_test.rb
 - test/integration/foreman_puppet/smartclass_parameter_js_test.rb
-- test/integration_puppet_helper.rb
+- test/integration/foreman_puppet/host_js_test.rb
 - test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/config_group_test.rb
 - test/models/foreman_puppet/environment_test.rb
 - test/models/foreman_puppet/host_config_group_test.rb
-- test/models/foreman_puppet/host_puppet_facet_test.rb
-- test/models/foreman_puppet/host_test.rb
 - test/models/foreman_puppet/hostgroup_puppet_facet_test.rb
 - test/models/foreman_puppet/hostgroup_test.rb
 - test/models/foreman_puppet/lookup_value_test.rb
-- test/models/foreman_puppet/provisioning_template_test.rb
 - test/models/foreman_puppet/puppetclass_lookup_key_test.rb
-- test/models/foreman_puppet/puppetclass_test.rb
 - test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/user_test.rb
-- test/services/foreman_puppet/host_counter_test.rb
+- test/models/foreman_puppet/provisioning_template_test.rb
+- test/models/foreman_puppet/puppetclass_test.rb
+- test/models/foreman_puppet/host_puppet_facet_test.rb
+- test/models/foreman_puppet/host_test.rb
 - test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
 - test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
 - test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
-- test/test_puppet_helper.rb
+- test/services/foreman_puppet/host_counter_test.rb
 - test/unit/foreman_puppet/access_permissions_test.rb
-- test/unit/foreman_puppet/global_id_test.rb
 - test/unit/foreman_puppet/puppet_class_importer_test.rb
 - test/unit/foreman_puppet/template_rendering_test.rb
+- test/unit/foreman_puppet/global_id_test.rb
 - test/unit/foreman_puppet_test.rb
+- test/test_puppet_helper.rb
+- test/integration_puppet_helper.rb