foreman_puppet 1.0.0 → 2.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e644faeeffa930e09b12d75395777a23aa7bec00b9dbdf16eeed14b3d2e9bc
-  data.tar.gz: 9da4592a03b0fc3431a8f3c12c8bd046782544b5df29419949471b5919388c66
+  metadata.gz: 61b910e24e11c9bd100021c5b87cc45b03eab68bc68260985f90d3510496d016
+  data.tar.gz: '08fa8d3c7bdf23231daf2e14332f68be4d2a79fe33195260de1c1b276924c2de'
 SHA512:
-  metadata.gz: 2e40390e1c1b70276056a455672397f0425c48fa71dda42cdf814f3718b3869f6b59ab3fa0250acbb5699754a9bdc7ef64640aef07e0cf1388e9b5b4ebc4fe27
-  data.tar.gz: c6a7e53a32381af7bef757d359e14e5828b3a3536e31f9291fda67af175ca637e971d605c302e479f49bf2e09c9ce8cdcf22494bcd28afe2244f19bbe429f053
+  metadata.gz: cb6a6d40b42d741a4f4010aa81b9bbfa7e0b330473637036522d0a8d7e2fa983cee353ee0a59c3eacd1a64314d3edb17dfa29ee95adb7d47f08938f2380e822a
+  data.tar.gz: 1e2f6b9ac9b996cbb368612dfb22d3adc03c89201d3d1931ca7920baf58090769160ded784c5094a3cfd1043ba22bf93b2926ff6de0075294630a7376179be6b

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
@@ -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

@@ -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
@@ -41,7 +40,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_hostgroup.rb

@@ -34,14 +34,8 @@ module ForemanPuppet
         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
+          env_id = params.delete(:environment_id)
+          env_name = params.delete(:environment_name)
 
           return unless env_id || env_name
           ::Foreman::Deprecation.api_deprecation_warning('param hostgroup[environment_*] has been deprecated in favor of hostgroup[puppet_attributes][environment_*]')

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/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/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/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/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/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

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/config/api_routes.rb

@@ -2,14 +2,6 @@ ForemanPuppet::Engine.routes.draw do
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v1|v2/, constraints: ApiConstraints.new(version: 2, default: true) do
       constraints(id: %r{[^/]+}) do
-        resources :puppet_smart_proxies, only: [] do
-          post :import_puppetclasses, on: :member, controller: 'environments'
-
-          resources :environments, only: [] do
-            post :import_puppetclasses, on: :member
-          end
-        end
-
         resources :config_groups, except: %i[new edit]
 
         resources :hosts, only: [] do
@@ -40,7 +32,7 @@ ForemanPuppet::Engine.routes.draw do
             end
           end
           resources :hosts, only: %i[index show], controller: '/api/v2/hosts'
-          resources :template_combinations, only: %i[index], controller: '/api/v2/template_combinations'
+          resources :template_combinations, only: %i[index show create update], controller: '/api/v2/template_combinations'
         end
 
         resources :puppetclasses, except: %i[new edit] do

data/config/initializers/api_reroute.rb

@@ -1,13 +1,81 @@
 Foreman::Application.routes.prepend do
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/, constraints: ApiConstraints.new(version: 2, default: true) do
-      resources :puppetclasses, controller: '/foreman_puppet/api/v2/puppetclasses', except: %i[new edit]
-      resources :environments, controller: '/foreman_puppet/api/v2/environments', except: %i[new edit]
-      resources :hosts, controller: '/foreman_puppet/api/v2/hosts', only: []
-      resources :hostgroups, controller: '/foreman_puppet/api/v2/hostgroups', only: %i[]
+      resources :smart_proxies, only: [] do
+        post :import_puppetclasses, on: :member
+        resources :environments, only: [] do
+          post :import_puppetclasses, on: :member, controller: '/api/v2/smart_proxies'
+        end
+      end
+
       resources :config_groups, controller: '/foreman_puppet/api/v2/config_groups', except: %i[new edit]
