foreman_puppet 1.0.1 → 1.0.5

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/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/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb

@@ -9,49 +9,88 @@ module ForemanPuppet
     include HostsAndHostgroupsHelper
 
     describe 'puppet environment field' do
+      let(:fields) { mock('fields_for') }
+      let(:f) { mock('form_for') }
+      let(:object) { mock('object') }
+      let(:puppet_facet) { mock('puppet') }
+
       setup do
-        @host = mock('host')
-        puppet = mock('puppet')
-        @host.stubs(:hostgroup)
-        @host.stubs(:puppet).returns(puppet)
-        @host.stubs(:id).returns(999)
-        @f = mock('f')
-        @f.stubs(:object).returns(@host)
-        @fields = mock('fields')
-        @fields.stubs(:object).returns(puppet)
-        @f.stubs(:fields_for).yields(@fields)
+        f.stubs(:object).returns(object)
+        f.stubs(:fields_for).yields(fields)
+        fields.stubs(:object).returns(puppet_facet)
       end
 
-      test 'it adds new first level attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:test_html_option] == 'test_value2'
+      describe '#host_puppet_environment_field' do
+        let(:object) do
+          host = mock('host')
+          host.stubs(:hostgroup)
+          host.stubs(:puppet).returns(puppet_facet)
+          host.stubs(:id).returns(999)
+          host
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
-      end
+        test 'it adds new first level attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:test_html_option] == 'test_value2'
+          end
 
-      test 'it adds new data attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:data][:test] == 'test_value2'
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        test 'it adds new data attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:data][:test] == 'test_value2'
+          end
+
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        end
+
+        test 'it overrides existing attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            html_options = attrs.pop
+            html_options[:data][:test] == 'some_test_value' &&
+              html_options[:data][:url] == '/test/url'
+          end.returns('')
+
+          html = host_puppet_environment_field(f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+
+          assert_no_match(/btn/, html)
+        end
       end
 
-      test 'it overrides existing attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          html_options = attrs.pop
-          html_options[:data][:test] == 'some_test_value' &&
-            html_options[:data][:url] == '/test/url'
-        end.returns('')
+      describe '#hostgroup_puppet_environment_field' do
+        let(:object) { FactoryBot.build_stubbed(:hostgroup, parent: parent_hg) }
+        let(:puppet_facet) { object.puppet || object.build_puppet }
+
+        context 'parent without puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup) }
 
-        html = host_puppet_environment_field(@f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == 'Inherit parent (no value)'
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
 
-        assert_no_match(/btn/, html)
+        context 'parent with puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc) }
+
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == "Inherit parent (#{parent_hg.puppet.environment.name})"
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
       end
     end
 

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -107,7 +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_empty host.puppet.parent_config_groups
+        assert_equal [], 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
       end
     end
 

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/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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Ondřej Ezr
 - Shira Maximov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
 email:
@@ -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
@@ -182,6 +183,7 @@ 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/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
 - db/migrate_foreman/20090722141107_create_environments.rb
 - db/migrate_foreman/20120905095532_create_environment_classes.rb
 - db/migrate_foreman/20140407161817_create_config_groups.rb
@@ -200,6 +202,8 @@ files:
 - lib/tasks/foreman_puppet_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/cs_CZ/foreman_puppet.edit.po
+- locale/cs_CZ/foreman_puppet.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
@@ -263,6 +267,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
@@ -296,7 +301,7 @@ homepage: https://github.com/theforeman/foreman_puppet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -312,13 +317,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Adds puppet ENC features
 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