foreman_puppet 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c94283a315fba5f8c4f0d7cca627639f595cbbeb09a6806ab363762ba1b0334
-  data.tar.gz: 6a503f11d1be7297370f7d34557024e1a9186f579710ca73a902acb81b766ef8
+  metadata.gz: 7f8a5c7b68f8d77f54787c4c9de924bc02f27d7a0f957fc6539b5b4aa6c64b49
+  data.tar.gz: 6cd563d9cc2f56c22186bbbb0fb9d3c9679c8718e965d7fd952bbed3efacf222
 SHA512:
-  metadata.gz: be25708b1c38b99dfa4b2bee8d2e1f7da8f3f546a88a4a54b666673de28b08770b274e6cb098fa4eead33dc6770a93c4c1bba3e38dc45721ecbe148dbc9671b2
-  data.tar.gz: fa689ed7f12f34fc33fa7a0f9a7ca658ede1ca947cd4d37c77c10a015b5f933fd0d1116d0574bb308e743d4d9739990396005b5ff8ba9109d89df052f3332394
+  metadata.gz: 1a09cf7ff50545983f0e472b3c03f0708087dddf8d2136dc32978f49a1fd76ba7ca4c716db6e6b3add3055279745754b2d2eddf2cd1630a91e75187ba9683c1e
+  data.tar.gz: 5c4bb18d77784e2a9c43c7f102adc9df6469b739525fee007d1c89bf635713e1dd051140489101ebeb9d66298100195f56571fa5fb55a1a179c8381cac56a65b

data/app/controllers/concerns/foreman_puppet/extensions/hostgroups_controller_extensions.rb

@@ -23,7 +23,9 @@ module ForemanPuppet
       module Actions
         def nest
           super
-          @hostgroup.puppetclasses = @parent.puppetclasses
+          return unless @parent.puppet
+          puppet = @hostgroup.puppet || @hostgroup.build_puppet
+          puppet.puppetclasses = @parent.puppet.puppetclasses
         end
 
         def environment_selected
@@ -36,7 +38,7 @@ module ForemanPuppet
 
           puppet.puppetclasses = ForemanPuppet::Puppetclass.where(id: params[:hostgroup][:puppetclass_ids])
           puppet.config_groups = ForemanPuppet::ConfigGroup.where(id: params[:hostgroup][:config_group_ids])
-          render partial: 'hosts/form_puppet_enc_tab', locals: { host_or_hostgroup: @hostgroup, resource_type: :hostgroup }
+          render partial: 'hosts/form_puppet_enc_tab', locals: { subject: @hostgroup, resource_type: :hostgroup }
         end
 
         def puppetclass_parameters

data/app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb

@@ -41,7 +41,7 @@ module ForemanPuppet
         set_class_variables(@host)
         ::Taxonomy.as_taxonomy @organization, @location do
           if @environment || @hostgroup
-            render partial: 'hosts/form_puppet_enc_tab', locals: { host_or_hostgroup: @host, resource_type: :host }
+            render partial: 'hosts/form_puppet_enc_tab', locals: { subject: @host, resource_type: :host }
           else
             logger.info 'environment_id or hostgroup_id is required to render puppetclasses'
           end

data/app/controllers/concerns/foreman_puppet/extensions/parameters_host.rb

@@ -14,12 +14,7 @@ module ForemanPuppet
       module PatchedClassMethods
         def host_params_filter
           super.tap do |filter|
-            filter.permit :environment_id, :environment_name, :environment,
-              config_groups: [], config_group_ids: [], config_group_names: [],
-              puppetclasses: [], puppetclass_ids: [], puppetclass_names: []
-
-            # TODO: bring to core - this is what facets should do, but does not
-            filter.permit(puppet_attributes: {})
+            add_host_puppet_params_filter(filter)
           end
         end
       end
@@ -27,40 +22,54 @@ module ForemanPuppet
       module PatchedMethods
         def host_params(*attrs)
           params = super(*attrs)
-
-          process_deprecated_environment_params!(params)
-          process_deprecated_attributes!(params)
+          process_deprecated_puppet_params!(params)
           params
         end
+      end
 
