foreman_puppet 1.0.5 → 2.0.0.alpha.2

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)

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

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

data/db/migrate/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

data/db/migrate_foreman/20090722141107_create_environments.rb

@@ -1,11 +1,11 @@
-class CreateEnvironments < ActiveRecord::Migration[5.0]
+class CreateEnvironments < ActiveRecord::Migration[4.2]
   def up
     create_table :environments do |t|
       t.string :name, null: false, limit: 255
       t.timestamps null: true
     end
     create_table :environments_puppetclasses do |t|
-      t.references :puppetclass, foreign_key: true
+      t.references :puppetclass, null: false
       t.references :environment, foreign_key: true
     end
   end

data/db/migrate_foreman/20090802062223_create_puppetclasses.rb

@@ -0,0 +1,28 @@
+class CreatePuppetclasses < ActiveRecord::Migration[4.2]
+  def up
+    create_table :puppetclasses do |t|
+      t.string :name, limit: 255
+      t.string :nameindicator, limit: 255
+      t.integer :operatingsystem_id
+
+      t.timestamps null: true
+    end
+    add_foreign_key(:environments_puppetclasses, :puppetclasses)
+
+    create_table :hosts_puppetclasses, id: false do |t|
+      t.references :puppetclass, null: false
+      t.references :host, null: false
+    end
+
+    create_table :operatingsystems_puppetclasses, id: false do |t|
+      t.references :puppetclass, null: false
+      t.references :operatingsystem, null: false
+    end
+  end
+
+  def down
+    drop_table :puppetclasses
+    drop_table :hosts_puppetclasses
+    drop_table :operatingsystems_puppetclasses
+  end
+end

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.rb

@@ -0,0 +1,12 @@
+class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
+  def up
+    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+      t.references :hostgroup, foreign_key: true, null: false
+      t.references :puppetclass, foreign_key: true, null: false
+    end
+  end
+
+  def down
+    drop_table :hostgroups_puppetclasses
+  end
+end

data/db/migrate_foreman/20110412103238_remove_unused_fields_from_puppet_classes.rb

@@ -0,0 +1,9 @@
+class RemoveUnusedFieldsFromPuppetClasses < ActiveRecord::Migration[4.2]
+  def up
+    remove_column :puppetclasses, :nameindicator
+    remove_column :puppetclasses, :operatingsystem_id
+  end
+
+  def down
+  end
+end

data/db/migrate_foreman/20110712070522_create_host_class.rb

@@ -0,0 +1,11 @@
+class CreateHostClass < ActiveRecord::Migration[4.2]
+  def up
+    rename_table :hosts_puppetclasses, :host_classes
+    add_column :host_classes, :id, :primary_key
+  end
+
+  def down
+    remove_column :host_classes, :id
+    rename_table :host_classes, :hosts_puppetclasses
+  end
+end

data/db/migrate_foreman/20120824142048_add_some_indexes.rb

@@ -0,0 +1,14 @@
+class AddSomeIndexes < ActiveRecord::Migration[4.2]
+  def change
+    # puppetclasses
+    add_index :puppetclasses, :name
+
+    # turn off Foreign Key checks
+    execute 'SET CONSTRAINTS ALL DEFERRED;' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+
+    add_foreign_key 'host_classes', 'hosts', name: 'host_classes_host_id_fk'
+    add_foreign_key 'host_classes', 'puppetclasses', name: 'host_classes_puppetclass_id_fk'
+    add_foreign_key 'operatingsystems_puppetclasses', 'operatingsystems', name: 'operatingsystems_puppetclasses_operatingsystem_id_fk'
+    add_foreign_key 'operatingsystems_puppetclasses', 'puppetclasses', name: 'operatingsystems_puppetclasses_puppetclass_id_fk'
+  end
+end

data/db/migrate_foreman/20121018152459_create_hostgroup_classes.rb

@@ -0,0 +1,11 @@
+class CreateHostgroupClasses < ActiveRecord::Migration[4.2]
+  def up
+    rename_table :hostgroups_puppetclasses, :hostgroup_classes
+    add_column :hostgroup_classes, :id, :primary_key
+  end
+
+  def down
+    remove_column :hostgroup_classes, :id
+    rename_table :hostgroup_classes, :hostgroups_puppetclasses
+  end
+end

