foreman_puppet 2.0.7 → 3.0.1

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -107,13 +107,13 @@ module ForemanPuppet
       test 'should return empty array if host has no hostgroup' do
         host = FactoryBot.create(:host, :with_puppet_enc)
         assert_not host.hostgroup
-        assert_equal [], host.puppet.parent_config_groups
+        assert_empty host.puppet.parent_config_groups
       end
 
       test 'should return empty array if hostgroup do not have puppet data' do
         hostgroup = FactoryBot.create(:hostgroup)
         host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup)
-        assert_equal [], host.puppet.parent_config_groups
+        assert_empty host.puppet.parent_config_groups
       end
     end
 

data/test/models/foreman_puppet/host_test.rb

@@ -4,13 +4,13 @@ module ForemanPuppet
   class HostTest < ActiveSupport::TestCase
     test 'should read the Puppetserver URL from its proxy settings' do
       host = FactoryBot.build_stubbed(:host)
-      assert_nil host.puppet_server_uri
-      assert_empty host.puppetmaster
+      expect(host.puppet_server_uri).must_be_nil
+      expect(host.puppetmaster).must_be_empty
 
       proxy = FactoryBot.create(:puppet_smart_proxy, url: 'https://smartproxy.example.com:8443')
       host.puppet_proxy = proxy
-      assert_equal 'https://smartproxy.example.com:8140', host.puppet_server_uri.to_s
-      assert_equal 'smartproxy.example.com', host.puppetmaster
+      expect(host.puppet_server_uri.to_s).must_equal 'https://smartproxy.example.com:8140'
+      expect(host.puppetmaster).must_equal 'smartproxy.example.com'
 
       features = {
         'puppet' => {
@@ -18,8 +18,8 @@ module ForemanPuppet
         },
       }
       SmartProxyFeature.import_features(proxy, features)
-      assert_equal 'https://puppet.example.com:8140', host.puppet_server_uri.to_s
-      assert_equal 'puppet.example.com', host.puppetmaster
+      expect(host.puppet_server_uri.to_s).must_equal 'https://puppet.example.com:8140'
+      expect(host.puppetmaster).must_equal 'puppet.example.com'
     end
 
     test 'should find smart proxy ids' do
@@ -141,12 +141,12 @@ module ForemanPuppet
         host = FactoryBot.create(:host, :with_puppet_enc, :with_config_group, :with_puppetclass, :with_parameter,
           hostgroup: hostgroup, environment: hostgroup.puppet.environment)
         copy = host.clone
-        assert_equal host.puppet.individual_puppetclasses.map(&:id), copy.puppet.individual_puppetclasses.map(&:id)
-        assert_equal host.puppet.classes_in_groups.map(&:id), copy.puppet.classes_in_groups.map(&:id)
-        assert_equal host.puppet.classes.map(&:id), copy.puppet.classes.map(&:id)
-        assert_equal host.puppet.available_puppetclasses.map(&:id), copy.puppet.available_puppetclasses.map(&:id)
-        assert_equal host.puppet.host_classes.map(&:puppetclass_id), copy.puppet.host_classes.map(&:puppetclass_id)
-        assert_equal host.puppet.host_config_groups.map(&:config_group_id), copy.puppet.host_config_groups.map(&:config_group_id)
+        expect(copy.puppet.individual_puppetclasses.map(&:id)).must_equal(host.puppet.individual_puppetclasses.map(&:id))
+        expect(copy.puppet.classes_in_groups.map(&:id)).must_equal(host.puppet.classes_in_groups.map(&:id))
+        expect(copy.puppet.classes.map(&:id)).must_equal(host.puppet.classes.map(&:id))
+        expect(copy.puppet.available_puppetclasses.map(&:id)).must_equal(host.puppet.available_puppetclasses.map(&:id))
+        expect(copy.puppet.host_classes.map(&:puppetclass_id)).must_equal(host.puppet.host_classes.map(&:puppetclass_id))
+        expect(copy.puppet.host_config_groups.map(&:config_group_id)).must_equal(host.puppet.host_config_groups.map(&:config_group_id))
       end
     end
 