-        def process_deprecated_environment_params!(params)
-          env_id = params.delete(:environment_id)
-          env_name = params.delete(:environment_name)
-          env = params.delete(:environment)
-
-          return unless env_id || env_name || env
-          ::Foreman::Deprecation.api_deprecation_warning('param host[environment_*] has been deprecated in favor of host[puppet_attributes][environment_*]')
+      class_methods do
+        def add_host_puppet_params_filter(filter)
+          filter.permit :environment_id, :environment_name, :environment,
+            config_groups: [], config_group_ids: [], config_group_names: [],
+            puppetclasses: [], puppetclass_ids: [], puppetclass_names: []
 
-          params[:puppet_attributes] ||= {}
-          params[:puppet_attributes][:environment_id] ||= env_id if env_id
-          params[:puppet_attributes][:environment_name] ||= env_name if env_name
-          params[:puppet_attributes][:environment] ||= env if env
+          # TODO: bring to core - this is what facets should do, but does not
+          filter.permit(puppet_attributes: {})
         end
+      end
+
+      def process_deprecated_puppet_params!(params, top_level_hash = controller_name.singularize)
+        process_deprecated_environment_params!(params, top_level_hash)
+        process_deprecated_attributes!(params, top_level_hash)
+      end
 
-        def process_deprecated_attributes!(params)
-          %w[puppetclass config_group].each do |relation|
-            ids = params.delete("#{relation}_ids".to_sym)
-            names = params.delete("#{relation}_names".to_sym)
-            plains = params.delete(relation.pluralize.to_sym)
+      def process_deprecated_environment_params!(params, top_level_hash = 'host')
+        env_id = params.delete(:environment_id)
+        env_name = params.delete(:environment_name)
+        env = params.delete(:environment)
 
-            next unless ids || names || plains
-            ::Foreman::Deprecation.api_deprecation_warning("param host[#{relation}_*] has been deprecated in favor of host[puppet_attributes][#{relation}_*]")
+        return unless env_id || env_name || env
+        ::Foreman::Deprecation.api_deprecation_warning("param #{top_level_hash}[environment_*] has been deprecated in favor of #{top_level_hash}[puppet_attributes][environment_*]")
 
-            params[:puppet_attributes] ||= {}
-            params[:puppet_attributes]["#{relation}_ids".to_sym] ||= ids if ids
-            params[:puppet_attributes]["#{relation}_names".to_sym] ||= names if names
-            params[:puppet_attributes][relation.pluralize.to_sym] ||= plains if plains
-          end
+        params[:puppet_attributes] ||= {}
+        params[:puppet_attributes][:environment_id] ||= env_id if env_id
+        params[:puppet_attributes][:environment_name] ||= env_name if env_name
+        params[:puppet_attributes][:environment] ||= env if env
+      end
+
+      def process_deprecated_attributes!(params, top_level_hash = 'host')
+        %w[puppetclass config_group].each do |relation|
+          ids = params.delete("#{relation}_ids".to_sym)
+          names = params.delete("#{relation}_names".to_sym)
+          plains = params.delete(relation.pluralize.to_sym)
+
+          next unless ids || names || plains
+          ::Foreman::Deprecation.api_deprecation_warning("param #{top_level_hash}[#{relation}_*] has been deprecated in favor of #{top_level_hash}[puppet_attributes][#{relation}_*]")
+
+          params[:puppet_attributes] ||= {}
+          params[:puppet_attributes]["#{relation}_ids".to_sym] ||= ids if ids
+          params[:puppet_attributes]["#{relation}_names".to_sym] ||= names if names
+          params[:puppet_attributes][relation.pluralize.to_sym] ||= plains if plains
         end
       end
     end

data/app/controllers/concerns/foreman_puppet/extensions/parameters_hostgroup.rb

@@ -14,12 +14,7 @@ module ForemanPuppet
       module PatchedClassMethods
         def hostgroup_params_filter
           super.tap do |filter|
-            filter.permit :environment_id, :environment_name,
-              config_group_ids: [], config_group_names: [],
-              puppetclass_ids: [], puppetclass_names: []
-
-            # TODO: bring to core - this is what facets should do, but does not
-            filter.permit(puppet_attributes: {})
+            add_hostgroup_puppet_params_filter(filter)
           end
         end
       end
@@ -27,42 +22,56 @@ module ForemanPuppet
       module PatchedMethods
         def hostgroup_params(*attrs)
           params = super(*attrs)