data/db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.rb

@@ -2,7 +2,7 @@ class DeleteOrphanedSmartClassParameters < ActiveRecord::Migration[4.2]
   def up
     condition = 'NOT EXISTS (SELECT 1 FROM environment_classes WHERE environment_classes.puppetclass_lookup_key_id = lookup_keys.id)'
     LookupValue.joins(:lookup_key).where(condition).where("lookup_keys.type = 'PuppetclassLookupKey'").delete_all
-    PuppetclassLookupKey.where(condition).delete_all
+    LookupKey.where(condition).where(type: 'PuppetclassLookupKey').delete_all
   end
 
   def down

data/db/migrate_foreman/20180816134832_cast_lookup_key_values.rb

@@ -1,35 +1,5 @@
 class CastLookupKeyValues < ActiveRecord::Migration[5.1]
   def up
-    # Different LookupKey types handle casting a bit differently
-    PuppetclassLookupKey.unscoped.preload(:lookup_values).where(override: true).where.not(key_type: 'string').find_each do |key|
-      cast_key_and_values(key)
-    end
-  end
-
-  private
-
-  def cast_key_and_values(key)
-    fix_value(key, :default_value)
-    key.lookup_values.each do |lv|
-      fix_value(lv, :value)
-    end
-  end
-
-  def safemode_box
-    @safemode_box ||= Safemode::Box.new
-  end
-
-  def fix_value(obj, attribute)
-    return if obj.omit && !obj.try(:merge_default)
-    value = obj.send(attribute)
-    return unless value.is_a? String
-    return if value.contains_erb?
-    fixed = safemode_box.eval(value)
-    obj.update_column(attribute, fixed)
-  rescue StandardError => e
-    say "Failed to cast #{attribute} for #{obj.inspect}:"
-    say "Value: #{value}", subitem: true
-    say "Error: #{e.message}", subitem: true
-    say 'Perhaps it is invalid? Casting skipped, manual action may be needed.', subitem: true
+    # Do nothing, if this is upgrade from too old version, we are not supporting it.
   end
 end

data/db/migrate_foreman/20180831115634_add_uniqueness_to_puppetclass_name.rb

@@ -0,0 +1,24 @@
+class AddUniquenessToPuppetclassName < ActiveRecord::Migration[5.1]
+  class FakePuppetclass < ApplicationRecord
+    self.table_name = 'puppetclasses'
+  end
+
+  def up
+    names = FakePuppetclass.group(:name).count.select { |_key, value| value > 1 }.keys
+    unless names.empty?
+      names.each do |name|
+        classes = FakePuppetclass.where name: name
+        say "#{classes.count} Puppet classes with duplicate name detected: #{name}"
+      end
+      raise 'Please make sure there are no duplicate Puppet classes before continuing.'
+    end
+
+    remove_index :puppetclasses, :name
+    add_index :puppetclasses, :name, unique: true
+  end
+
+  def down
+    remove_index :puppetclasses, :name
+    add_index :puppetclasses, :name
+  end
+end

data/db/migrate_foreman/20181023112532_add_environment_puppetclass_id.rb

@@ -2,6 +2,6 @@
 class AddEnvironmentPuppetclassId < ActiveRecord::Migration[5.2]
   def change
     add_index :environment_classes, %i[environment_id puppetclass_id]
-    remove_index :environment_classes, :environment_id
+    remove_index(:environment_classes, :environment_id) if index_exists?(:environment_classes, :environment_id)
   end
 end

data/lib/foreman_puppet/engine.rb

@@ -1,38 +1,9 @@
 module ForemanPuppet
   class Engine < ::Rails::Engine