-      resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit]
+
+      resources :hosts, only: [] do
+        resources :puppetclasses, controller: '/foreman_puppet/api/v2/puppetclasses', except: %i[new edit]
+        resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+          resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+        end
+        resources :host_classes, path: :puppetclass_ids, controller: '/foreman_puppet/api/v2/host_classes', only: %i[index create destroy]
+      end
+
+      resources :hostgroups, only: [] do
+        resources :puppetclasses, controller: '/foreman_puppet/api/v2/puppetclasses', except: %i[new edit]
+        resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+          resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+        end
+        resources :hostgroup_classes, path: :puppetclass_ids, controller: '/foreman_puppet/api/v2/hostgroup_classes', only: %i[index create destroy]
+      end
+
+      resources :environments, controller: '/foreman_puppet/api/v2/environments', except: %i[new edit] do
+        resources :locations, only: %i[index show]
+        resources :organizations, only: %i[index show]
+        resources :smart_proxies, only: [] do
+          post :import_puppetclasses, on: :member
+        end
+        resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+          resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+        end
+        resources :puppetclasses, controller: '/foreman_puppet/api/v2/puppetclasses', except: %i[new edit] do
+          resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+            resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit destroy]
+          end
+        end
+        resources :hosts, only: %i[index show]
+        resources :template_combinations, only: %i[index show create update]
+      end
+
+      resources :puppetclasses, controller: '/foreman_puppet/api/v2/puppetclasses', except: %i[new edit] do
+        resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+          resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+        end
+        resources :environments, controller: '/foreman_puppet/api/v2/environments', only: %i[index show] do
+          resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create] do
+            resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+          end
+        end
+      end
+
+      resources :smart_class_parameters, controller: '/foreman_puppet/api/v2/smart_class_parameters', except: %i[new edit create destroy] do
+        resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+      end
+
       resources :override_values, controller: '/foreman_puppet/api/v2/override_values', except: %i[new edit]
+
+      resources :locations, only: [] do
+        resources :environments, controller: '/foreman_puppet/api/v2/environments', only: %i[index show]
+
+        resources :organizations, only: [] do
+          resources :environments, controller: '/foreman_puppet/api/v2/environments', only: %i[index show]
+        end
+      end
+
+      resources :organizations, only: [] do
+        resources :environments, controller: '/foreman_puppet/api/v2/environments', only: %i[index show]
+
+        resources :locations, only: [] do
+          resources :environments, controller: '/foreman_puppet/api/v2/environments', only: %i[index show]
+        end
+      end
     end
   end
 end

data/db/migrate/20101121140000_add_environment_to_template_combinations.foreman_puppet.rb

@@ -4,6 +4,6 @@ class AddEnvironmentToTemplateCombinations < ActiveRecord::Migration[4.2]
   end
 
   def down
-    remove_reference :template_combinations, :environment, foreign_key: true if ForemanPuppet.extracted_from_core?
+    remove_reference :template_combinations, :environment, foreign_key: true
   end
 end

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

@@ -1,15 +1,17 @@
 class MigrateEnvironmentToPuppetFacet < ActiveRecord::Migration[6.0]
   def up
+    return true unless column_exists?(:hosts, :environment_id)
     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
+    return true unless column_exists?(:hosts, :environment_id)
     hostgroup_facet_ids = ForemanPuppet::HostgroupPuppetFacet.all.pluck(:hostgroup_id, :environment_id)
     hostgroup_facet_ids.each do |hostgroup_id, env_id|
       ::Hostgroup.unscoped.where(id: hostgroup_id).update_all(environment_id: env_id)

data/db/migrate/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb

@@ -0,0 +1,5 @@
+class RemoveKatelloIdFromEnvironments < ActiveRecord::Migration[6.0]
+  def up
+    remove_column :environments, :katello_id if column_exists?(:environments, :katello_id)
+  end
+end