-
-          process_deprecated_hostgroup_environment_params!(params)
-          process_deprecated_hostgroup_attributes!(params)
+          process_deprecated_hostgroup_puppet_params!(params)
           params
         end
+      end
 
-        def process_deprecated_hostgroup_environment_params!(params)
-          env_id = env_name = nil
-          if ForemanPuppet.extracted_from_core?
-            env_id = params.delete(:environment_id)
-            env_name = params.delete(:environment_name)
-          else
-            env_id = params[:environment_id]
-            env_name = params[:environment_name]
-          end
+      class_methods do
+        def add_hostgroup_puppet_params_filter(filter)
+          filter.permit :environment_id, :environment_name,
+            config_group_ids: [], config_group_names: [],
+            puppetclass_ids: [], puppetclass_names: []
 
-          return unless env_id || env_name
-          ::Foreman::Deprecation.api_deprecation_warning('param hostgroup[environment_*] has been deprecated in favor of hostgroup[puppet_attributes][environment_*]')
+          # TODO: bring to core - this is what facets should do, but does not
+          filter.permit(puppet_attributes: {})
+        end
+      end
 
-          params[:puppet_attributes] ||= {}
-          params[:puppet_attributes][:environment_id] ||= env_id if env_id
-          params[:puppet_attributes][:environment_name] ||= env_name if env_name
+      def process_deprecated_hostgroup_puppet_params!(params, top_level_hash = 'hostgroup')
+        process_deprecated_hostgroup_environment_params!(params, top_level_hash)
+        process_deprecated_hostgroup_attributes!(params, top_level_hash)
+      end
+
+      def process_deprecated_hostgroup_environment_params!(params, top_level_hash = 'hostgroup')
+        env_id = env_name = nil
+        if ForemanPuppet.extracted_from_core?
+          env_id = params.delete(:environment_id)
+          env_name = params.delete(:environment_name)
+        else
+          env_id = params[:environment_id]
+          env_name = params[:environment_name]
         end
 
-        def process_deprecated_hostgroup_attributes!(params)
-          %w[puppetclass config_group].each do |relation|
-            ids = params.delete("#{relation}_ids")
-            names = params.delete("#{relation}_names")
+        return unless env_id || env_name
+        ::Foreman::Deprecation.api_deprecation_warning("param #{top_level_hash}[environment_*] has been deprecated in favor of #{top_level_hash}[puppet_attributes][environment_*]")
 
-            next unless ids || names
-            ::Foreman::Deprecation.api_deprecation_warning("param hostgroup[#{relation}_*] has been deprecated in favor of hostgroup[puppet_attributes][#{relation}_*]")
+        params[:puppet_attributes] ||= {}
+        params[:puppet_attributes][:environment_id] ||= env_id if env_id
+        params[:puppet_attributes][:environment_name] ||= env_name if env_name
+      end
 
-            params[:puppet_attributes] ||= {}
-            params[:puppet_attributes]["#{relation}_ids".to_sym] ||= ids if ids
-            params[:puppet_attributes]["#{relation}_names".to_sym] ||= names if names
-          end
+      def process_deprecated_hostgroup_attributes!(params, top_level_hash = 'hostgroup')
+        %w[puppetclass config_group].each do |relation|
+          ids = params.delete("#{relation}_ids")
+          names = params.delete("#{relation}_names")
+
+          next unless ids || names
+          ::Foreman::Deprecation.api_deprecation_warning("param #{top_level_hash}[#{relation}_*] has been deprecated in favor of #{top_level_hash}[puppet_attributes][#{relation}_*]")
+
+          params[:puppet_attributes] ||= {}
+          params[:puppet_attributes]["#{relation}_ids".to_sym] ||= ids if ids
+          params[:puppet_attributes]["#{relation}_names".to_sym] ||= names if names
         end
       end
     end

data/app/helpers/foreman_puppet/puppet_smart_proxies_helper.rb

@@ -4,5 +4,9 @@ module ForemanPuppet
     def hosts_path(*attrs)
       main_app.hosts_path(*attrs)
     end
+
+    def host_config_reports_path(*attrs)
+      main_app.host_config_reports_path(*attrs)
+    end
   end
 end

data/app/models/foreman_puppet/host_puppet_facet.rb

