foreman_puppet 1.0.0 → 2.0.0.alpha.2

data/test/controllers/foreman_puppet/hostgroups_controller_test.rb

@@ -4,68 +4,88 @@ module ForemanPuppet
   class HostgroupsControllerTest < ActionController::TestCase
     tests ::HostgroupsController
 
-    setup do
-      @routes = ForemanPuppet::Engine.routes
+    context 'with core routes' do
+      describe '#nest' do
+        it 'works without puppetclasses' do
+          hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_puppetclass)
+
+          post :nest, params: { id: hostgroup.id }, session: set_session_user
+          assert_template 'new'
+        end
+
+        it 'works with puppetclasses' do
+          hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_puppetclass)
+
+          post :nest, params: { id: hostgroup.id }, session: set_session_user
+          assert_template 'new'
+        end
+      end
     end
 
-    describe '#environment_selected' do
+    context 'with plugin routes' do
       setup do
-        @environment = FactoryBot.create(:environment)
-        @puppetclass = FactoryBot.create(:puppetclass)
-        @hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, environment: @environment)
-        @params = {
-          id: @hostgroup.id,
-          hostgroup: {
-            name: @hostgroup.name,
-            environment_id: '',
-            puppetclass_ids: [@puppetclass.id],
-          },
-        }
+        @routes = ForemanPuppet::Engine.routes
       end
 
-      test 'should return the selected puppet classes on environment change' do
-        assert_equal 0, @hostgroup.puppet.puppetclasses.length
-
-        post :environment_selected, params: @params, session: set_session_user, xhr: true
-        assert_equal(1, assigns(:hostgroup).puppet.puppetclasses.length)
-        assert_include assigns(:hostgroup).puppet.puppetclasses, @puppetclass
-      end
+      describe '#environment_selected' do
+        setup do
+          @environment = FactoryBot.create(:environment)
+          @puppetclass = FactoryBot.create(:puppetclass)
+          @hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, environment: @environment)
+          @params = {
+            id: @hostgroup.id,
+            hostgroup: {
+              name: @hostgroup.name,
+              environment_id: '',
+              puppetclass_ids: [@puppetclass.id],
+            },
+          }
+        end
 
-      context 'environment_id param is set' do
-        test 'it will take the hostgroup params environment_id' do
-          other_environment = FactoryBot.create(:environment)
-          @params[:hostgroup][:environment_id] = other_environment.id
+        test 'should return the selected puppet classes on environment change' do
+          assert_equal 0, @hostgroup.puppet.puppetclasses.length
 
           post :environment_selected, params: @params, session: set_session_user, xhr: true
-          assert_equal assigns(:environment), other_environment
+          assert_equal(1, assigns(:hostgroup).puppet.puppetclasses.length)
+          assert_include assigns(:hostgroup).puppet.puppetclasses, @puppetclass
         end
-      end
 