@@ -232,20 +232,20 @@ module ForemanPuppet
       nodeinfo['parameters']['special_info'] = 'secret' # smart variable on apache
 
       info = host.info
-      assert_includes info.keys, 'environment'
-      assert_equal env.name, host.puppet.environment.name
-      assert_includes info.keys, 'parameters'
-      assert_includes info.keys, 'classes'
+      expect(host.puppet.environment.name).must_equal(env.name)
+      expect(info.keys).must_include 'environment'
+      expect(info.keys).must_include 'parameters'
+      expect(info.keys).must_include 'classes'
       # This worked in core, but it's beyond me how could have :shrug:
       # assert_equal(classes_params, info['classes'])
       # We are only importing classes in the method
-      assert_equal(classes_params.keys.sort, info['classes'].keys.sort)
+      expect(info['classes'].keys.sort).must_equal(classes_params.keys.sort)
       parameters = info['parameters']
-      assert_equal 'puppet', parameters['puppetmaster']
-      assert_equal 'xybxa6JUkz63w', parameters['root_pw']
-      assert_includes parameters.keys, 'foreman_subnets'
-      assert_includes parameters.keys, 'foreman_interfaces'
-      assert_equal '3.3.4.12', parameters['foreman_interfaces'].first['ip']
+      expect(parameters['puppetmaster']).must_equal 'puppet'
+      expect(parameters['root_pw']).must_equal 'xybxa6JUkz63w'
+      expect(parameters['foreman_interfaces'].first['ip']).must_equal '3.3.4.12'
+      expect(parameters.keys).must_include 'foreman_subnets'
+      expect(parameters.keys).must_include 'foreman_interfaces'
     end
 
     test 'should import from non-parameterized external nodes output' do

data/test/models/foreman_puppet/provisioning_template_test.rb

@@ -32,9 +32,9 @@ module ForemanPuppet
         assert tmplt.save
       end
       assert_nil tmplt.template_kind
-      assert_equal [], tmplt.hostgroups
-      assert_equal [], tmplt.environments
-      assert_equal [], tmplt.template_combinations
+      assert_empty tmplt.hostgroups
+      assert_empty tmplt.environments
+      assert_empty tmplt.template_combinations
     end
 
     test '#template_includes adds environment include' do

data/test/models/foreman_puppet/puppetclass_test.rb

@@ -17,7 +17,7 @@ module ForemanPuppet
     end
 
     test 'looking for a nonexistent host returns no puppetclasses' do
-      assert_equal [], Puppetclass.search_for('host = imaginaryhost.nodomain.what')
+      assert_empty Puppetclass.search_for('host = imaginaryhost.nodomain.what')
     end
 
     test 'Puppetclass singularize from custom inflection' do

data/test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb

@@ -28,7 +28,7 @@ module ForemanPuppet
       end
 
       it 'does not fail without puppet facet' do
-        assert_equal({}, cg_info.host_info)
+        assert_empty(cg_info.host_info)
       end
     end
   end

data/test/services/foreman_puppet/host_info_providers/puppet_info_test.rb

@@ -98,7 +98,7 @@ module ForemanPuppet
         puppetclass: puppetclass)
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
-      assert enc[puppetclass.name][lkey.key].nil?
+      assert_nil enc[puppetclass.name][lkey.key]
     end
 
     test '#enc should not return class parameters when lookup_value should use puppet default' do
@@ -113,7 +113,7 @@ module ForemanPuppet
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
-      assert enc[puppetclass.name][lkey.key].nil?
+      assert_nil enc[puppetclass.name][lkey.key]
     end
 
     test '#enc should return class parameters when default value and lookup_values should not use puppet default' do
@@ -160,7 +160,7 @@ module ForemanPuppet
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
-      assert enc[puppetclass.name][key.key].nil?
+      assert_nil enc[puppetclass.name][key.key]
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited hostgroups exist' do

data/test/unit/foreman_puppet/template_rendering_test.rb

@@ -3,7 +3,7 @@ require 'test_puppet_helper'
 module ForemanPuppet
   class TemplateRenderingTest < ActiveSupport::TestCase
     let(:host) { FactoryBot.build_stubbed(:host, :with_puppet_enc) }