@@ -48,7 +48,7 @@ module ForemanPuppet
 
     def parent_config_groups
       return [] unless host.hostgroup
-      host.hostgroup.puppet&.all_config_groups
+      host.hostgroup.puppet&.all_config_groups || []
     end
 
     def ensure_puppet_associations

data/app/models/foreman_puppet/hostgroup_puppet_facet.rb

@@ -48,6 +48,8 @@ module ForemanPuppet
       Hostgroup.sort_by_ancestry(hostgroup.ancestors.joins(:puppet).where(HostgroupPuppetFacet.arel_table[attr.to_sym].not_eq(nil))).last&.puppet.try(attr)
     end
 
+    delegate :parent_id, to: :hostgroup
+
     # and helpers
     def parent_facet_id
       parent_facet&.id

data/app/services/concerns/foreman_puppet/extensions/host_counter.rb

@@ -0,0 +1,17 @@
+module ForemanPuppet
+  module Extensions
+    module HostCounter
+      extend ActiveSupport::Concern
+
+      def counted_hosts
+        case @association.to_s
+        when 'environment'
+          hosts_scope = ::Host::Managed.reorder('').joins(:puppet)
+          hosts_scope.authorized(:view_hosts).group(HostPuppetFacet.arel_table[:environment_id]).count
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/views/hosts/_form_puppet_enc_tab.html.erb

@@ -1,6 +1,5 @@
 <% resource_type ||= pagelet.opts[:resource_type] %>
-<% host_or_hostgroup ||= local_assigns[resource_type] %>
-<% obj = (host_or_hostgroup.puppet || host_or_hostgroup.build_puppet) if %i[host hostgroup].include?(resource_type) %>
+<% obj = (subject.puppet || subject.build_puppet) if %i[host hostgroup].include?(resource_type) %>
 <% if resource_type == :host %>
 <span id="puppet_klasses_reload_url" data-url="<%= foreman_puppet.hostgroup_or_environment_selected_hosts_path %>"></span>
 <% elsif resource_type == :hostgroup %>
@@ -18,7 +17,7 @@
             text: _('Please select an environment first')) %>
 <% end %>
 
-<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(action: :puppetclass_parameters, only_path: true) %>">
+<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
   <h2><%= _('Puppet Class Parameters') %></h2>
-  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: host_or_hostgroup %>
+  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
 </fieldset>

data/db/migrate/20200803113803_migrate_environment_to_puppet_facet.foreman_puppet.rb

@@ -2,11 +2,11 @@ class MigrateEnvironmentToPuppetFacet < ActiveRecord::Migration[6.0]
   def up
     puppet_hostgroups = ::Hostgroup.unscoped.where.not(environment_id: nil).pluck(:id, :environment_id)
     puppet_hostgroups.map! { |hg_id, env_id| { hostgroup_id: hg_id, environment_id: env_id } }
-    ForemanPuppet::HostgroupPuppetFacet.insert_all(puppet_hostgroups) if puppet_hostgroups.any?
+    ForemanPuppet::HostgroupPuppetFacet.insert_all!(puppet_hostgroups) if puppet_hostgroups.any?
 
     puppet_hosts = Host::Managed.unscoped.where.not(environment_id: nil).pluck(:id, :environment_id)
     puppet_hosts.map! { |host_id, env_id| { host_id: host_id, environment_id: env_id } }
-    ForemanPuppet::HostPuppetFacet.insert_all(puppet_hosts) if puppet_hosts.any?
+    ForemanPuppet::HostPuppetFacet.insert_all!(puppet_hosts) if puppet_hosts.any?
   end
 
   def down

data/db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb

@@ -13,26 +13,8 @@ class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
   end
 
   def up
