foreman_puppet 3.0.1 → 3.0.4

data/locale/zh_TW/foreman_puppet.po

@@ -8,10 +8,9 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
+"Project-Id-Version: foreman_puppet 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2021\n"
@@ -89,6 +88,9 @@ msgstr "所有環境 -（未篩選）"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
+msgid "Autosign entries"
+msgstr ""
+
 msgid "Available Classes"
 msgstr "可用類別"
 
@@ -104,6 +106,9 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
+msgid "Certificates"
+msgstr ""
+
 msgid "Change Environment"
 msgstr "更改環境"
 
@@ -341,6 +346,9 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "若為真而沒有預設值並且比對器未提供值的話，將會造成錯誤發生。"
 
+msgid "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 target=\"_blank\" href=${getManualURL( '4.2.2Classes' )}>Puppet classes and environment importer.</a>"
+msgstr ""
+
 msgid "Ignored classes in the environments: %s"
 msgstr ""
 
@@ -677,6 +685,9 @@ msgstr "智慧類別參數"
 msgid "Smart Class Parameters"
 msgstr ""
 
+msgid "Some Puppet Classes are unavailable in the selected environment"
+msgstr ""
+
 msgid "Successfully overridden all parameters of Puppet class %s"
 msgstr "已成功置換 Puppet 類別 %s 的所有參數"
 

data/test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb

@@ -79,12 +79,22 @@ module ForemanPuppet
 
           test 'should update with puppet class' do
             puppetclass = environment.puppetclasses.first
+            # uses the deprecated version of params passing without namespace, to test it works :)
             put :update, params: { id: host.id, host: { environment_id: environment.id, puppetclass_ids: [puppetclass.id] } }
             assert_response :success
             response = JSON.parse(@response.body)
             assert_equal environment.id, response['environment_id'], "Can't update host with environment #{environment}"
             assert_equal puppetclass.id, response['puppetclasses'][0]['id'], "Can't update host with puppetclass #{puppetclass}"
           end
+
+          test 'should remove puppetclass by passing empty array' do
+            host2 = FactoryBot.create(:host, :with_puppet_enc, :with_puppetclass)
+
+            put :update, params: { id: host2.id, host: { puppet_attributes: { puppetclass_ids: [] } } }
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_empty(response['puppetclasses'], 'Can not remove puppetclasses')
+          end
         end
 
         describe '#enc' do

data/test/controllers/foreman_puppet/hosts_controller_test.rb

@@ -201,7 +201,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy on should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -211,7 +210,6 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy on should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['another.host'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -221,7 +219,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
@@ -234,7 +231,6 @@ module ForemanPuppet
       test 'hosts in trusted hosts list and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['else.where']
 
         @request.env['HTTPS'] = 'on'
@@ -248,7 +244,6 @@ module ForemanPuppet
       test 'hosts with comma-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.example']
 
         @request.env['HTTPS'] = 'on'
@@ -262,7 +257,6 @@ module ForemanPuppet
       test 'hosts with slash-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.linux.lab.local']
 
         @request.env['HTTPS'] = 'on'
@@ -276,53 +270,37 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy but with an SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=another.host'
         @request.env['SSL_CLIENT_VERIFY'] = 'SUCCESS'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
       test 'hosts with an unverified SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
         @request.env['SSL_CLIENT_VERIFY'] = 'FAILURE'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
-      test 'when "require_ssl_smart_proxies" and "require_ssl" are true, HTTP requests should not be able to get externalNodes' do
+      test 'when "require_ssl" is true, HTTP requests should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = true
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
-      end
-
-      test 'when "require_ssl_smart_proxies" is true and "require_ssl" is false, HTTP requests should be able to get externalNodes' do
-        User.current = nil
-        # since require_ssl_smart_proxies is only applicable to HTTPS connections, both should be set
-        Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
-        SETTINGS[:require_ssl] = false
-
-        Resolv.any_instance.stubs(:getnames).returns(['else.where'])
-        get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_response :success
+        assert_response :redirect
       end
 
       test 'authenticated users over HTTP should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])
@@ -332,7 +310,6 @@ module ForemanPuppet
 
       test 'authenticated users over HTTPS should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])