-    let(:template) { OpenStruct.new(name: 'Test', template: 'Test') }
+    let(:template) { stub(name: 'Test', template: 'Test') }
     let(:source) { Foreman::Renderer::Source::Database.new(template) }
     let(:scope) do
       Class.new(Foreman::Renderer::Scope::Base) do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 3.0.1
 platform: ruby
 authors:
 - Ondřej Ezr
 - Shira Maximov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -169,13 +169,12 @@ files:
 - app/views/foreman_puppet/puppetclasses/edit.html.erb
 - app/views/foreman_puppet/puppetclasses/index.html.erb
 - app/views/hosts/_form_puppet_enc_tab.html.erb
-- app/views/hosts/foreman_puppet/_form_list_env_field_content.html.erb
-- app/views/hosts/foreman_puppet/_form_list_env_field_header.html.erb
 - app/views/hosts/foreman_puppet/_form_main_tab_fields.html.erb
 - app/views/hosts/select_multiple_environment.html.erb
 - app/views/provisioning_templates/_combination.html.erb
 - app/views/provisioning_templates/_combinations.html.erb
 - app/views/smart_proxies/plugins/_puppet.html.erb
+- app/views/smart_proxies/plugins/_puppet_ca.html.erb
 - config/api_routes.rb
 - config/initializers/api_reroute.rb
 - config/routes.rb
@@ -189,9 +188,6 @@ files:
 - db/migrate/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb
 - db/migrate/20211111125003_drop_puppetclasses_direct_references.foreman_puppet.rb
 - db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
-- db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb
-- db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb
-- db/migrate/20220421204325_drop_environment_from_host_and_hg.foreman_puppet.rb
 - db/migrate_foreman/20090722141107_create_environments.foreman_puppet.rb
 - db/migrate_foreman/20090802062223_create_puppetclasses.foreman_puppet.rb
 - db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb
@@ -218,81 +214,49 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_puppet.mo
-- locale/ca/foreman_puppet.edit.po
 - locale/ca/foreman_puppet.po
-- locale/ca/foreman_puppet.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_puppet.mo
 - locale/cs_CZ/foreman_puppet.edit.po
 - locale/cs_CZ/foreman_puppet.po
 - locale/cs_CZ/foreman_puppet.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_puppet.mo
-- locale/de/foreman_puppet.edit.po
 - locale/de/foreman_puppet.po
-- locale/de/foreman_puppet.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
 - locale/en/foreman_puppet.po.time_stamp
 - locale/en/foreman_puppet.pox
 - locale/en_GB/LC_MESSAGES/foreman_puppet.mo
-- locale/en_GB/foreman_puppet.edit.po
 - locale/en_GB/foreman_puppet.po
-- locale/en_GB/foreman_puppet.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_puppet.mo
-- locale/es/foreman_puppet.edit.po
 - locale/es/foreman_puppet.po
-- locale/es/foreman_puppet.po.time_stamp
 - locale/foreman_puppet.pot
 - locale/fr/LC_MESSAGES/foreman_puppet.mo
-- locale/fr/foreman_puppet.edit.po
 - locale/fr/foreman_puppet.po
-- locale/fr/foreman_puppet.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_puppet.mo
-- locale/gl/foreman_puppet.edit.po
 - locale/gl/foreman_puppet.po
-- locale/gl/foreman_puppet.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_puppet.mo
-- locale/it/foreman_puppet.edit.po
 - locale/it/foreman_puppet.po
-- locale/it/foreman_puppet.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_puppet.mo
-- locale/ja/foreman_puppet.edit.po
 - locale/ja/foreman_puppet.po
-- locale/ja/foreman_puppet.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_puppet.mo
-- locale/ko/foreman_puppet.edit.po
 - locale/ko/foreman_puppet.po
-- locale/ko/foreman_puppet.po.time_stamp
 - locale/messages.mo
 - locale/nl_NL/LC_MESSAGES/foreman_puppet.mo
-- locale/nl_NL/foreman_puppet.edit.po
 - locale/nl_NL/foreman_puppet.po