-    host_config_group_ids = FakeHostConfigGroup.for_host.pluck(:host_id).uniq
-    host_config_group_ids.each do |host_id|
-      host_facet_id = ForemanPuppet::HostPuppetFacet.where(host_id: host_id).pick(:id)
-      host_groups = FakeHostConfigGroup.for_host.where(host_id: host_id)
-      if host_facet_id
-        host_groups.update_all(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_facet_id)
-      else
-        deleted_groups = FakeConfigGroup.where(id: host_groups.pluck(:config_group_id)).pluck(:name)
-        say "deleting groups #{deleted_groups.join(', ')} from Host (id=#{host_id}) because it has no environment"
-        host_groups.delete_all
-      end
-    end
-    hostgroup_config_group_ids = FakeHostConfigGroup.for_hostgroup.pluck(:host_id).uniq
-    hostgroup_config_group_ids.each do |hostgroup_id|
-      hostgroup_facet_id = ForemanPuppet::HostgroupPuppetFacet.where(hostgroup_id: hostgroup_id).pick(:id)
-      hostgroup_facet_id ||= ForemanPuppet::HostgroupPuppetFacet.create!(hostgroup: Hostgroup.unscoped.find(hostgroup_id)).id
-      FakeHostConfigGroup.for_hostgroup
-                         .where(host_id: hostgroup_id)
-                         .update_all(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
-    end
+    migrate_host_data_to_facets
+    migrate_hostgroup_data_to_facets
   end
 
   def down
@@ -51,4 +33,38 @@ class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
                          .update_all(host_type: 'Hostgroup', host_id: hostgroup_facet_ids[hostgroup_facet_id])
     end
   end
+
+  private
+
+  def migrate_host_data_to_facets
+    host_config_group_ids = FakeHostConfigGroup.for_host.pluck(:host_id).uniq
+    host_config_group_ids.each do |host_id|
+      host_facet_id = ForemanPuppet::HostPuppetFacet.where(host_id: host_id).pick(:id)
+      host_groups = FakeHostConfigGroup.for_host.where(host_id: host_id)
+      if host_facet_id
+        host_groups.update_all(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_facet_id)
+      else
+        deleted_groups = FakeConfigGroup.where(id: host_groups.pluck(:config_group_id)).pluck(:name)
+        say "Deleting Config groups #{deleted_groups.join(', ')} from Host (id=#{host_id}) because the Host doesn't exist or has no environment"
+        host_groups.delete_all
+      end
+    end
+  end
+
+  def migrate_hostgroup_data_to_facets
+    hostgroup_config_group_ids = FakeHostConfigGroup.for_hostgroup.pluck(:host_id).uniq
+    hostgroup_config_group_ids.each do |hostgroup_id|
+      hostgroup = Hostgroup.unscoped.find_by(id: hostgroup_id)
+      hostgroup_groups = FakeHostConfigGroup.for_hostgroup.where(host_id: hostgroup_id)
+      if hostgroup
+        hostgroup_facet_id = ForemanPuppet::HostgroupPuppetFacet.where(hostgroup_id: hostgroup_id).pick(:id)
+        hostgroup_facet_id ||= ForemanPuppet::HostgroupPuppetFacet.create!(hostgroup: hostgroup).id
+        hostgroup_groups.update_all(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
+      else
+        deleted_groups = FakeConfigGroup.where(id: hostgroup_groups.pluck(:config_group_id)).pluck(:name)
+        say "Deleting Config groups #{deleted_groups.join(', ')} from Hostgroup (id=#{hostgroup_id}) because Hostgroup doesn't exist"
+        hostgroup_groups.delete_all
+      end
+    end
+  end
 end

data/db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb

@@ -0,0 +1,10 @@
+class CleanupEnvironmentFromCoreTables < ActiveRecord::Migration[6.0]
+  def up
+    ::Hostgroup.update_all(environment_id: nil) if column_exists?(:hostgroups, :environment_id)
+    Host::Managed.update_all(environment_id: nil) if column_exists?(:hosts, :environment_id)
+  end
+
+  def down
+    # nothing to do
+  end
+end

data/lib/foreman_puppet/engine.rb

@@ -79,6 +79,8 @@ module ForemanPuppet
       ::TemplateCombination.include ForemanPuppet::Extensions::TemplateCombination
       ::ProvisioningTemplate.include ForemanPuppet::Extensions::ProvisioningTemplate
 
+      ::HostCounter.prepend ForemanPuppet::Extensions::HostCounter
+
       ::Api::V2::BaseController.include ForemanPuppet::Extensions::ApiBaseController
       ::Api::V2::HostsController.include ForemanPuppet::Extensions::ApiV2HostsController
       ::Api::V2::HostgroupsController.include ForemanPuppet::Extensions::ApiHostgroupsController

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.5'.freeze
 end