foreman_puppet 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c268d86cd3905acdfcd56bc9898df23218553a632bb167c08de6c708351ee8
-  data.tar.gz: fc9d44ecfdd418571796ccc39a302a5ac086bae221bc155ba5e827edfd45a9f0
+  metadata.gz: c850f32331462f52510a8e895c149eb470e9982ad819de78529c38c888ab549c
+  data.tar.gz: 81460cb582b62baa3f96083c3573a99607a9b2619d2a20c31df4f41da48677c6
 SHA512:
-  metadata.gz: e4169751ebd02e01e6628a8583490d7257e27c7f0852e7539fc42b4b989258d3efef9324c684db31776a0d8f48e9360d0e3d40bdb12c03e8dd66d923f7d521e2
-  data.tar.gz: a0384e376fa23ed7dd0ada27f525d04cbeaebd19a1933e91ce97628dc3a4abe74ba79d6857040e4c920071e3afeef7858d121329ecbd3f6db2aa0486de9dba5f
+  metadata.gz: f0b20469d894d6a1cc2e8c6f486ef5f09dd9c04742c0be684f68846fe930536a813ee404fb30af2ba0ae9031df6c2c00ea3a4af0233be5b24640b81d2a58d031
+  data.tar.gz: 16cab8e0431a72b04795046e4e66ca67a029247f4bf182a7a3f36e7ec8f2c5d45a1ae3db4ce8d96a48869a698eebec284eef6d9c0290d10270c41ab19789d0ee

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

@@ -6,25 +6,23 @@ module ForemanPuppet
       included do
         prepend PatchMethods
 
-        if ForemanPuppet.extracted_from_core?
-          method_desc = Apipie.get_method_description(self, :index)
-          method_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/puppetclasses/:puppetclass_id/hostgroups', N_('List all host groups for a Puppet class'), {})
+        method_desc = Apipie.get_method_description(self, :index)
+        method_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/puppetclasses/:puppetclass_id/hostgroups', N_('List all host groups for a Puppet class'), {})
 
-          apipie_update_methods([:index]) do
-            param :puppetclass_id, String, desc: N_('ID of Puppetclass')
-          end
+        apipie_update_methods([:index]) do
+          param :puppetclass_id, String, desc: N_('ID of Puppetclass')
+        end
 
-          apipie_update_methods(%i[create update]) do
-            param :hostgroup, Hash do
-              param :environment_id, String, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/environment_id')
-              param :puppetclass_ids, Array, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/puppetclass_ids')
-              param :config_group_ids, Array, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/config_group_ids')
+        apipie_update_methods(%i[create update]) do
+          param :hostgroup, Hash do
+            param :environment_id, String, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/environment_id')
+            param :puppetclass_ids, Array, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/puppetclass_ids')
+            param :config_group_ids, Array, desc: N_('Deprecated in favor of hostgroup/puppet_attributes/config_group_ids')
 
-              param :puppet_attributes, Hash do
-                param :environment_id, String, desc: N_('ID of associated puppet Environment')
-                param :puppetclass_ids, Array, desc: N_('IDs of associated Puppetclasses')
-                param :config_group_ids, Array, desc: N_('IDs of associated ConfigGroups')
-              end
+            param :puppet_attributes, Hash do
+              param :environment_id, String, desc: N_('ID of associated puppet Environment')
+              param :puppetclass_ids, Array, desc: N_('IDs of associated Puppetclasses')
+              param :config_group_ids, Array, desc: N_('IDs of associated ConfigGroups')
             end
           end
         end

data/app/controllers/concerns/foreman_puppet/{api/import_puppetclasses_common_controller.rb → extensions/api_smart_proxies_controller.rb}

@@ -1,6 +1,6 @@
 module ForemanPuppet
-  module Api
-    module ImportPuppetclassesCommonController
+  module Extensions
+    module ApiSmartProxiesController
       extend ActiveSupport::Concern
 
       included do