-      test 'should not escape lookup values on environment change' do
-        hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, environment: @environment, puppetclasses: [@puppetclass])
-        lookup_key = FactoryBot.create(:puppetclass_lookup_key, :array, default_value: %w[a b],
-                                                                        override: true,
-                                                                        puppetclass: @puppetclass,
-                                                                        overrides: { "hostgroup=#{hostgroup.name}" => %w[c d] })
-        lookup_value = lookup_key.lookup_values.first
-        FactoryBot.create(:environment_class, puppetclass: @puppetclass, environment: @environment, puppetclass_lookup_key: lookup_key)
-
-        # sending exactly what the host form would send which is lookup_value.value_before_type_cast
-        lk = { 'lookup_values_attributes' => { lookup_key.id.to_s => { 'value' => lookup_value.value_before_type_cast,
-                                                                       'id' => lookup_value.id,
-                                                                       'lookup_key_id' => lookup_key.id,
-                                                                       '_destroy' => false } } }
-
-        params = {
-          hostgroup_id: hostgroup.id,
-          hostgroup: hostgroup.attributes.merge(lk),
-        }
-
-        # environment change calls puppetclass_parameters which caused the extra escaping
-        post :puppetclass_parameters, params: params, session: set_session_user, xhr: true
-
-        # if this was escaped during refresh_host the value in response.body after unescapeHTML would include "[\\\"c\\\",\\\"d\\\"]"
-        assert_includes CGI.unescapeHTML(response.body), '["c","d"]'
+        context 'environment_id param is set' do
+          test 'it will take the hostgroup params environment_id' do
+            other_environment = FactoryBot.create(:environment)
+            @params[:hostgroup][:environment_id] = other_environment.id
+
+            post :environment_selected, params: @params, session: set_session_user, xhr: true
+            assert_equal assigns(:environment), other_environment
+          end
+        end
+
+        test 'should not escape lookup values on environment change' do
+          hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, environment: @environment, puppetclasses: [@puppetclass])
+          lookup_key = FactoryBot.create(:puppetclass_lookup_key, :array, default_value: %w[a b],
+                                                                          override: true,
+                                                                          puppetclass: @puppetclass,
+                                                                          overrides: { "hostgroup=#{hostgroup.name}" => %w[c d] })
+          lookup_value = lookup_key.lookup_values.first
+          FactoryBot.create(:environment_class, puppetclass: @puppetclass, environment: @environment, puppetclass_lookup_key: lookup_key)
+
+          # sending exactly what the host form would send which is lookup_value.value_before_type_cast
+          lk = { 'lookup_values_attributes' => { lookup_key.id.to_s => { 'value' => lookup_value.value_before_type_cast,
+                                                                         'id' => lookup_value.id,
+                                                                         'lookup_key_id' => lookup_key.id,
+                                                                         '_destroy' => false } } }
+
+          params = {
+            hostgroup_id: hostgroup.id,
+            hostgroup: hostgroup.attributes.merge(lk),
+          }
+
+          # environment change calls puppetclass_parameters which caused the extra escaping
+          post :puppetclass_parameters, params: params, session: set_session_user, xhr: true
+
+          # if this was escaped during refresh_host the value in response.body after unescapeHTML would include "[\\\"c\\\",\\\"d\\\"]"
+          assert_includes CGI.unescapeHTML(response.body), '["c","d"]'
+        end
       end
     end
   end

data/test/controllers/foreman_puppet/hosts_controller_test.rb

@@ -48,7 +48,6 @@ module ForemanPuppet
       setup { @routes = Rails.application.routes }
 
       test 'lookup value and description should be html escaped' do
-        skip 'Needs complete migration to be done' unless ForemanPuppet.extracted_from_core?
         FactoryBot.create(:puppetclass_lookup_key,
           default_value: "<script>alert('hacked!');</script>",
           description: "<script>alert('hacked!');</script>",

data/test/factories/foreman_puppet_factories.rb

@@ -105,8 +105,6 @@ FactoryBot.define do
         evaluator.parameter_count.times do
           evaluator.environments.each do |env|
             FactoryBot.create :puppetclass_lookup_key, override: false, puppetclass: pc, environment: env
-            # for Host#managed validation, once extracted_from_core? we can remove
-            env.reload
           end
         end
       else

data/test/factories/host_puppet_enhancements.rb

@@ -45,6 +45,9 @@ FactoryBot.modify do
       puppet_proxy do
         FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:feature, :puppet)])
       end
+      puppet_ca_proxy do
+        FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:feature, :puppetca)])
+      end
     end
 
     trait :with_config_group do

data/test/integration/foreman_puppet/host_js_test.rb

@@ -362,7 +362,6 @@ module ForemanPuppet
       page.find('#puppet_klasses_parameters_table')
     end
 
-    # TODO: unless ForemanPuppet.extracted_from_core?
     def switch_form_tab_to_interfaces
       switch_form_tab('Interfaces')
       disable_interface_modal_animation

data/test/integration/foreman_puppet/puppetclass_js_test.rb

@@ -11,7 +11,7 @@ module ForemanPuppet
     let(:puppetclass) { FactoryBot.create(:puppetclass, environments: [environment]) }
 
     test 'edit page' do
-      FactoryBot.create(:puppetclass, name: 'vim', environments: [environment]) if ForemanPuppet.extracted_from_core?
+      FactoryBot.create(:puppetclass, name: 'vim', environments: [environment])
       visit puppetclasses_path
       click_link 'vim'
       assert page.has_no_link? 'Common'

