foreman_puppet 1.0.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8a5c7b68f8d77f54787c4c9de924bc02f27d7a0f957fc6539b5b4aa6c64b49
-  data.tar.gz: 6cd563d9cc2f56c22186bbbb0fb9d3c9679c8718e965d7fd952bbed3efacf222
+  metadata.gz: 551d9a6cf7153dfc0bb5a4709bbd394bc6d2ba5354b16531de6787653ca1d185
+  data.tar.gz: cacbf35dfb12c49175bd0ee95ea8cf4b441319c140b7401c5527b8231a9000f0
 SHA512:
-  metadata.gz: 1a09cf7ff50545983f0e472b3c03f0708087dddf8d2136dc32978f49a1fd76ba7ca4c716db6e6b3add3055279745754b2d2eddf2cd1630a91e75187ba9683c1e
-  data.tar.gz: 5c4bb18d77784e2a9c43c7f102adc9df6469b739525fee007d1c89bf635713e1dd051140489101ebeb9d66298100195f56571fa5fb55a1a179c8381cac56a65b
+  metadata.gz: 6c28a424fb8afdb633134b1f57fa7254ead445a7a1e45d3b8bc97cbfc3ffd42a0dbb80df33ae2d7cc52d55cc12575078a773b3ed5ae3b9a360f9afb26d2631b8
+  data.tar.gz: d29c6598e1709bfddceb64e92fe16f33df55ce5eb85288e3f3ad14d590aa59d88515c37fd7116a252d889deb416bb652449c6fa6de3ef4baad5e27bfd9547bc8

data/README.md

@@ -37,7 +37,9 @@ You can install it on Foreman 2.5 to prepare for the Foreman update.
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.0        | ~> 1.0       | Required                                 |
+| >= 3.2        | ~> 3.0       | Required                                 |
+| ~> 3.1        | ~> 2.0       | Required                                 |
+| ~> 3.0        | ~> 1.0       | Required                                 |
 | >= 2.5        | ~> 0.1       | Optional; replaces Core features         |
 | < 2.5         | -            | Not supported (functionality is in Core) |
 

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,8 +1,10 @@
 module ForemanPuppet
-  module Api
-    module ImportPuppetclassesCommonController
+  module Extensions
+    module ApiSmartProxiesController
       extend ActiveSupport::Concern
 
+      NewEnvironment = Struct.new('Environment', :name)
+
       included do
         before_action :find_required_puppet_proxy, only: [:import_puppetclasses]
         before_action :find_environment_id, only: [:import_puppetclasses]
@@ -70,17 +72,24 @@ module ForemanPuppet
                              @changed['updated'].keys + @changed['ignored'].keys).uniq.sort
 
         @environments = environment_names.map do |name|
-          OpenStruct.new(name: name)
+          NewEnvironment.new(name)
         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
 
         @environments.any?
       end
 
+      # rubocop:disable Metrics/MethodLength
       def import_changed_proxy_environments
         opts = { url: @smart_proxy.url }
         opts[:env] = if @environment.present?
@@ -92,7 +101,8 @@ module ForemanPuppet
         changed = @importer.changes
 
         # check if environemnt id passed in URL is name of NEW environment in puppetmaster that doesn't exist in db
-        if @environment || (changed['new'].key?(@env_id) && (@environment ||= OpenStruct.new(name: @env_id)))
+        @environment ||= NewEnvironment.new(@env_id) if changed['new'].key?(@env_id)
+        if @environment
           # only return :keys equal to @environment in @changed hash
           %w[new obsolete updated ignored].each do |kind|
             changed[kind].slice!(@environment.name) unless changed[kind].empty?
@@ -109,6 +119,7 @@ module ForemanPuppet
         render_message(msg, status: :internal_server_error)
         nil
       end
+      # rubocop:enable Metrics/MethodLength
 
       def find_required_puppet_proxy
         id = params.key?('smart_proxy_id') ? params['smart_proxy_id'] : params['id']

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/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_hostgroup.rb

@@ -44,14 +44,8 @@ module ForemanPuppet
       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
+        env_id = params.delete(:environment_id)
+        env_name = params.delete(:environment_name)
 
         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_*]")

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 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/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/foreman_puppet/config_groups/_config_group.html.erb

@@ -1,4 +1,8 @@
-<%= content_tag_for :li, config_group, (added ? :selected : nil), :id => "config_group_#{config_group.id}", :class => css_class.to_s do %>
+<%
+  li_id = "#{added ? 'selected_' : '' }config_group_#{config_group.id}"
+  li_class = "#{added ? 'selected_config_group' : 'config_group'} #{css_class}"
+%>
+<%= content_tag :li, id: li_id, class: li_class do %>
   <%= hidden_field_tag("#{type}[config_group_ids][]", config_group.id) if added == 'manually' %>
   <span>
    <%= link_to(icon_text('plus', config_group.name), '#', :rel=>'twipsy', :class => 'config_group_name',

data/app/views/foreman_puppet/config_groups/index.html.erb

@@ -2,7 +2,7 @@
 <% content_for(:search_bar) { } %>
 <% title _('Config Groups') %>
 
-<% title_actions new_link(_('Create Config Group'), engine: foreman_puppet), help_button %>
+<% title_actions new_link(_('Create Config Group'), { engine: foreman_puppet }, id: 'new_config_group'), help_button %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>

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,5 +1,6 @@
 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?
@@ -10,6 +11,7 @@ class MigrateEnvironmentToPuppetFacet < ActiveRecord::Migration[6.0]
   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)