foreman_puppet 0.0.2 → 0.1.0

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

@@ -3,19 +3,26 @@ module ForemanPuppet
     module User
       extend ActiveSupport::Concern
 
-      def visible_environments
-        authorized_scope = Environment.unscoped.authorized(:view_environments)
-        authorized_scope = authorized_scope
-                           .joins(:taxable_taxonomies)
-                           .where('taxable_taxonomies.taxonomy_id' => taxonomy_ids[:organizations] + taxonomy_ids[:locations])
-        result = authorized_scope.distinct.pluck(:name)
-        if User.current.admin?
-          # Admin users can also see Environments that do not have any organization or location, even when
-          # organizations and locations are enabled.
-          untaxed_environments = Environment.unscoped.where.not(id: TaxableTaxonomy.where(taxable_type: 'ForemanPuppet::Environment').distinct.select(:taxable_id)).pluck(:name)
-          result += untaxed_environments
+      included do
+        prepend PatchedMethods
+      end
+
+      module PatchedMethods
+        def visible_environments
+          authorized_scope = ForemanPuppet::Environment.unscoped.authorized(:view_environments)
+          authorized_scope = authorized_scope
+                             .joins(:taxable_taxonomies)
+                             .where('taxable_taxonomies.taxonomy_id' => taxonomy_ids[:organizations] + taxonomy_ids[:locations])
+          result = authorized_scope.distinct.pluck(:name)
+          if ::User.current.admin?
+            # Admin users can also see Environments that do not have any organization or location, even when
+            # organizations and locations are enabled.
+            untaxed_env_ids = TaxableTaxonomy.where(taxable_type: 'ForemanPuppet::Environment').distinct.select(:taxable_id)
+            untaxed_environments = ForemanPuppet::Environment.unscoped.where.not(id: untaxed_env_ids).pluck(:name)
+            result += untaxed_environments
+          end
+          result
         end
-        result
       end
     end
   end

data/app/models/foreman_puppet/environment_class.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
     belongs_to :puppetclass, inverse_of: :environment_classes
     belongs_to :puppetclass_lookup_key, inverse_of: :environment_classes, class_name: 'ForemanPuppet::PuppetclassLookupKey'
     validates :puppetclass_lookup_key_id, uniqueness: { scope: %i[environment_id puppetclass_id] }