data/test/models/foreman_puppet/host_test.rb

@@ -150,6 +150,32 @@ module ForemanPuppet
       end
     end
 
+    describe '#available_template_kinds' do
+      let(:template_kinds) { [stub(name: 'iPXE'), stub(name: 'finish')] }
+
+      test 'calls find_template with Puppet environment' do
+        host = FactoryBot.create(:host, :with_hostgroup, :with_puppet_enc)
+        host.expects(:template_kinds).returns(template_kinds)
+        template_kinds.each do |kind|
+          ::ProvisioningTemplate.expects(:find_template)
+                                .with(kind: kind.name, operatingsystem_id: host.operatingsystem.id, hostgroup_id: host.hostgroup.id, environment_id: host.puppet.environment.id)
+                                .returns(stub(name: "default #{kind.name}"))
+        end
+        assert_equal template_kinds.map { |k| "default #{k.name}" }, host.available_template_kinds.map(&:name)
+      end
+
+      test 'calls find_template without Puppet environment' do
+        host = FactoryBot.create(:host, :with_hostgroup)
+        host.expects(:template_kinds).returns(template_kinds)
+        template_kinds.each do |kind|
+          ::ProvisioningTemplate.expects(:find_template)
+                                .with(kind: kind.name, operatingsystem_id: host.operatingsystem.id, hostgroup_id: host.hostgroup.id, environment_id: nil)
+                                .returns(stub(name: "default #{kind.name}"))
+        end
+        assert_equal template_kinds.map { |k| "default #{k.name}" }, host.available_template_kinds.map(&:name)
+      end
+    end
+
     test 'should import from external nodes output' do
       # create a dummy node
       Parameter.destroy_all

data/test/models/foreman_puppet/user_test.rb

@@ -5,11 +5,7 @@ module ForemanPuppet
     describe '#visible_environments' do
       let(:environment) { FactoryBot.create(:environment) }
       let(:untaxed_env) { FactoryBot.create(:environment, organizations: [], locations: []) }
-      let(:env_names) do
-        env_names = [environment.name, untaxed_env.name]
-        env_names += %w[production global_puppetmaster testing] unless ForemanPuppet.extracted_from_core?
-        env_names
-      end
+      let(:env_names) { [environment.name, untaxed_env.name] }
 
       setup do
         environment

data/test/services/foreman_puppet/host_counter_test.rb

@@ -0,0 +1,17 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class HostCounterTest < ActiveSupport::TestCase
+    def hosts_count(association)
+      ::HostCounter.new(association)
+    end
+
+    let(:environment) { FactoryBot.create(:environment) }
+
+    test 'it should get number of hosts associated to environment' do
+      FactoryBot.create(:host, :with_puppet_enc, environment: environment)
+      count = hosts_count(:environment)
+      assert_equal 1, count[environment]
+    end
+  end
+end

data/test/unit/foreman_puppet/puppet_class_importer_test.rb

@@ -3,7 +3,7 @@ require 'test_puppet_helper'
 module ForemanPuppet
   class PuppetClassImporterTest < ActiveSupport::TestCase
     def setup
-      FactoryBot.create(:environment, name: 'production') if ForemanPuppet.extracted_from_core?
+      FactoryBot.create(:environment, name: 'production')
       ProxyAPI::Puppet.any_instance.stubs(:environments).returns(%w[foreman-testing foreman-testing-1])
       ProxyAPI::Puppet.any_instance.stubs(:classes).returns(mocked_classes)
       User.current = users(:admin)

data/webpack/src/Components/Environments/Welcome.js

