foreman_puppet 1.0.0.rc.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d0dfe755f795957a77e9889c1c958343a3b2b54d38e451e7a119bb8b4db98b
-  data.tar.gz: 2e4e4bad454345c115ec10fa6968409a56dbf2403891bf0711fdaf858225291c
+  metadata.gz: 06c268d86cd3905acdfcd56bc9898df23218553a632bb167c08de6c708351ee8
+  data.tar.gz: fc9d44ecfdd418571796ccc39a302a5ac086bae221bc155ba5e827edfd45a9f0
 SHA512:
-  metadata.gz: c7558294ebc8a1eaca149102ed9d5dcefe10a7ae1fa643bd7836c143de807bec77e3af8fa31df43dcd6b3ec52775ba7b36a6a5a15028413e4f889f479d3295fe
-  data.tar.gz: b40b1472b66dc27f61c634c11cd500d23d61de31d1eb984c7b68184cb626e9fbfa2b2dbd0bba74009cdd2800c7576fae427cef346a4f48b4e4fb59b8b88eeaf0
+  metadata.gz: e4169751ebd02e01e6628a8583490d7257e27c7f0852e7539fc42b4b989258d3efef9324c684db31776a0d8f48e9360d0e3d40bdb12c03e8dd66d923f7d521e2
+  data.tar.gz: a0384e376fa23ed7dd0ada27f525d04cbeaebd19a1933e91ce97628dc3a4abe74ba79d6857040e4c920071e3afeef7858d121329ecbd3f6db2aa0486de9dba5f

data/app/controllers/concerns/foreman_puppet/extensions/hostgroups_controller_extensions.rb

@@ -36,7 +36,7 @@ module ForemanPuppet
 
           puppet.puppetclasses = ForemanPuppet::Puppetclass.where(id: params[:hostgroup][:puppetclass_ids])
           puppet.config_groups = ForemanPuppet::ConfigGroup.where(id: params[:hostgroup][:config_group_ids])
-          render partial: 'hosts/form_puppet_enc_tab', locals: { host_or_hostgroup: @hostgroup, resource_type: :hostgroup }
+          render partial: 'hosts/form_puppet_enc_tab', locals: { subject: @hostgroup, resource_type: :hostgroup }
         end
 
         def puppetclass_parameters

data/app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb

@@ -41,7 +41,7 @@ module ForemanPuppet
         set_class_variables(@host)
         ::Taxonomy.as_taxonomy @organization, @location do
           if @environment || @hostgroup
-            render partial: 'hosts/form_puppet_enc_tab', locals: { host_or_hostgroup: @host, resource_type: :host }
+            render partial: 'hosts/form_puppet_enc_tab', locals: { subject: @host, resource_type: :host }
           else
             logger.info 'environment_id or hostgroup_id is required to render puppetclasses'
           end

data/app/controllers/foreman_puppet/api/v2/puppet_base_controller.rb

@@ -11,7 +11,7 @@ module ForemanPuppet
         protected
 
         def show_deprecation_for_core_routes
-          return if request.path.starts_with?('/foreman_puppet')
+          return if request.path.starts_with?('/foreman_puppet') || request.path.starts_with?('/api/smart_proxies')
           Foreman::Deprecation.api_deprecation_warning(
             format(
               '/api/v2/%{controller} API endpoints are deprecated, please use /foreman_puppet/api/v2/%{controller} instead',

data/app/helpers/foreman_puppet/puppet_smart_proxies_helper.rb

@@ -4,5 +4,9 @@ module ForemanPuppet
     def hosts_path(*attrs)
       main_app.hosts_path(*attrs)
     end
+
+    def host_config_reports_path(*attrs)
+      main_app.host_config_reports_path(*attrs)
+    end
   end
 end

data/app/models/foreman_puppet/host_puppet_facet.rb

@@ -43,7 +43,7 @@ module ForemanPuppet
     # the environment used by #clases nees to be self.environment and not self.parent.environment
     def parent_classes
       return [] unless host.hostgroup
-      host.hostgroup.puppet&.classes(environment)
+      host.hostgroup.puppet&.classes(environment) || []
     end
 
     def parent_config_groups

data/app/views/hosts/_form_puppet_enc_tab.html.erb

@@ -1,6 +1,5 @@
 <% resource_type ||= pagelet.opts[:resource_type] %>
-<% host_or_hostgroup ||= local_assigns[resource_type] %>
-<% obj = (host_or_hostgroup.puppet || host_or_hostgroup.build_puppet) if %i[host hostgroup].include?(resource_type) %>
+<% obj = (subject.puppet || subject.build_puppet) if %i[host hostgroup].include?(resource_type) %>
 <% if resource_type == :host %>
 <span id="puppet_klasses_reload_url" data-url="<%= foreman_puppet.hostgroup_or_environment_selected_hosts_path %>"></span>
 <% elsif resource_type == :hostgroup %>
@@ -18,7 +17,7 @@
             text: _('Please select an environment first')) %>
 <% end %>
 
-<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(action: :puppetclass_parameters, only_path: true) %>">
+<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
   <h2><%= _('Puppet Class Parameters') %></h2>
-  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: host_or_hostgroup %>
+  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
 </fieldset>

data/db/migrate/20200803113803_migrate_environment_to_puppet_facet.foreman_puppet.rb

@@ -2,11 +2,11 @@ class MigrateEnvironmentToPuppetFacet < ActiveRecord::Migration[6.0]
   def up
     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?
+    ForemanPuppet::HostgroupPuppetFacet.insert_all!(puppet_hostgroups) if puppet_hostgroups.any?
 
     puppet_hosts = Host::Managed.unscoped.where.not(environment_id: nil).pluck(:id, :environment_id)
     puppet_hosts.map! { |host_id, env_id| { host_id: host_id, environment_id: env_id } }
-    ForemanPuppet::HostPuppetFacet.insert_all(puppet_hosts) if puppet_hosts.any?
+    ForemanPuppet::HostPuppetFacet.insert_all!(puppet_hosts) if puppet_hosts.any?
   end
 
   def down

data/lib/foreman_puppet/engine.rb

@@ -33,7 +33,6 @@ module ForemanPuppet
     engine_name 'foreman_puppet'
     isolate_namespace ForemanPuppet
 
-    config.paths['db/migrate'] << 'db/migrate_foreman' if Gem::Dependency.new('', ">= #{ForemanPuppet::FOREMAN_EXTRACTION_VERSION}").match?('', SETTINGS[:version])
     config.paths['config/routes.rb'].unshift('config/api_routes.rb')
 
     initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |_app|

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.0.rc.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
 email:
@@ -307,9 +307,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: