foreman_puppet 2.0.7 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca4a5ca23e81664035c8eb00f58b7c4788fbc0937bd85b91cbd882f8c8cfdf6
-  data.tar.gz: 7292e17f5ad77f34d23008e95630b007ee2fe0f5295b5987eddc78a6d2fd1261
+  metadata.gz: 551d9a6cf7153dfc0bb5a4709bbd394bc6d2ba5354b16531de6787653ca1d185
+  data.tar.gz: cacbf35dfb12c49175bd0ee95ea8cf4b441319c140b7401c5527b8231a9000f0
 SHA512:
-  metadata.gz: cbf7c29356ac312b02c4346f806407c477238159c4cab20fcc449810486009945635ccba8d17388ba7c0bc882e9bb450423e5333f251220949cca6f3f0173472
-  data.tar.gz: 35166a234ca51ce8d2eba7f738c1bdd9e697765034e94bf384f1940608faffc558795773aac8ac2b3f731652124a0b78ba64e3fd970d9c4bff464360392bd32b
+  metadata.gz: 6c28a424fb8afdb633134b1f57fa7254ead445a7a1e45d3b8bc97cbfc3ffd42a0dbb80df33ae2d7cc52d55cc12575078a773b3ed5ae3b9a360f9afb26d2631b8
+  data.tar.gz: d29c6598e1709bfddceb64e92fe16f33df55ce5eb85288e3f3ad14d590aa59d88515c37fd7116a252d889deb416bb652449c6fa6de3ef4baad5e27bfd9547bc8

data/README.md

@@ -37,7 +37,9 @@ You can install it on Foreman 2.5 to prepare for the Foreman update.
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.0        | ~> 1.0       | Required                                 |
+| >= 3.2        | ~> 3.0       | Required                                 |
+| ~> 3.1        | ~> 2.0       | Required                                 |
+| ~> 3.0        | ~> 1.0       | Required                                 |
 | >= 2.5        | ~> 0.1       | Optional; replaces Core features         |
 | < 2.5         | -            | Not supported (functionality is in Core) |
 

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

@@ -3,6 +3,8 @@ module ForemanPuppet
     module ApiSmartProxiesController
       extend ActiveSupport::Concern
 
+      NewEnvironment = Struct.new('Environment', :name)
+
       included do
         before_action :find_required_puppet_proxy, only: [:import_puppetclasses]
         before_action :find_environment_id, only: [:import_puppetclasses]
@@ -70,7 +72,7 @@ module ForemanPuppet
                              @changed['updated'].keys + @changed['ignored'].keys).uniq.sort
 
         @environments = environment_names.map do |name|
-          OpenStruct.new(name: name)
+          NewEnvironment.new(name)
         end
 
         unless @environments.any?
@@ -87,6 +89,7 @@ module ForemanPuppet
         @environments.any?
       end
 
+      # rubocop:disable Metrics/MethodLength
       def import_changed_proxy_environments
         opts = { url: @smart_proxy.url }
         opts[:env] = if @environment.present?
@@ -98,7 +101,8 @@ module ForemanPuppet
         changed = @importer.changes
 
         # check if environemnt id passed in URL is name of NEW environment in puppetmaster that doesn't exist in db
-        if @environment || (changed['new'].key?(@env_id) && (@environment ||= OpenStruct.new(name: @env_id)))
+        @environment ||= NewEnvironment.new(@env_id) if changed['new'].key?(@env_id)
+        if @environment
           # only return :keys equal to @environment in @changed hash
           %w[new obsolete updated ignored].each do |kind|
             changed[kind].slice!(@environment.name) unless changed[kind].empty?
@@ -115,6 +119,7 @@ module ForemanPuppet
         render_message(msg, status: :internal_server_error)
         nil
       end
+      # rubocop:enable Metrics/MethodLength
 
       def find_required_puppet_proxy
         id = params.key?('smart_proxy_id') ? params['smart_proxy_id'] : params['id']

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(link_to(_('Help'), { action: 'welcome' }, { class: 'btn btn-default' }))
+        button_group(help_button)
     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 })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/app/models/concerns/foreman_puppet/extensions/provisioning_template.rb

@@ -5,7 +5,7 @@ module ForemanPuppet
 
       included do
         has_many :environments, through: :template_combinations
-        before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:environments)
+        before_destroy EnsureNotUsedBy.new(:environments)
 
         scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
 

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