-- locale/nl_NL/foreman_puppet.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_puppet.mo
-- locale/pl/foreman_puppet.edit.po
 - locale/pl/foreman_puppet.po
-- locale/pl/foreman_puppet.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_puppet.mo
-- locale/pt_BR/foreman_puppet.edit.po
 - locale/pt_BR/foreman_puppet.po
-- locale/pt_BR/foreman_puppet.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_puppet.mo
-- locale/ru/foreman_puppet.edit.po
 - locale/ru/foreman_puppet.po
-- locale/ru/foreman_puppet.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_puppet.mo
-- locale/sv_SE/foreman_puppet.edit.po
 - locale/sv_SE/foreman_puppet.po
-- locale/sv_SE/foreman_puppet.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_puppet.mo
-- locale/zh_CN/foreman_puppet.edit.po
 - locale/zh_CN/foreman_puppet.po
-- locale/zh_CN/foreman_puppet.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_puppet.mo
-- locale/zh_TW/foreman_puppet.edit.po
 - locale/zh_TW/foreman_puppet.po
-- locale/zh_TW/foreman_puppet.po.time_stamp
 - package.json
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
@@ -328,7 +292,6 @@ files:
 - test/graphql/queries/puppetclass_query_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
@@ -336,6 +299,7 @@ files:
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/puppetclass_js_test.rb
 - test/integration/foreman_puppet/smartclass_parameter_js_test.rb
+- test/integration_puppet_helper.rb
 - test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/config_group_test.rb
 - test/models/foreman_puppet/environment_test.rb
@@ -385,7 +349,7 @@ homepage: https://github.com/theforeman/foreman_puppet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -400,74 +364,74 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
-- test/unit/foreman_puppet_test.rb
-- test/unit/foreman_puppet/puppet_class_importer_test.rb
-- test/unit/foreman_puppet/template_rendering_test.rb
-- test/unit/foreman_puppet/access_permissions_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
-- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
-- test/helpers/foreman_puppet/puppetclasses_helper_test.rb
-- test/integration/foreman_puppet/dashboard_js_test.rb
-- test/integration/foreman_puppet/host_js_test.rb
-- test/integration/foreman_puppet/hostgroup_js_test.rb
+- test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
+- test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
+- test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
+- test/services/foreman_puppet/host_counter_test.rb
 - test/integration/foreman_puppet/smartclass_parameter_js_test.rb
 - test/integration/foreman_puppet/puppetclass_js_test.rb
+- test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
-- test/factories/foreman_puppet_factories.rb
-- test/factories/host_puppet_enhancements.rb
-- test/factories/proxy_puppet_enhancements.rb
-- test/models/foreman_puppet/config_group_test.rb
+- test/integration/foreman_puppet/dashboard_js_test.rb
+- test/integration/foreman_puppet/host_js_test.rb
+- test/graphql/mutations/hosts/create_mutation_test.rb
+- test/graphql/queries/puppetclasses_query_test.rb
+- test/graphql/queries/host_puppet_query_test.rb
+- test/graphql/queries/puppetclass_query_test.rb
+- test/graphql/queries/organization_query_test.rb
+- test/graphql/queries/location_query_test.rb
+- test/graphql/queries/environment_query_test.rb
+- test/graphql/queries/hostgroup_puppet_query_test.rb
+- test/graphql/queries/environments_query_test.rb
+- test/integration_puppet_helper.rb
+- test/helpers/foreman_puppet/puppetclasses_helper_test.rb
+- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
+- test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/report_test.rb
+- test/models/foreman_puppet/puppetclass_lookup_key_test.rb
+- test/models/foreman_puppet/hostgroup_test.rb
+- test/models/foreman_puppet/config_group_test.rb
+- test/models/foreman_puppet/puppetclass_test.rb
 - test/models/foreman_puppet/host_puppet_facet_test.rb
-- test/models/foreman_puppet/host_test.rb
-- test/models/foreman_puppet/user_test.rb
-- test/models/foreman_puppet/provisioning_template_test.rb
 - test/models/foreman_puppet/host_config_group_test.rb
 - test/models/foreman_puppet/lookup_value_test.rb