-    config.before_configuration do
-      unless ForemanPuppet.extracted_from_core?
-        require 'graphql'
-
-        module BaseObjectClassMethodPath
-          def field(*args, **kwargs, &block)
-            return if args.first == :environment && args.second.to_s == 'Types::Environment'
-            return if args.first == :environments && args.second.node_type.to_s == 'Types::Environment'
-            return if args.first == :puppetclass && args.second.to_s == 'Types::Puppetclass'
-            return if args.first == :puppetclasses && args.second.node_type.to_s == 'Types::Puppetclass'
-
-            super
-          end
-        end
-
-        module RelayClassicMutationClassMethodPath
-          # rubocop:disable Metrics/ParameterLists
-          def argument(name, type, *rest, loads: nil, **kwargs, &block)
-            # rubocop:enable Metrics/ParameterLists
-            return if [::Types::Environment, ::Types::Puppetclass].include?(loads)
-
-            super
-          end
-        end
-
-        GraphQL::Types::Relay::BaseObject.extend(BaseObjectClassMethodPath)
-        GraphQL::Schema::RelayClassicMutation.extend(RelayClassicMutationClassMethodPath)
-      end
-    end
-
     engine_name 'foreman_puppet'
     isolate_namespace ForemanPuppet
 
+    config.paths['db/migrate'] << 'db/migrate_foreman' if Gem::Dependency.new('', ">= #{ForemanPuppet::FOREMAN_DROP_MIGRATIONS_VERSION}").match?('', SETTINGS[:version].notag)
     config.paths['config/routes.rb'].unshift('config/api_routes.rb')
 
     initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |_app|
@@ -95,15 +66,12 @@ module ForemanPuppet
 
       ::SmartProxiesHelper::TABBED_FEATURES << 'Puppet'
 
-      unless ForemanPuppet.extracted_from_core?
-        ::HostInfo.local_entries.delete('HostInfoProviders::PuppetInfo'.safe_constantize)
-        ::HostInfo.local_entries.delete('HostInfoProviders::ConfigGroupsInfo'.safe_constantize)
-        ::ProxyStatus.status_registry.delete('ProxyStatus::Puppet'.safe_constantize)
-        Foreman.input_types_registry.input_types.delete('puppet_parameter')
-      end
       Foreman.input_types_registry.register(ForemanPuppet::InputType::PuppetParameterInput)
       ::ProxyStatus.status_registry.add(ForemanPuppet::ProxyStatus::Puppet)
 
+      # Extend smart_proxies API functionality
+      ::Api::V2::SmartProxiesController.include ForemanPuppet::Extensions::ApiSmartProxiesController
+
       # GraphQL
       ::Types::Host.include(ForemanPuppet::Types::HostExtensions)
       ::Types::Hostgroup.include(ForemanPuppet::Types::HostgroupExtensions)

data/lib/foreman_puppet/register.rb

@@ -1,34 +1,15 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 2.0.0'
+  requires_foreman '>= 3.0.0'
   # Add Global JS file for extending foreman-core components and routes
   register_global_js_file 'fills'
 
   apipie_documented_controllers(["#{ForemanPuppet::Engine.root}/app/controllers/foreman_puppet/api/v2/*.rb"])
 
-  unless ForemanPuppet.extracted_from_core?
-    # Remove core permissions
-    cfgs = %i[view_config_groups create_config_groups edit_config_groups destroy_config_groups]
-    plks = %i[view_external_parameters create_external_parameters edit_external_parameters
-              destroy_external_parameters]
-    pcls = %i[view_puppetclasses create_puppetclasses edit_puppetclasses destroy_puppetclasses import_puppetclasses]
-    (cfgs | plks | pcls).each do |perm_name|
-      p = Foreman::AccessControl.permission(perm_name)
-      Foreman::AccessControl.remove_permission(p)
-    end
-
-    delete_menu_item(:top_menu, :puppetclasses)
-    delete_menu_item(:top_menu, :config_groups)
-    delete_menu_item(:top_menu, :puppetclass_lookup_keys)
-    delete_menu_item(:top_menu, :environments)
-  end
-
   # TODO: maybe this would not be necessary if we rething the form
   %i[create_hostgroups edit_hostgroups].each do |perm|
     p = Foreman::AccessControl.permission(perm)
-    if ForemanPuppet.extracted_from_core?
-      p.actions << 'hostgroups/environment_selected'
-      p.actions << 'hostgroups/puppetclass_parameters'
-    end
+    p.actions << 'hostgroups/environment_selected'
+    p.actions << 'hostgroups/puppetclass_parameters'
     p.actions << 'foreman_puppet/puppetclasses/parameters'
   end
   p = Foreman::AccessControl.permission(:edit_hostgroups)