@@ -7,11 +7,11 @@ import { foremanUrl, getManualURL } from 'foremanReact/common/helpers';
 export const WelcomeEnv = ({ canCreate }) => {
   const action = canCreate && {
     title: __('Create Puppet Environment'),
-    url: foremanUrl('environments/new'),
+    url: foremanUrl('/foreman_puppet/environments/new'),
   };
 
   const content = __(`If you are planning to use Foreman as an external node classifier you should provide information about one or more environments.<br/>
-  This information is commonly imported from a pre-existing Puppet configuration by the use of the <a href=${getManualURL(
+  This information is commonly imported from a pre-existing Puppet configuration by the use of the <a target="_blank" href=${getManualURL(
     '4.2.2Classes'
   )}>Puppet classes and environment importer.</a>`);
   return (

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0.alpha.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies: []
-description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
+description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
 - foreman-dev@googlegroups.com
 executables: []
@@ -22,10 +22,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/foreman_puppet.scss
-- app/controllers/concerns/foreman_puppet/api/import_puppetclasses_common_controller.rb
 - app/controllers/concerns/foreman_puppet/environments_import.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_base_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_hostgroups_controller.rb
+- app/controllers/concerns/foreman_puppet/extensions/api_smart_proxies_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_template_combinations_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_v2_hosts_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/hostgroups_controller_extensions.rb
@@ -94,6 +94,7 @@ files:
 - app/models/foreman_puppet/puppetclass.rb
 - app/models/foreman_puppet/puppetclass_lookup_key.rb
 - app/prepend_views/api/v2/template_combinations/base.json.rabl
+- app/services/concerns/foreman_puppet/extensions/host_counter.rb
 - app/services/foreman_puppet/host_info_providers/config_groups_info.rb
 - app/services/foreman_puppet/host_info_providers/puppet_info.rb
 - app/services/foreman_puppet/input_type/puppet_parameter_input.rb
@@ -112,9 +113,11 @@ files:
 - app/views/foreman_puppet/api/v2/environments/show.json.rabl
 - app/views/foreman_puppet/api/v2/environments/update.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/base.json.rabl
+- app/views/foreman_puppet/api/v2/host_puppet_facets/host_list.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/host_single.json.rabl
 - app/views/foreman_puppet/api/v2/host_puppet_facets/show.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/base.json.rabl
+- app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_list.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single.json.rabl
 - app/views/foreman_puppet/api/v2/hostgroup_puppet_facets/show.json.rabl
 - app/views/foreman_puppet/api/v2/import_puppetclasses/index.json.rabl
@@ -182,14 +185,22 @@ files:
 - db/migrate/20200803113803_migrate_environment_to_puppet_facet.foreman_puppet.rb
 - db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb
 - db/migrate/20201125113903_migrate_puppetclasses_to_facets.foreman_puppet.rb
+- db/migrate/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb
 - db/migrate_foreman/20090722141107_create_environments.rb
+- db/migrate_foreman/20090802062223_create_puppetclasses.rb
+- db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.rb
+- db/migrate_foreman/20110412103238_remove_unused_fields_from_puppet_classes.rb
+- db/migrate_foreman/20110712070522_create_host_class.rb
+- db/migrate_foreman/20120824142048_add_some_indexes.rb
 - db/migrate_foreman/20120905095532_create_environment_classes.rb
+- db/migrate_foreman/20121018152459_create_hostgroup_classes.rb
 - db/migrate_foreman/20140407161817_create_config_groups.rb
 - db/migrate_foreman/20140407162007_create_config_group_classes.rb
 - db/migrate_foreman/20140407162059_create_host_config_groups.rb
 - db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.rb
 - db/migrate_foreman/20170109115157_fix_lookup_key_auditable_type.rb
 - db/migrate_foreman/20180816134832_cast_lookup_key_values.rb
+- db/migrate_foreman/20180831115634_add_uniqueness_to_puppetclass_name.rb
 - db/migrate_foreman/20181023112532_add_environment_puppetclass_id.rb
 - db/migrate_foreman/20181224174419_add_index_to_environment_class_by_lookup_key_and_puppetclass.rb
 - db/seeds.d/111_puppet_proxy_feature.rb
@@ -220,6 +231,7 @@ files:
 - test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
 - test/controllers/foreman_puppet/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/environments_controller_test.rb
@@ -263,6 +275,7 @@ files:
 - test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/user_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/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
@@ -307,18 +320,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: Adds puppet ENC features
+summary: Add Puppet features to Foreman
 test_files:
 - 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
@@ -373,6 +387,7 @@ test_files:
 - 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