@@ -74,7 +74,13 @@ module ForemanPuppet
         end
 
         unless @environments.any?
-          render_message(_('No changes to your environments detected'))
+          # check if environment id/name was valid at all
+          if @env_id && \
+             Environment.authorized(:view_environments).where(name: @env_id).or(Environment.authorized(:view_environments).where(id: @env_id)).empty?
+            render_message(_('The requested environment cannot be found.'))
+          else
+            render_message(_('No changes to your environments detected'))
+          end
           return false
         end
 

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

@@ -4,7 +4,29 @@ module ForemanPuppet
       extend ActiveSupport::Concern
 
       included do
-        if ForemanPuppet.extracted_from_core?
+        if Gem::Dependency.new('', '>= 3.1').match?('', SETTINGS[:version].notag)
+          index_desc = Apipie.get_method_description(self, :index)
+          index_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/environments/:environment_id/template_combinations', N_('List template combination'), {})
+
+          create_desc = Apipie.get_method_description(self, :create)
+          create_desc.apis << Apipie::MethodDescription::Api.new(:POST, '/environments/:environment_id/template_combinations', N_('Add a template combination'), {})
+
+          show_desc = Apipie.get_method_description(self, :show)
+          show_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/environments/:environment_id/template_combinations/:id', N_('Show template combination'), {})
+
+          update_desc = Apipie.get_method_description(self, :update)
+          update_desc.apis << Apipie::MethodDescription::Api.new(:PUT, '/environments/:environment_id/template_combinations/:id', N_('Update template combination'), {})
+
+          apipie_update_methods(%i[index create show update]) do
+            param :environment_id, String, desc: N_('ID of Puppet environment')
+          end
+
+          apipie_update_methods(%i[create update]) do
+            param :template_combination, Hash do
+              param :environment_id, :number, allow_nil: true, desc: N_('environment id')
+            end
+          end
+        elsif ForemanPuppet.extracted_from_core?
           apipie_update_methods(%i[index create show update]) do
             param :environment_id, nil, desc: N_('ID of environment')
           end

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

@@ -6,25 +6,23 @@ module ForemanPuppet
       included do
         prepend PatchMethods
 
-        if ForemanPuppet.extracted_from_core?
-          method_desc = Apipie.get_method_description(self, :index)
-          method_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/environments/:environment_id/hosts', N_('List hosts per environment'), {})
+        method_desc = Apipie.get_method_description(self, :index)
+        method_desc.apis << Apipie::MethodDescription::Api.new(:GET, '/environments/:environment_id/hosts', N_('List hosts per environment'), {})
 
-          apipie_update_methods([:index]) do
-            param :environment_id, String, desc: N_('ID of puppet environment')
-          end
+        apipie_update_methods([:index]) do
+          param :environment_id, String, desc: N_('ID of puppet environment')
+        end
 
-          apipie_update_methods(%i[create update]) do
-            param :host, Hash do
-              param :environment_id, String, desc: N_('Deprecated in favor of host/puppet_attributes/environment_id')
-              param :puppetclass_ids, Array, desc: N_('Deprecated in favor of host/puppet_attributes/puppetclass_ids')
-              param :config_group_ids, Array, desc: N_('Deprecated in favor of host/puppet_attributes/config_group_ids')
+        apipie_update_methods(%i[create update]) do
+          param :host, Hash do
+            param :environment_id, String, desc: N_('Deprecated in favor of host/puppet_attributes/environment_id')
+            param :puppetclass_ids, Array, desc: N_('Deprecated in favor of host/puppet_attributes/puppetclass_ids')
+            param :config_group_ids, Array, desc: N_('Deprecated in favor of host/puppet_attributes/config_group_ids')
 