@@ -1,4 +1,8 @@
-<%= content_tag_for :li, config_group, (added ? :selected : nil), :id => "config_group_#{config_group.id}", :class => css_class.to_s do %>
+<%
+  li_id = "#{added ? 'selected_' : '' }config_group_#{config_group.id}"
+  li_class = "#{added ? 'selected_config_group' : 'config_group'} #{css_class}"
+%>
+<%= content_tag :li, id: li_id, class: li_class do %>
   <%= hidden_field_tag("#{type}[config_group_ids][]", config_group.id) if added == 'manually' %>
   <span>
    <%= link_to(icon_text('plus', config_group.name), '#', :rel=>'twipsy', :class => 'config_group_name',

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

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

data/app/views/smart_proxies/plugins/_puppet_ca.html.erb

@@ -0,0 +1,44 @@
+<ul id="proxy-puppetca-tab" class="nav nav-tabs nav-tabs-pf">
+  <li class="active"><a href="#ca_general" data-toggle="tab"><%= _("General") %></a></li>
+  <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+  <li><a href="#certificates" data-toggle="tab"><%= _("Certificates") %></a></li>
+  <% end %>
+  <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+  <li><a href="#autosign" data-toggle="tab"><%= _("Autosign entries") %></a></li>
+  <% end %>
+</ul>
+<div id="proxy-puppetca-tab-content" class="tab-content">
+  <div class="tab-pane active in" id="ca_general">
+    <div class="row">
+      <div class="col-md-6">
+        <%= show_feature_version('puppetca') %>
+        <div class="row">
+          <div class="col-md-4"><strong><%= _('Hosts managed:') %></strong></div>
+          <div class="col-md-8">
+            <%= link_to Host::Managed.where(:puppet_ca_proxy_id => @smart_proxy.id).count, hosts_path(:search => "puppet_ca = \"#{@smart_proxy.name}\"") %>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="container-fluid container-cards-pf">
+      <div class="row row-cards-pf">
+      <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy) %>
+        <span data-ajax-url="<%= counts_smart_proxy_puppetca_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+        <span data-ajax-url="<%= expiry_smart_proxy_puppetca_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+      <% end %>
+      <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+        <span data-ajax-url="<%= counts_smart_proxy_autosign_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+      <% end %>
+      </div>
+    </div>
+  </div>
+  <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+    <div class="tab-pane" id="certificates" data-ajax-url="<%= smart_proxy_puppetca_index_path(:smart_proxy_id => @smart_proxy) %>" data-on-complete="certTable"><%= spinner %></div>
+  <% end %>
+  <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+    <div class="tab-pane" id="autosign" data-ajax-url="<%= smart_proxy_autosign_index_path(:smart_proxy_id => @smart_proxy) %>" data-on-complete="tfm.tools.activateDatatables"><%= spinner %></div>
+    <% if authorized_for(:permission => :create_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+      <div data-ajax-url=<%= new_smart_proxy_autosign_path(:smart_proxy_id => @smart_proxy) %>></div>
+    <% end %>
+  <% end %>
+</div>

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,8 +1,6 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    # 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|
+    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true 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

@@ -145,15 +145,14 @@ Foreman::Plugin.register :foreman_puppet do
                                          'foreman_puppet/api/v2/puppetclasses' => [:destroy] },
       resource_type: 'ForemanPuppet::Puppetclass'
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
-                                        'foreman_puppet/api/v2/environments' => [:import_puppetclasses],
-                                        'api/v2/smart_proxies' => [:import_puppetclasses] },
+                                        'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { :host_editing => [:edit_classes],
-                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
+    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 
   add_all_permissions_to_default_roles
