foreman_puppet 2.0.3 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83861f53b9f2944dda945591b245097569b4477df77ed2760f42cb1d92bd3ed0
-  data.tar.gz: 620b8fb7524015970cd4aa1e42ea130483434ccb0af7474a1a4ca23ca8d8199f
+  metadata.gz: 58ee61350aa65a2356723d032bbc56f894d2d00453f58fe01a6c5e9e05909c86
+  data.tar.gz: 1df9c5d674dea6b7bb5316c843925998fa748c77d3cb07864ebb399c46672421
 SHA512:
-  metadata.gz: 9ac189449b5b6f819e82ee4f14dbccfdf0da012dd0a8345441225b76f062912a9b3f184bc7f2c87715dd5e460d1deadc6943f45e060a4bf109d8d3ba87ce8bc7
-  data.tar.gz: 13157df73faa3eb07f8e1299ad9367bd09d6292e45ff59741d2c6e108542bb239ad25ba04eb8fae97125b54cba6f452248c91b9bddffda1c0829b2e8953fdb57
+  metadata.gz: c2be066de5444cd669b80687eaa7f8d1cf9a0735a01a739ff2daa464144b5015e0501d602afe881a3cb04915d1ea5202531b065a630b45b72df1e19dea2fc66a
+  data.tar.gz: f43cf893d84772b5b38ba13eff4a2e5c1b7a0374bfecf5fa69fba18b8197744bfe1f7b51a7f4983949f56c799bdf97b6b04f59d6a44e7d9210fbe64f4642071a

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/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/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/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/_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/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/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '2.0.3'.freeze
+  VERSION = '3.0.3'.freeze
 end