-    validates :puppetclass_id, :environment_id, presence: true
+    validates :puppetclass, :environment, presence: true
     after_destroy :delete_orphaned_lookup_keys
 
     scope :parameters_for_class, lambda { |puppetclasses_ids, environment_id|

data/app/models/foreman_puppet/host_class.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
     include Authorizable
 
     validates_lengths_from_database
-    belongs_to :puppetclass
+    belongs_to :puppetclass, class_name: 'ForemanPuppet::Puppetclass'
     belongs_to :host_puppet_facet
     has_one :host, through: :host_puppet_facet
 

data/app/models/foreman_puppet/host_puppet_facet.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
     include Facets::Base
     include ForemanPuppet::HostCommon
 
-    has_many :host_classes, dependent: :destroy
+    has_many :host_classes, dependent: :destroy, class_name: 'ForemanPuppet::HostClass'
     has_many :puppetclasses, through: :host_classes
 
     validates :environment_id, presence: true, unless: ->(facet) { facet.host.puppet_proxy_id.blank? }
@@ -18,10 +18,11 @@ module ForemanPuppet
       type ||= 'puppet'
       return unless type == 'puppet'
 
+      facet = host.puppet || host.build_puppet
       if Setting[:update_environment_from_facts]
-        host.set_non_empty_values parser, [:environment]
+        facet.environment = parser.environment if parser.environment.present?
       elsif parser.environment.present?
-        self.environment ||= parser.environment
+        facet.environment ||= parser.environment
       end
 
       # if proxy authentication is enabled and we have no puppet proxy set and the upload came from puppet,

data/app/models/foreman_puppet/puppetclass.rb

@@ -29,6 +29,7 @@ module ForemanPuppet
     has_many :config_groups, through: :config_group_classes
 
     has_many :class_params, -> { distinct }, through: :environment_classes, source: :puppetclass_lookup_key
+    accepts_nested_attributes_for :environment_classes
     accepts_nested_attributes_for :class_params, reject_if: ->(a) { a[:key].blank? }, allow_destroy: true
 
     validates :name, uniqueness: true, presence: true, no_whitespace: true
@@ -72,6 +73,17 @@ module ForemanPuppet
       hash
     end
 
+    # For Audits to be correctly taxed for Puppetclass creation
+    # Puppetclass gets saved before the environment class and thus taxonomy ids are empty
+    # We collect the ids from unsaved environment_classes for the Audits correct taxation
+    def location_ids
+      environment_classes.select(&:new_record?).flat_map { |ec| ec.environment.location_ids }.concat(super).uniq
+    end
+
+    def organization_ids
+      environment_classes.select(&:new_record?).flat_map { |ec| ec.environment.organization_ids }.concat(super).uniq
+    end
+
     # returns module name (excluding of the class name)
     # if class separator does not exists (the "::" chars), then returns the whole class name
     def module_name
@@ -106,7 +118,7 @@ module ForemanPuppet
     # We are going through two associations, so we are on our own to define modifiers
     def hostgroup_ids=(hg_ids)
       hg_ids = Array(hg_ids).reject(&:blank?)
-      hg_to_facets_ids = Hash[HostgroupPuppetFacet.where(hostgroup_id: hg_ids).pluck(:hostgroup_id, :id)]
+      hg_to_facets_ids = HostgroupPuppetFacet.where(hostgroup_id: hg_ids).pluck(:hostgroup_id, :id).to_h
       missing_facet_ids = hg_ids.map(&:to_i) - hg_to_facets_ids.keys
       new_facet_ids = missing_facet_ids.map { |hg_id| HostgroupPuppetFacet.create(hostgroup_id: hg_id).id }
       self.hostgroup_puppet_facet_ids = hg_to_facets_ids.values + new_facet_ids

data/app/services/foreman_puppet/puppet_class_importer.rb

@@ -248,15 +248,11 @@ module ForemanPuppet
     end
 
     def add_classes_to_foreman(env_name, klasses)
-      env         = find_or_create_env env_name
-      # look for Puppet class in all scopes to make sure we do not try to create a new record
-      # with a name that already exists and hit the uniqueness constraint on name
-      new_classes = klasses.map { |k| find_or_create_puppetclass(name: k[0]) }
+      env = find_or_create_env env_name
 
-      new_classes.each do |new_class|
-        EnvironmentClass.find_or_create_by! puppetclass_id: new_class.id, environment_id: env.id
-        class_params = klasses[new_class.to_s]
-        add_new_parameter(env, new_class, class_params) if class_params.any?
+      klasses.each do |klass_name, klass_params|
+        puppetclass = find_or_create_puppetclass_for_env(klass_name, env)
+        add_new_parameter(env, puppetclass, klass_params) if klass_params.any?
       end
     end
 
@@ -302,7 +298,7 @@ module ForemanPuppet
       changed_params['new'].map do |param_name, value|
         param = find_or_create_puppet_class_param klass, param_name, value
         EnvironmentClass.find_or_create_by! puppetclass_id: klass.id, environment_id: env.id,
-                                            puppetclass_lookup_key_id: param.id
+          puppetclass_lookup_key_id: param.id
       end
     end
 
@@ -331,8 +327,8 @@ module ForemanPuppet
 
     def find_or_create_env(env)
       user_visible_environment(env) || Environment.create!(name: env,
-                                                           organizations: User.current.my_organizations,
-                                                           locations: User.current.my_locations)
+        organizations: User.current.my_organizations,
+        locations: User.current.my_locations)
     end
 
     def user_visible_environment(env)
@@ -343,11 +339,15 @@ module ForemanPuppet
     def find_or_create_puppet_class_param(klass, param_name, value)
       klass.class_params.where(key: param_name).first ||
         PuppetclassLookupKey.create!(key: param_name, default_value: value,
-                                     key_type: Foreman::ImporterPuppetclass.suggest_key_type(value))
+          key_type: Foreman::ImporterPuppetclass.suggest_key_type(value))
     end
 
-    def find_or_create_puppetclass(name:)
-      puppetclass = Puppetclass.unscoped.find_or_create_by!(name: name)
+    def find_or_create_puppetclass_for_env(klass_name, env)
+      # look for Puppet class in all scopes to make sure we do not try to create a new record
+      # with a name that already exists and hit the uniqueness constraint on name
+      puppetclass = Puppetclass.find_or_initialize_by(name: klass_name)
+      puppetclass.environment_classes.find_or_initialize_by(environment_id: env.id)
+      puppetclass.save
       raise Foreman::Exception.new('Failed to create Puppetclass: %s', puppetclass.errors.full_messages.to_sentence) unless puppetclass.errors.empty?
       puppetclass
     end

data/app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb

@@ -0,0 +1,62 @@
+<% title _("Changed environments") %>
+<%= form_tag controller.send("obsolete_and_new_#{controller_name}_path") do %>
+  <h4><%= _("Select the changes you want to apply to Foreman") %></h4>
+  <h6>
+  <%= _("Toggle") %>:
+  <%= link_to_function(icon_text("check", _("New")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_new')",
+                       :title => _("Check/Uncheck new")) %> |
+  <%= link_to_function(icon_text("check", _("Updated")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_updated')",
+                       :title => _("Check/Uncheck updated")) %> |
+  <%= link_to_function(icon_text("check", _("Obsolete")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_obsolete')",
+                       :title => _("Check/Uncheck obsolete")) %>
+  </h6>
+  <table class="<%= table_css_classes %>">
+    <thead>
+      <tr>
+        <th class="ca">
+          <%= link_to_function(icon_text("check"),
+                               "toggleCheckboxesBySelector('.env_select_boxes')",
+                               :title => _("Check/Uncheck all")) %>
+        </th>
+        <th><%= _("Environment") %></th>
+        <th><%= _("Operation") %></th>
+        <th><%= _("Puppet Modules") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% for kind in ["new", "obsolete", "updated", "ignored"] %>
+        <% unless (envs = @changed[kind]).empty? %>
+          <% for env in envs.keys.sort %>
+            <tr>
+              <% unless kind == 'ignored' %>
+                <td>
+                  <%= check_box_tag "changed[#{kind}][#{env}]", @changed[kind][env].to_json, false, :class => "env_select_boxes env_select_boxes_#{kind} env_select_boxes_env_#{env}" %>
+                </td>
+                <td>
+                  <%= link_to_function("#{env}", "toggleCheckboxesBySelector('.env_select_boxes_env_#{env}')", :title => _("Check/Uncheck all %s changes") % env) %>
+                </td>
+              <% else %>
+                <td>&nbsp;</td>
+                <td><%= env %></td>
+              <% end %>
+              <td>
+                <%= {"new" => _("Add:"), "obsolete" => _("Remove:"), "updated" => _("Update:"), "ignored" => _("Ignored:")}[kind] %>
+              </td>
+              <td>
+                <% pcs = @changed[kind][env] %>
+                <%= class_update_text pcs, env %>
+              </td>
+            </tr>
+          <% end %>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <div>
+    <%= link_to _("Cancel"), controller.send("#{controller_name}_path"), :class => "btn btn-default" %>
+    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
+  </div>
+<% end %>

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

@@ -20,7 +20,7 @@
         <td>
           <%= action_buttons(
                 link_to(_('Classes'), puppetclasses_path(search: "environment = #{environment}")),
-                import_proxy_links(hash_for_import_environments_environments_path(env: environment)),
+                import_proxy_links(hash_for_import_environments_environments_path(env: environment).merge(engine: foreman_puppet)),
                 display_delete_if_authorized(hash_for_environment_path(environment).merge(engine: foreman_puppet, auth_object: environment, authorizer: authorizer),
                                              data: { confirm: "Delete #{environment.name}?" })
               ) %>

data/app/views/foreman_puppet/environments/welcome.html.erb

@@ -11,6 +11,6 @@
     <%= new_link(_('Create Puppet Environment'), { engine: foreman_puppet }, { class: "btn-lg" }) %>
   </div>
   <div class="blank-slate-pf-secondary-action">
-    <%= import_proxy_select(hash_for_import_environments_environments_path) %>
+    <%= import_proxy_select(hash_for_import_environments_environments_path.merge(engine: foreman_puppet)) %>
   </div>
 </div>

data/app/views/foreman_puppet/puppetclasses/_classes.html.erb

@@ -1,4 +1,4 @@
-<% Puppetclass.classes2hash(puppetclasses).sort.in_groups(2,nil) do |group| %>
+<% ForemanPuppet::Puppetclass.classes2hash(puppetclasses).sort.in_groups(2,nil) do |group| %>
   <div class="col-md-6 classes">
     <% group.each do |list| %>
       <% next if list.nil? %>

data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :li, id: "selected_puppet_class_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(@environment))] do %>
+<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(@environment))] do %>
   <%= link_to_remove_puppetclass(klass, obj) %>
   <%= hidden_field_tag "#{resource_type}[puppetclass_ids][]", klass.id %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <% title _("Puppet Classes") %>
 
-<% title_actions import_proxy_select(hash_for_import_environments_puppetclasses_path),
+<% title_actions import_proxy_select(hash_for_import_environments_puppetclasses_path.merge(engine: foreman_puppet)),
                  documentation_button('4.2.2Classes') %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">

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

@@ -7,7 +7,7 @@
 <span id="puppet_klasses_reload_url" data-url="<%= foreman_puppet.environment_selected_hostgroups_path %>"></span>
 <% end %>
 <% if @environment.present? || obj.environment.present? %>
-  <% if accessible_resource_records(:config_group).exists? %>
+  <% if accessible_resource_records('ForemanPuppet::ConfigGroup').exists? %>
     <%= render 'foreman_puppet/config_groups/config_groups_selection', obj: obj, resource_type: resource_type %>
   <% end %>
 

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

@@ -3,6 +3,6 @@
 <%= form_for :environment, url: foreman_puppet.update_multiple_environment_hosts_path(host_ids: params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_('Select environment'), 'disabled'],
                         [_('*Clear environment*'), '' ],
-                        [_('*Inherit from host group*'), 'inherit']] + Environment.all.map{|e| [e.name, e.id]}, {},
+                        [_('*Inherit from host group*'), 'inherit']] + ForemanPuppet::Environment.all.map{|e| [e.name, e.id]}, {},
                      label: _('Environment'), onchange: 'tfm.hosts.table.toggleMultipleOkButton(this)' %>
 <% end %>

