foreman_puppet 11.2.1 → 11.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee8fc956e53814c9f276e80796cd39c0b979ee8efb0118f445bdaa3aeaae4b1
-  data.tar.gz: 0c1a043909e02f1bf0ab7d93f0263b06946f389aafcba6a3c04049d0cb2407c3
+  metadata.gz: 79831ddc74b8dd19b92504b30672177d03a555fe0706de935b66bbc8346f1e81
+  data.tar.gz: c32242bb3a5a5f796976755ccce35bc4a1a8bdbfc77c6f6534e984d8b68580e8
 SHA512:
-  metadata.gz: e79f8b99badcfcf8ec96f8bfa25cab1acfad8c9a446bdda32d4e5c7f5513abea7dd6366d57d01a9867d3a6d2c09ee22b015bdd713c8ed36fb8d144049425f29d
-  data.tar.gz: c771d98d700f1aaf4831cdbae044275fc3bb509104606e563c3f67d3c2439a10dd35b488b2aaa9ad7b060d7860bebd0b9b62513d8b4b80605c3402c5dc6b7a70
+  metadata.gz: 295d5d3cab2df086b6bf756a43215cc0b8369b3fd954cc89f690a26911ff357846ad0d8cfe2b1916ee629abe118a12cf55b4d35c0bcf0a26decd59d96eb11c01
+  data.tar.gz: 1667f24cf88f09b8eaf28873dec051813ff3d1862a389ed64dbf19d9639f2d5c97ef08d8a23e256abf9118041a87ca44f4e588d5abe6a0f45e08626d6c262bd2

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

@@ -34,7 +34,8 @@ module ForemanPuppet
         def completer_scope(field)
           return super unless ASSIGNMENT_RELATIONS.include?(field.relation)
 
-          field.klass.completer_scope(@options).reorder(Arel.sql(field.quoted_field))
+          options = @options.merge(autocomplete_resource: definition.klass)
+          field.klass.completer_scope(options).reorder(Arel.sql(field.quoted_field))
         end
       end
 

data/app/models/foreman_puppet/puppetclass.rb

@@ -62,6 +62,24 @@ module ForemanPuppet
       where(id: direct).or(where(id: via_hostgroup)).or(where(id: via_config_group))
     }
 
+    scope :assigned_to_hostgroups, lambda {
+      hostgroup_facets = ForemanPuppet::HostgroupPuppetFacet
+                         .where(hostgroup_id: ::Hostgroup.unscoped.with_taxonomy_scope.reorder(nil).select(:id))
+                         .select(:id)
+      direct = ForemanPuppet::HostgroupClass
+               .where(hostgroup_puppet_facet_id: hostgroup_facets)
+               .select(:puppetclass_id)
+      config_groups = ForemanPuppet::HostConfigGroup
+                      .where(
+                        host_type: ForemanPuppet::HostgroupPuppetFacet.polymorphic_name,
+                        host_id: hostgroup_facets
+                      )
+                      .select(:config_group_id)
+      via_config_group = ForemanPuppet::ConfigGroupClass.where(config_group_id: config_groups).select(:puppetclass_id)
+
+      where(id: direct).or(where(id: via_config_group))
+    }
+
     scoped_search on: :name, complete_value: true
     scoped_search relation: :environments, on: :name, complete_value: true, rename: 'environment'
     scoped_search relation: :organizations, on: :name, complete_value: true, rename: 'organization', only_explicit: true
@@ -165,7 +183,8 @@ module ForemanPuppet
     end
 
     def self.completer_scope(options)
-      super.merge(assigned_to_hosts)
+      assignment_scope = options[:autocomplete_resource] == ::Hostgroup ? assigned_to_hostgroups : assigned_to_hosts
+      super.merge(assignment_scope)
     end
   end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '11.2.1'.freeze
+  VERSION = '11.3.0'.freeze
 end

data/test/models/foreman_puppet/hostgroup_test.rb

@@ -97,6 +97,23 @@ module ForemanPuppet
       assert_not_includes hidden_config_groups, %(config_group =  "#{hidden_config_group.name}")
     end
 
+    test 'can complete Puppet class values assigned through a config group' do
+      config_group = hostgroup.puppet.config_groups.first
+      puppetclass = FactoryBot.create(:puppetclass)
+      config_group.puppetclasses << puppetclass
+      completions = ::Hostgroup.complete_for("puppetclass = #{puppetclass.name}")
+
+      assert_includes completions, %(puppetclass =  "#{puppetclass.name}")
+    end
+
+    test 'does not complete Puppet class values assigned only to hosts' do
+      host = FactoryBot.create(:host, :with_puppet_enc, :with_puppetclass)
+      puppetclass = host.puppet.puppetclasses.first
+      completions = ::Hostgroup.complete_for("puppetclass = #{puppetclass.name}")
+
+      assert_not_includes completions, %(puppetclass =  "#{puppetclass.name}")
+    end
+
     test 'searches Puppet class values assigned through a config group' do
       config_group = hostgroup.puppet.config_groups.first
       puppetclass = FactoryBot.create(:puppetclass)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 11.2.1
+  version: 11.3.0
 platform: ruby
 authors:
 - Ondřej Ezr