foreman_puppet 3.0.1 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 551d9a6cf7153dfc0bb5a4709bbd394bc6d2ba5354b16531de6787653ca1d185
-  data.tar.gz: cacbf35dfb12c49175bd0ee95ea8cf4b441319c140b7401c5527b8231a9000f0
+  metadata.gz: 80c2355783d6696a0c201214e7447b649e387f82e1585a349b1eeb3e13b7717b
+  data.tar.gz: 6dcd3c36bc6ffbcf8249f0916c1e96c8d9ce0fed6d6fe4bd933bea22487fef60
 SHA512:
-  metadata.gz: 6c28a424fb8afdb633134b1f57fa7254ead445a7a1e45d3b8bc97cbfc3ffd42a0dbb80df33ae2d7cc52d55cc12575078a773b3ed5ae3b9a360f9afb26d2631b8
-  data.tar.gz: d29c6598e1709bfddceb64e92fe16f33df55ce5eb85288e3f3ad14d590aa59d88515c37fd7116a252d889deb416bb652449c6fa6de3ef4baad5e27bfd9547bc8
+  metadata.gz: d8b9474051ad593d3492e3f987cb07d379901b9df21f8e2034ff0965a275cb86375f5dff6d7b427428387a7f83596e59cfc9a847cb3a7b3af3acff8bc67540c6
+  data.tar.gz: 96957f843bcd42ce54dee222fcfc00b4abfa0fda1ea12ec73e7bf44bbcbe0b9dbfb820585743e05335b226d71fed431a4522251582629cf5bc538ef493a29277

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

@@ -3,7 +3,7 @@ module ForemanPuppet
     module HostsControllerExtensions
       extend ActiveSupport::Concern
 
-      PUPPETMASTER_ACTIONS = %i[externalNodes lookup].freeze
+      PUPPETMASTER_ACTIONS = %i[externalNodes].freeze
       PUPPET_AJAX_REQUESTS = %w[hostgroup_or_environment_selected puppetclass_parameters].freeze
 
       MULTIPLE_EDIT_ACTIONS = %w[select_multiple_environment update_multiple_environment

data/app/helpers/foreman_puppet/environments_helper.rb

@@ -11,7 +11,7 @@ module ForemanPuppet
     def environments_title_actions
       title_actions import_proxy_select(hash_for_import_environments_environments_path.merge(engine: foreman_puppet)),
         button_group(new_link(_('Create Puppet Environment'), { engine: foreman_puppet }, id: 'new_environment')),
-        button_group(help_button)
+        button_group(link_to(_('Help'), { action: 'welcome' }, { class: 'btn btn-default' }))
     end
   end
 end

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     # ------ Host(group) Form Helpers -----
 
     def overridable_puppet_lookup_keys(klass, obj)
-      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/app/services/foreman_puppet/host_info_providers/puppet_info.rb

@@ -45,7 +45,7 @@ module ForemanPuppet
       end
 
       def ca_defined?
-        SETTINGS[:unattended] && host.puppetca_exists?
+        host.puppetca_exists?
       end
 
       def has_environment?

data/app/views/foreman_puppet/config_groups/index.html.erb

@@ -2,7 +2,9 @@
 <% content_for(:search_bar) { } %>
 <% title _('Config Groups') %>
 
-<% title_actions new_link(_('Create Config Group'), { engine: foreman_puppet }, id: 'new_config_group'), help_button %>
+<% title_actions(
+     new_link(_('Create Config Group'), { engine: foreman_puppet }, id: 'new_config_group'),
+     link_to(_('Help'), { action: 'welcome' }, { class: 'btn btn-default' })) %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>

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

@@ -11,13 +11,14 @@
   <% end %>
 
   <%= render 'foreman_puppet/puppetclasses/class_selection', obj: obj, resource_type: resource_type %>
+
+  <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: subject %>
+  </fieldset>
 <% else %>
   <%= alert(class: alert_class(:info),
             header: _('Notice'),
             text: _('Please select an environment first')) %>
 <% end %>
 
-<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: subject %>
-</fieldset>

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,15 @@
+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_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,6 +1,8 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+    # this table is later renamed into hostgroup_classes and thus we don't want to create it if it exists under the later name
+    return if table_exists?(:hostgroups_puppetclasses) || table_exists?(:hostgroup_classes)
+    create_table :hostgroups_puppetclasses, id: false do |t|
       t.references :hostgroup, foreign_key: true, null: false
       t.references :puppetclass, foreign_key: true, null: false
     end

data/lib/foreman_puppet/register.rb

@@ -147,7 +147,8 @@ Foreman::Plugin.register :foreman_puppet do
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
                                         'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
+    permission :edit_classes, { :host_editing => [:edit_classes],
+                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.4'.freeze
 end