data/db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb

@@ -14,13 +14,13 @@ class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
 
   def down
     host_config_group_ids = HostConfigGroup.where(host_type: 'ForemanPuppet::HostPuppetFacet').pluck(:host_id).uniq
-    host_facet_ids = Hash[ForemanPuppet::HostPuppetFacet.where(id: host_config_group_ids).pluck(:id, :host_id)]
+    host_facet_ids = ForemanPuppet::HostPuppetFacet.where(id: host_config_group_ids).pluck(:id, :host_id).to_h
     host_config_group_ids.each do |host_puppet_facet_id|
       HostConfigGroup.where(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_puppet_facet_id)
                      .update_all(host_type: 'Host::Managed', host_id: host_facet_ids[host_puppet_facet_id])
     end
     hostgroup_config_group_ids = HostConfigGroup.where(host_type: 'ForemanPuppet::HostgroupPuppetFacet').pluck(:host_id).uniq
-    hostgroup_facet_ids = Hash[ForemanPuppet::HostgroupPuppetFacet.where(id: hostgroup_config_group_ids).pluck(:id, :hostgroup_id)]
+    hostgroup_facet_ids = ForemanPuppet::HostgroupPuppetFacet.where(id: hostgroup_config_group_ids).pluck(:id, :hostgroup_id).to_h
     hostgroup_config_group_ids.each do |hostgroup_facet_id|
       HostConfigGroup.where(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
                      .update_all(host_type: 'Hostgroup', host_id: hostgroup_facet_ids[hostgroup_facet_id])

data/lib/foreman_puppet.rb

@@ -1,9 +1,9 @@
 module ForemanPuppet
-  FOREMAN_EXTRACTION_VERSION = '2.5'.freeze
+  FOREMAN_EXTRACTION_VERSION = '3.0'.freeze
 
   def self.extracted_from_core?
     ENV['PUPPET_EXTRACTED'] == '1' ||
-      Gem::Dependency.new('', ">= #{FOREMAN_EXTRACTION_VERSION}").match?('', SETTINGS[:version])
+      Gem::Dependency.new('', ">= #{FOREMAN_EXTRACTION_VERSION}").match?('', SETTINGS[:version].notag)
   end
 end
 

data/lib/foreman_puppet/engine.rb

@@ -19,17 +19,19 @@ module ForemanPuppet
       end
     end
 
-    initializer 'foreman_ansible.configure_assets', group: :assets do
+    initializer 'foreman_puppet.configure_assets', group: :assets do
       SETTINGS[:foreman_puppet] = { assets: { precompile: ['foreman_puppet.scss'] } }
     end
 
-    # Include concerns in this config.to_prepare block
-    config.to_prepare do
+    initializer 'foreman_puppet.patch_parameters' do
       # Parameters should go ASAP as they need to be applied before they are included in core controller
       Foreman::Controller::Parameters::Host.include ForemanPuppet::Extensions::ParametersHost
       Foreman::Controller::Parameters::Hostgroup.include ForemanPuppet::Extensions::ParametersHostgroup
       Foreman::Controller::Parameters::TemplateCombination.include ForemanPuppet::Extensions::ParametersTemplateCombination
+    end
 
+    # Include concerns in this config.to_prepare block
+    config.to_prepare do
       # Facets extenstion is applied too early - before the Hostgroup is complete
       # We redefine thing, so we need to wait until complete definition of Hostgroup
       # thus separate patching instead of using facet patching
@@ -65,6 +67,8 @@ module ForemanPuppet
       end
       Foreman.input_types_registry.register(ForemanPuppet::InputType::PuppetParameterInput)
       ::ProxyStatus.status_registry.add(ForemanPuppet::ProxyStatus::Puppet)
+    rescue StandardError => e
+      Rails.logger.warn "ForemanPuppet: skipping engine hook (#{e})\n#{e.backtrace.join("\n")}"
     end
 
     rake_tasks do

data/lib/foreman_puppet/register.rb

@@ -169,13 +169,14 @@ Foreman::Plugin.register :foreman_puppet do
     configure_host do
       # extend_model ForemanPuppet::Extensions::Host
       api_view list: 'foreman_puppet/api/v2/host_puppet_facets/base',
-               single: 'foreman_puppet/api/v2/host_puppet_facets/host_single'
-      template_compatibility_properties :environment, :environment_id, :environment_name
+        single: 'foreman_puppet/api/v2/host_puppet_facets/host_single'
+      template_compatibility_properties :environment, :environment_id, :environment_name,
+        :puppetclasses, :all_puppetclasses
       set_dependent_action :destroy
     end
     configure_hostgroup(ForemanPuppet::HostgroupPuppetFacet) do
       api_view list: 'foreman_puppet/api/v2/hostgroup_puppet_facets/base',
-               single: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single'
+        single: 'foreman_puppet/api/v2/hostgroup_puppet_facets/hostgroup_single'
       template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
     end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/locale/Makefile

@@ -6,7 +6,7 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_puppet_enc
+DOMAIN = foreman_puppet
 VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo

data/locale/en/foreman_puppet.po

@@ -1,10 +1,10 @@
-# foreman_puppet_enc
+# foreman_puppet
 #
-# This file is distributed under the same license as foreman_puppet_enc.
+# This file is distributed under the same license as foreman_puppet.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: foreman_puppet 0.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-08-20 08:54+0100\n"
 "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -48,6 +48,9 @@ msgstr ""
 msgid "A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step."
 msgstr ""
 
+msgid "Action with sub plans"
+msgstr ""
+
 msgid "Actions"
 msgstr ""
 
@@ -66,6 +69,9 @@ msgstr ""
 msgid "All environments - (not filtered)"
 msgstr ""
 
+msgid "Allow assigning Puppet environmets and classes to the Foreman Hosts."
+msgstr ""
+
 msgid "Available Classes"
 msgstr ""
 
@@ -285,12 +291,18 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr ""
+
 msgid "Import classes from %s"
 msgstr ""
 
 msgid "Import environments from %s"
 msgstr ""
 
+msgid "Import facts"
+msgstr ""
+
 msgid "Import puppet classes from puppet proxy"
 msgstr ""
 
@@ -510,6 +522,9 @@ msgstr ""
 msgid "Puppetclass|Name"
 msgstr ""
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
@@ -576,9 +591,6 @@ msgstr ""
 msgid "Successfully updated environments and Puppet classes from the on-disk Puppet installation"
 msgstr ""
 
-msgid "TODO: Description of ForemanPuppetEnc."
-msgstr ""
-
 msgid "The %{proxy_type} proxy could not be set for host: %{host_names}."
 msgid_plural "The %{proxy_type} puppet ca proxy could not be set for hosts: %{host_names}"
 msgstr[0] ""