-              param :puppet_attributes, Hash do
-                param :environment_id, String, desc: N_('ID of associated puppet Environment')
-                param :puppetclass_ids, Array, desc: N_('IDs of associated Puppetclasses')
-                param :config_group_ids, Array, desc: N_('IDs of associated ConfigGroups')
-              end
+            param :puppet_attributes, Hash do
+              param :environment_id, String, desc: N_('ID of associated puppet Environment')
+              param :puppetclass_ids, Array, desc: N_('IDs of associated Puppetclasses')
+              param :config_group_ids, Array, desc: N_('IDs of associated ConfigGroups')
             end
           end
         end
@@ -39,7 +37,7 @@ module ForemanPuppet
 
         def allowed_nested_id
           ids = super
-          ids << 'environment_id' if ForemanPuppet.extracted_from_core?
+          ids << 'environment_id'
           ids.uniq
         end
       end

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

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

@@ -31,7 +31,6 @@ module ForemanPuppet
         helper ForemanPuppet::PuppetclassLookupKeysHelper
       end
 
-      # TODO: unless ForemanPuppet.extracted_from_core?
       def select_multiple_puppet_proxy_hosts_path(*args)
         foreman_puppet.select_multiple_puppet_proxy_hosts_path(*args)
       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,50 @@ 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
-
-          return unless env_id || env_name
-          ::Foreman::Deprecation.api_deprecation_warning('param hostgroup[environment_*] has been deprecated in favor of hostgroup[puppet_attributes][environment_*]')
+      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: []
 
-          params[:puppet_attributes] ||= {}
-          params[:puppet_attributes][:environment_id] ||= env_id if env_id
-          params[:puppet_attributes][:environment_name] ||= env_name if env_name
+          # TODO: bring to core - this is what facets should do, but does not
+          filter.permit(puppet_attributes: {})
         end
+      end
 
-        def process_deprecated_hostgroup_attributes!(params)
-          %w[puppetclass config_group].each do |relation|
-            ids = params.delete("#{relation}_ids")
-            names = params.delete("#{relation}_names")
+      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
 
-            next unless ids || names
-            ::Foreman::Deprecation.api_deprecation_warning("param hostgroup[#{relation}_*] has been deprecated in favor of hostgroup[puppet_attributes][#{relation}_*]")
+      def process_deprecated_hostgroup_environment_params!(params, top_level_hash = 'hostgroup')
+        env_id = params.delete(:environment_id)
+        env_name = params.delete(:environment_name)
 
-            params[:puppet_attributes] ||= {}
-            params[:puppet_attributes]["#{relation}_ids".to_sym] ||= ids if ids
-            params[:puppet_attributes]["#{relation}_names".to_sym] ||= names if names
-          end
+        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_*]")
+
+        params[:puppet_attributes] ||= {}
+        params[:puppet_attributes][:environment_id] ||= env_id if env_id
+        params[:puppet_attributes][:environment_name] ||= env_name if env_name
+      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/controllers/foreman_puppet/api/v2/environments_controller.rb

@@ -2,7 +2,6 @@ module ForemanPuppet
   module Api
     module V2
       class EnvironmentsController < ::ForemanPuppet::Api::V2::PuppetBaseController
-        include ForemanPuppet::Api::ImportPuppetclassesCommonController
         include ForemanPuppet::Parameters::Environment
 
         resource_description do

data/app/controllers/foreman_puppet/api/v2/hostgroup_classes_controller.rb

@@ -20,7 +20,7 @@ module ForemanPuppet
 
         def create
           @hostgroup_class = HostgroupClass.create!(hostgroup_puppet_facet_id: @hostgroup.puppet.id, puppetclass_id: params[:puppetclass_id].to_i)
-          render json: { hostgroup_id: @hostgroup_class.hostgroup_id, puppetclass_id: @hostgroup_class.puppetclass_id }
+          render json: { hostgroup_id: @hostgroup.puppet.hostgroup_id, puppetclass_id: @hostgroup_class.puppetclass_id }
         end
 
         api :DELETE, '/hostgroups/:hostgroup_id/puppetclass_ids/:id/', N_('Remove a Puppet class from host group')

data/app/controllers/foreman_puppet/puppetclasses_controller.rb

@@ -14,7 +14,7 @@ module ForemanPuppet
 
     helper ForemanPuppet::PuppetclassLookupKeysHelper
 
-    # TODO: extracted_from_core?
+    # TODO: filter for facets needs improving
     def host_params(top_level_hash = controller_name.singularize)
       filter = self.class.host_params_filter
       filter.permit(puppet_attributes: {})

data/app/helpers/foreman_puppet/environments_helper.rb

@@ -10,7 +10,7 @@ module ForemanPuppet
 
     def environments_title_actions
       title_actions import_proxy_select(hash_for_import_environments_environments_path.merge(engine: foreman_puppet)),
-        button_group(new_link(_('Create Puppet Environment'), engine: foreman_puppet)),
+        button_group(new_link(_('Create Puppet Environment'), { engine: foreman_puppet }, id: 'new_environment')),
         button_group(help_button)
     end
   end

data/app/helpers/foreman_puppet/hosts_and_hostgroups_helper.rb

@@ -1,10 +1,5 @@
 module ForemanPuppet
   module HostsAndHostgroupsHelper
-    # TODO: remove me - prevents the puppetclass tab duplication
-    # unless ForemanPuppet.extracted_from_core?
-    def puppetclasses_tab(puppetclasses_receiver)
-    end
-
     def environment_inherited_by_default?(host)
       return false unless host.hostgroup && host.hostgroup_id_was.nil?
       return false if params[:action] == 'clone'

data/app/helpers/foreman_puppet/hosts_helper.rb

@@ -3,20 +3,16 @@ module ForemanPuppet
     UI.register_host_description do
       multiple_actions_provider :puppet_host_multiple_actions
       # otherwise registered twice
-      overview_buttons_provider :puppet_host_overview_buttons if ForemanPuppet.extracted_from_core?
-      overview_fields_provider :puppet_host_overview_fields if ForemanPuppet.extracted_from_core?
+      overview_buttons_provider :puppet_host_overview_buttons
+      overview_fields_provider :puppet_host_overview_fields
     end
 
     def puppet_host_multiple_actions
-      if ForemanPuppet.extracted_from_core?
-        actions = [{ action: [_('Change Environment'), foreman_puppet.select_multiple_environment_hosts_path], priority: 200 }]
-        if authorized_for(controller: :hosts, action: :edit) && SmartProxy.unscoped.authorized.with_features('Puppet').exists?
-          actions << { action: [_('Change Puppet Master'), foreman_puppet.select_multiple_puppet_proxy_hosts_path], priority: 1050 }
-        end
-        actions
-      else
-        []
+      actions = [{ action: [_('Change Environment'), foreman_puppet.select_multiple_environment_hosts_path], priority: 200 }]
+      if authorized_for(controller: :hosts, action: :edit) && SmartProxy.unscoped.authorized.with_features('Puppet').exists?
+        actions << { action: [_('Change Puppet Master'), foreman_puppet.select_multiple_puppet_proxy_hosts_path], priority: 1050 }
       end
+      actions
     end
 
     def puppet_host_overview_buttons(host)

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

@@ -3,20 +3,12 @@ module ForemanPuppet
     module Host
       extend ActiveSupport::Concern
 
-      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+      include ForemanPuppet::Extensions::HostCommon
 
       included do
         prepend PrependedMethods
 
-        if ForemanPuppet.extracted_from_core?
-          has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
-        else
-          env_assoc = reflect_on_association(:environment)
-          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
-
-          host_classes_assoc = reflect_on_association(:host_classes)
-          host_classes_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::HostClass')
-        end
+        has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
 
         include_in_clone puppet: %i[config_groups host_config_groups host_classes]
 
@@ -70,12 +62,6 @@ module ForemanPuppet
       end
 
       module PrependedMethods
-        # TODO: we can drop this once extracted_from_core?
-        def validate_association_taxonomy(association_name)
-          return if association_name.to_sym == :environment
-          super
-        end
-
         def provisioning_template(opts = {})
           opts[:environment_id] ||= puppet&.environment_id
           super(opts)

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