+  Foreman::Plugin::RbacSupport::AUTO_EXTENDED_ROLES |= ['Site manager']
   add_permissions_to_default_roles(
     'Site manager' => %w[view_puppetclasses import_puppetclasses view_environments import_environments
                          view_external_parameters create_external_parameters edit_external_parameters destroy_external_parameters]
@@ -225,8 +224,4 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100
     end
   end
-  extend_page 'hosts/_list' do |cx|
-    cx.add_pagelet :hosts_table_column_header, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_header', priority: 100
-    cx.add_pagelet :hosts_table_column_content, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_content', priority: 100
-  end
 end

data/lib/foreman_puppet/version.rb

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

data/locale/ca/foreman_puppet.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2021\n"
@@ -25,9 +25,6 @@ msgstr "Suprimeix"
 msgid "%s is not in environment"
 msgstr ""
 
-msgid "%s out of sync disabled"
-msgstr ""
-
 msgid "%{model} with id '%{id}' was not found"
 msgstr ""
 
@@ -73,9 +70,6 @@ msgstr "Afegeix una classe de Puppet a un amfitrió"
 msgid "Add a Puppet class to host group"
 msgstr "Afegeix una classe de Puppet a un grup d'amfitrions"
 
-msgid "Add a template combination"
-msgstr "Afegeix una combinació de plantilles"
-
 msgid "Add:"
 msgstr "Afegeix:"
 
@@ -85,9 +79,6 @@ msgstr "Tots els entorns - (sense filtrar)"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Classes disponibles"
 
@@ -103,9 +94,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel·la"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Canvia l'entorn"
 
@@ -145,9 +133,6 @@ msgstr "Feu clic per suprimir el grup de configuracions"
 msgid "Config Groups"
 msgstr "Grups de configuracions"
 
-msgid "Config Management"
-msgstr "Gestió de la configuració"
-
 msgid "Create Config Group"
 msgstr "Crea un grup de configuracions"
 
@@ -169,9 +154,6 @@ msgstr "Crea un entorn"
 msgid "Create an override value for a specific smart class parameter"
 msgstr ""
 
-msgid "Default Puppet environment"
-msgstr "Entorn de Puppet per defecte"
-
 msgid "Default value"
 msgstr "Valor per defecte"
 
@@ -217,18 +199,9 @@ msgstr ""
 msgid "Description of smart class"
 msgstr "Descripció de la classe intel·ligent"
 
-msgid "Disable host configuration status turning to out of sync for %s after report does not arrive within configured interval"
-msgstr ""
-
 msgid "Display hidden values"
 msgstr "Mostra els valors ocults"
 
-msgid "Duration in minutes after servers reporting via Puppet are classed as out of sync."
-msgstr ""
-
-msgid "ENC environment"
-msgstr "Entorn ENC"
-
 msgid "Edit %s"
 msgstr "Edita %s"
 
@@ -250,9 +223,6 @@ msgstr "Entorns"
 msgid "Environment|Name"
 msgstr "Nom"
 
-msgid "Facts"
-msgstr "Objectes d'interès"
-
 msgid "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring"
 msgstr ""
 
@@ -271,21 +241,12 @@ msgstr "Filtra amb el nom"
 msgid "Filter classes"
 msgstr "Filtra les classes"
 
-msgid "Foreman will default to this puppet environment if it cannot auto detect one"
-msgstr "Foreman utilitzarà per defecte aquest entorn de puppet si no en pot detectar automàticament un"
-
-msgid "Foreman will explicitly set the puppet environment in the ENC yaml output. This will avoid conflicts between the environment in puppet.conf and the environment set in Foreman"
-msgstr "Foreman establirà explícitament l'entorn de puppet a la sortida YAML ENC. Això evitarà conflictes entre l'entorn establert al puppet.conf i l'entorn establert a Foreman"
-
 msgid "Foreman will not send this parameter in classification output"
 msgstr ""
 
 msgid "Foreman will not send this parameter in classification output.Puppet will use the value defined in the Puppet manifest for this parameter"
 msgstr ""
 
-msgid "Foreman will update a host's environment from its facts"
-msgstr "Foreman actualitzarà l'entorn d'un amfitrió a partir dels seus objectes d'interès"
-
 msgid "General"
 msgstr "General"
 
@@ -313,9 +274,6 @@ msgstr ""
 msgid "ID of Puppet class"
 msgstr "ID de classe de Puppet"
 
-msgid "ID of Puppet environment"
-msgstr ""
-
 msgid "ID of Puppetclass"
 msgstr ""
 
@@ -343,9 +301,6 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "En cas que sigui cert, es produirà un error si no hi ha cap valor per defecte i no hi ha cap classificador que proporcioni un valor"
 
-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 ""
 
@@ -457,9 +412,6 @@ msgstr "Llista tots els paràmetres de la classe intel·ligent per a un amfitri
 msgid "List of smart class parameters for a specific host group"
 msgstr "Llista tots els paràmetres de la classe intel·ligent per a un grup d'amfitrions específic"
 
-msgid "List template combination"
-msgstr ""
-
 msgid "Loading parameters..."
 msgstr "S'estan carregant els paràmetres..."
 
@@ -604,9 +556,6 @@ msgstr "Entorns de Puppet"
 msgid "Puppet external nodes YAML dump"
 msgstr ""
 
-msgid "Puppet interval"
-msgstr "Interval de Puppet"
-
 msgid "Puppet parameter"
 msgstr "Paràmetre de Puppet"
 
@@ -673,18 +622,12 @@ msgstr "Mostra un entorn"
 msgid "Show an override value for a specific smart class parameter"
 msgstr ""
 
-msgid "Show template combination"
-msgstr "Mostra una combinació de plantilles"
-
 msgid "Smart Class Parameter"
 msgstr "Paràmetre de la classe intel·ligent"
 
 msgid "Smart Class Parameters"
 msgstr "Paràmetres de les classes intel·ligents"
 
-msgid "Some Puppet Classes are unavailable in the selected environment"
-msgstr ""
-
 msgid "Successfully overridden all parameters of Puppet class %s"
 msgstr "S'han redefinit correctament tots els paràmetres de la classe de Puppet %s"
 
@@ -717,9 +660,6 @@ msgstr "L'última de les entrades, valor predeterminat del sistema operatiu, es
 msgid "The order in which values are resolved"
 msgstr "L'ordre en què es resolen els valors"
 
-msgid "The requested environment cannot be found."
-msgstr ""
-
 msgid "There are no puppet environments set up on this puppet master. Please check the puppet master configuration."
 msgstr ""
 
@@ -768,12 +708,6 @@ msgstr "Actualitza un entorn"
 msgid "Update an override value for a specific smart class parameter"
 msgstr ""
 
-msgid "Update environment from facts"
-msgstr "Actualitza l'entorn des dels objectes d'interès"
-
-msgid "Update template combination"
-msgstr "Actualitza una combinació de plantilles"
-
 msgid "Update:"
 msgstr "Actualitza:"
 
@@ -816,9 +750,6 @@ msgstr ""
 msgid "belongs to config group"
 msgstr "pertany al grup de configuracions"
 
-msgid "environment id"
-msgstr "id d'entorn"
-
 msgid "included already from parent"
 msgstr ""