data/test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb

@@ -0,0 +1,34 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class PuppetclassLookupKeysHelperTest < ActionView::TestCase
+    include PuppetclassLookupKeysHelper
+
+    describe '#overridable_puppet_lookup_keys' do
+      let(:parent_puppet_var) { FactoryBot.create(:puppetclass_lookup_key) }
+      let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc, environment: parent_puppet_var.environments.first) }
+
+      context 'with new hostgroup' do
+        subject do
+          hg = Hostgroup.new(parent: parent_hg)
+          hg.build_puppet
+          hg
+        end
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+
+      context 'with new host' do
+        subject { Host.new(hostgroup: parent_hg) }
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+    end
+  end
+end

data/test/integration/foreman_puppet/host_js_test.rb

@@ -60,7 +60,8 @@ module ForemanPuppet
 
         close_interfaces_modal
 
-        click_on_submit
+        click_button('Submit')
+        find('h5', text: /myhost1*/)
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env2.name, host.puppet.environment.name
@@ -94,8 +95,8 @@ module ForemanPuppet
         fill_in 'host_interfaces_attributes_0_mac', with: '00:11:11:11:11:11'
         fill_in 'host_interfaces_attributes_0_ip', with: '1.1.1.1'
         close_interfaces_modal
-        click_on_submit
-        find('#host-show') # wait for host details page
+        click_button('Submit')
+        find('h5', text: /myhost1*/) # wait for host details page
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env.name, host.puppet.environment.name
@@ -111,8 +112,9 @@ module ForemanPuppet
         visit edit_host_path(host)
 
         select2 env1.name, from: 'host_puppet_attributes_environment_id'
-        click_on_submit
-        assert_current_path(host_path(host), ignore_query: true)
+        click_button('Submit')
+        find('h5', text: /#{host.name}/)
+        assert_current_path(host_details_page_path(host), ignore_query: true)
 
         host.reload
         assert_equal env1.name, host.puppet.environment.name
@@ -201,7 +203,8 @@ module ForemanPuppet
           assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
           assert_equal('false', find("#s2id_host_lookup_values_attributes_#{lookup_key.id}_value .select2-chosen").text)
           select2 'true', from: "host_lookup_values_attributes_#{lookup_key.id}_value"
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -217,7 +220,8 @@ module ForemanPuppet
           assert puppetclass_params.find('textarea:enabled')
           puppetclass_params.find("a[data-tag='remove']").click
           assert puppetclass_params.find('textarea:disabled')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -226,7 +230,8 @@ module ForemanPuppet
           puppetclass_params.find("a[data-tag='override']").click
           expect(puppetclass_params).must_have_selector('textarea:enabled')
           puppetclass_params.find('textarea').set('userCustom')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -271,7 +276,7 @@ module ForemanPuppet
             switch_form_tab('Puppet ENC')
             assert puppetclass_params.find('textarea').disabled?
             click_button('Submit')
-            assert page.has_link?('Edit')
+            find('h5', text: /#{host.name}/)
           end
         end
 

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -53,6 +53,17 @@ module ForemanPuppet
       end
     end
 
+    describe '#puppetclass_ids=' do
+      test 'allows empting classes' do
+        host = FactoryBot.create(:host, :with_puppet_enc,
+          environment: environment,
+          puppetclasses: [puppetclass_both])
+        host.attributes = { puppet_attributes: { puppetclass_ids: [] } }
+        assert host.save, 'Host could not be saved after updating puppetclasses'
+        assert_empty host.reload.all_puppetclasses, 'Puppetclasses were not removed successfuly'
+      end
+    end
+
     describe '#all_puppetclasses' do
       test 'should return all classes for environment only' do
         host = FactoryBot.create(:host, :with_puppet_enc,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -188,6 +188,8 @@ 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_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
@@ -214,49 +216,81 @@ 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
@@ -292,6 +326,7 @@ 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
@@ -364,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
@@ -389,6 +424,7 @@ test_files:
 - test/graphql/queries/hostgroup_puppet_query_test.rb
 - test/graphql/queries/environments_query_test.rb
 - test/integration_puppet_helper.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.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