@@ -3,19 +3,14 @@ module ForemanPuppet
     module Hostgroup
       extend ActiveSupport::Concern
 
-      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+      include ForemanPuppet::Extensions::HostCommon
 
       included do
         class << self
           prepend PatchedClassMethods
         end
 
-        if ForemanPuppet.extracted_from_core?
-          has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
-        else
-          env_assoc = reflect_on_association(:environment)
-          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
-        end
+        has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
 
         include_in_clone puppet: %i[host_config_groups config_groups hostgroup_classes]
 

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

@@ -4,21 +4,16 @@ module ForemanPuppet
       extend ActiveSupport::Concern
 
       included do
-        if ForemanPuppet.extracted_from_core?
-          has_many :environments, through: :template_combinations
-          before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:environments)
+        has_many :environments, through: :template_combinations
+        before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:environments)
 
-          scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
+        scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
 
-          class << self
-            prepend PrependedClassMethods
-          end
-
-          prepend PrependedMethods
-        else
-          env_assoc = reflect_on_association(:environments)
-          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+        class << self
+          prepend PrependedClassMethods
         end
+
+        prepend PrependedMethods
       end
 
       module PrependedClassMethods

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

@@ -4,19 +4,14 @@ module ForemanPuppet
       extend ActiveSupport::Concern
 
       included do
-        if ForemanPuppet.extracted_from_core?
-          belongs_to :environment, class_name: 'ForemanPuppet::Environment'
+        belongs_to :environment, class_name: 'ForemanPuppet::Environment'
 
-          validates :environment_id, uniqueness: { scope: %i[hostgroup_id provisioning_template_id] }
+        validates :environment_id, uniqueness: { scope: %i[hostgroup_id provisioning_template_id] }
 
-          callback = __callbacks[:validate].detect do |v|
-            v.filter.is_a?(ActiveRecord::Validations::UniquenessValidator) && v.filter.attributes.include?(:hostgroup_id)
-          end
-          callback.filter.options[:scope] << :environment_id
-        else
-          env_assoc = reflect_on_association(:environment)
-          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+        callback = __callbacks[:validate].detect do |v|
+          v.filter.is_a?(ActiveRecord::Validations::UniquenessValidator) && v.filter.attributes.include?(:hostgroup_id)
         end
+        callback.filter.options[:scope] << :environment_id
       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/services/foreman_puppet/puppet_class_importer.rb

@@ -308,12 +308,6 @@ module ForemanPuppet
       env.puppetclasses.destroy classes
       # remove all old classes from hosts
       HostClass.joins(host: :puppet).where(HostPuppetFacet.arel_table[:environment_id].eq(env.id)).where(puppetclass_id: classes).destroy_all
-      unless ForemanPuppet.extracted_from_core?
-        # rubocop:disable Rails/SkipsModelValidations
-        Host.where(environment_id: env).update_all(environment_id: nil)
-        Hostgroup.where(environment_id: env).update_all(environment_id: nil)
-        # rubocop:enable Rails/SkipsModelValidations
-      end
       # we can't guaranty that the env would be removed as it might have hosts attached to it.
       env.destroy if klasses.include? '_destroy_'
       # remove all klasses that have no environment now

data/app/views/foreman_puppet/api/v2/host_puppet_facets/host_list.json.rabl

@@ -0,0 +1,3 @@
+glue(@facet) do
+  extends 'foreman_puppet/api/v2/host_puppet_facets/base'
+end

data/app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/base.json.rabl

@@ -1,3 +1,5 @@
+object @facet
+
 attributes :environment_id, :environment_name
 
 ForemanPuppet::HostgroupPuppetFacet.nested_attribute_fields.each do |nested_field|

data/app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_list.json.rabl

@@ -0,0 +1,3 @@
+glue(@facet) do
+  extends 'foreman_puppet/api/v2/hostgroup_puppet_facets/base'
+end