-- test/models/foreman_puppet/hostgroup_test.rb
+- test/models/foreman_puppet/host_test.rb
 - test/models/foreman_puppet/hostgroup_puppet_facet_test.rb
-- test/models/foreman_puppet/puppetclass_lookup_key_test.rb
-- test/models/foreman_puppet/environment_test.rb
-- test/models/foreman_puppet/puppetclass_test.rb
-- test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
-- test/graphql/queries/hostgroup_puppet_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
-- test/graphql/queries/location_query_test.rb
-- test/graphql/queries/organization_query_test.rb
-- test/graphql/queries/puppetclasses_query_test.rb
-- test/graphql/queries/environment_query_test.rb
-- test/graphql/queries/environments_query_test.rb
-- test/graphql/queries/host_puppet_query_test.rb
-- test/graphql/mutations/hosts/create_mutation_test.rb
+- test/models/foreman_puppet/environment_test.rb
+- test/models/foreman_puppet/provisioning_template_test.rb
+- test/models/foreman_puppet/user_test.rb
+- test/unit/foreman_puppet_test.rb
+- test/unit/foreman_puppet/puppet_class_importer_test.rb
+- test/unit/foreman_puppet/access_permissions_test.rb
+- test/unit/foreman_puppet/template_rendering_test.rb
+- test/factories/foreman_puppet_factories.rb
+- test/factories/proxy_puppet_enhancements.rb
+- test/factories/host_puppet_enhancements.rb
 - test/test_puppet_helper.rb
-- test/controllers/provisioning_templates_controller_test.rb
-- test/controllers/foreman_puppet/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/puppetclass_lookup_keys_controller_test.rb
 - test/controllers/foreman_puppet/environments_controller_test.rb
 - test/controllers/foreman_puppet/puppet_smart_proxies_controller_test.rb
-- test/controllers/foreman_puppet/hosts_controller_test.rb
+- test/controllers/foreman_puppet/puppetclass_lookup_keys_controller_test.rb
+- test/controllers/foreman_puppet/hostgroups_controller_test.rb
+- test/controllers/foreman_puppet/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/config_groups_controller_test.rb
-- test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
-- test/services/foreman_puppet/host_counter_test.rb
-- test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
-- test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
+- test/controllers/foreman_puppet/hosts_controller_test.rb
+- test/controllers/provisioning_templates_controller_test.rb

data/app/views/hosts/foreman_puppet/_form_list_env_field_content.html.erb

@@ -1 +0,0 @@
-<td class="hidden-xs ellipsis"><%= host.environment %></td>

data/app/views/hosts/foreman_puppet/_form_list_env_field_header.html.erb

@@ -1 +0,0 @@
-<th class="hidden-xs" width="10%"><%= sort :environment, :as => _("Puppet Environment") %></th>

data/db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb

@@ -1,9 +0,0 @@
-class MigrateHostClassPermission < ActiveRecord::Migration[6.0]
-  def up
-    Permission.where(resource_type: 'HostClass').update_all(resource_type: 'ForemanPuppet::HostClass')
-  end
-
-  def down
-    # no can do
-  end
-end

data/db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb

@@ -1,15 +0,0 @@
-class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
-  def up
-    taxonomies = Taxonomy.unscoped.where("ignore_types LIKE '%Environment%'")
-    environment_ids = ForemanPuppet::Environment.unscoped.pluck(:id)
-
-    taxonomies.each do |tax|
-      new_types = tax.ignore_types.reject { |type| type == 'Environment' }
-      tax.update_columns(ignore_types: new_types)
-      taxable_rows = environment_ids.map do |env_id|
-        { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
-      end
-      TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
-    end
-  end
-end

data/db/migrate/20220421204325_drop_environment_from_host_and_hg.foreman_puppet.rb

@@ -1,8 +0,0 @@
-class DropEnvironmentFromHostAndHg < ActiveRecord::Migration[6.0]
-  def up
-    remove_column(:hostgroups, :environment_id) if column_exists?(:hostgroups, :environment_id)
-    remove_column(:hosts, :environment_id) if column_exists?(:hosts, :environment_id)
-  end
-
-  # This is just to clean up core, we do not want to add the columns again on uninstall
-end