@@ -37,15 +18,13 @@ Foreman::Plugin.register :foreman_puppet do
   end
   %i[create_hosts edit_hosts].each do |perm|
     p = Foreman::AccessControl.permission(perm)
-    if ForemanPuppet.extracted_from_core?
-      p.actions << 'hosts/hostgroup_or_environment_selected'
-      p.actions << 'hosts/puppetclass_parameters'
-      if perm == :edit_hosts
-        p.actions << 'hosts/select_multiple_environment'
-        p.actions << 'hosts/update_multiple_environment'
-        p.actions << 'hosts/select_multiple_puppet_proxy'
-        p.actions << 'hosts/update_multiple_puppet_proxy'
-      end
+    p.actions << 'hosts/hostgroup_or_environment_selected'
+    p.actions << 'hosts/puppetclass_parameters'
+    if perm == :edit_hosts
+      p.actions << 'hosts/select_multiple_environment'
+      p.actions << 'hosts/update_multiple_environment'
+      p.actions << 'hosts/select_multiple_puppet_proxy'
+      p.actions << 'hosts/update_multiple_puppet_proxy'
     end
     p.actions << 'foreman_puppet/puppetclasses/parameters'
   end
@@ -168,13 +147,13 @@ Foreman::Plugin.register :foreman_puppet do
   register_facet ForemanPuppet::HostPuppetFacet, :puppet do
     configure_host do
       # extend_model ForemanPuppet::Extensions::Host
-      api_view list: 'foreman_puppet/api/v2/host_puppet_facets/base',
+      api_view list: 'foreman_puppet/api/v2/host_puppet_facets/host_list',
         single: 'foreman_puppet/api/v2/host_puppet_facets/host_single'
       template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
     end
     configure_hostgroup(ForemanPuppet::HostgroupPuppetFacet) do
-      api_view list: 'foreman_puppet/api/v2/hostgroup_puppet_facets/base',
+      api_view list: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_list',
         single: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single'
       template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
@@ -185,14 +164,6 @@ Foreman::Plugin.register :foreman_puppet do
     base_scope.preload(puppet: :environment)
   end
 
-  unless ForemanPuppet.extracted_from_core?
-    Rails.application.config.after_initialize do
-      list = Pagelets::Manager.instance.instance_variable_get(:@pagelets)['hosts/_form'][:main_tabs]
-      core_pagelet = list.detect { |pagelet| pagelet.opts[:id] == :puppet_klasses }
-      list.delete(core_pagelet)
-    end
-  end
-
   register_graphql_query_field :environment, 'ForemanPuppet::Types::Environment', :record_field
   register_graphql_query_field :environments, 'ForemanPuppet::Types::Environment', :collection_field
   register_graphql_query_field :puppetclass, 'ForemanPuppet::Types::Puppetclass', :record_field
@@ -212,12 +183,10 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100,
         onlyif: (host_onlyif if resource_type == :host)
 
-      if ForemanPuppet.extracted_from_core?
-        context.add_pagelet :main_tab_fields,
-          partial: 'hosts/foreman_puppet/form_main_tab_fields',
-          resource_type: resource_type,
-          priority: 100
-      end
+      context.add_pagelet :main_tab_fields,
+        partial: 'hosts/foreman_puppet/form_main_tab_fields',
+        resource_type: resource_type,
+        priority: 100
     end
   end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.5'.freeze
+  VERSION = '2.0.0.alpha.2'.freeze
 end

data/lib/foreman_puppet.rb

@@ -1,10 +1,5 @@
 module ForemanPuppet
-  FOREMAN_EXTRACTION_VERSION = '3.0'.freeze
-
-  def self.extracted_from_core?
-    ENV['PUPPET_EXTRACTED'].to_s == '1' ||
-      Gem::Dependency.new('', ">= #{FOREMAN_EXTRACTION_VERSION}").match?('', SETTINGS[:version].notag)
-  end
+  FOREMAN_DROP_MIGRATIONS_VERSION = '3.1'.freeze
 end
 
 require 'foreman_puppet/engine'