foreman_puppet 11.0.0 → 11.2.0

data/app/assets/javascripts/foreman_puppet/locale/zh_TW/foreman_puppet.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_puppet": {
       "": {
-        "Project-Id-Version": "foreman_puppet 9.0.0",
+        "Project-Id-Version": "foreman_puppet 11.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2021-02-03 16:30+0000",
         "Last-Translator": "0868a4d1af5275b3f70b0a6dac4c99a4, 2023",
@@ -45,6 +45,12 @@
       "<b>Description:</b> %{desc}<br/>\\n        <b>Type:</b> %{type}<br/>\\n        <b>Matcher:</b> %{matcher}<br/>\\n        <b>Inherited value:</b> %{inherited_value}": [
         ""
       ],
+      "A Puppet environment with id %{id} could not be found.": [
+        ""
+      ],
+      "A Smart Proxy with id %{id} and the %{proxy_type} feature could not be found.": [
+        ""
+      ],
       "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.": [
         ""
       ],
@@ -69,6 +75,9 @@
       "Add:": [
         "新增："
       ],
+      "All": [
+        ""
+      ],
       "All environments - (not filtered)": [
         "所有環境 -（未篩選）"
       ],
@@ -96,15 +105,54 @@
       "Change Environment": [
         "更改環境"
       ],
+      "Change Puppet (CA) Proxy": [
+        ""
+      ],
+      "Change Puppet CA Proxy": [
+        ""
+      ],
+      "Change Puppet CA proxy": [
+        ""
+      ],
+      "Change Puppet Environment": [
+        ""
+      ],
       "Change Puppet Master": [
         "改變 Puppet Master"
       ],
+      "Change Puppet Proxy": [
+        ""
+      ],
+      "Change Puppet environment": [
+        ""
+      ],
+      "Change Puppet proxy": [
+        ""
+      ],
       "Changed": [
         ""
       ],
       "Changed environments": [
         "已更改的環境"
       ],
+      "Changing the Puppet CA proxy will affect {boldCount} selected hosts. Some hosts may already have been associated with the selected Puppet CA proxy.": [
+        ""
+      ],
+      "Changing the Puppet CA proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Some hosts may already have been associated with the selected Puppet CA proxy.": [
+        ""
+      ],
+      "Changing the Puppet environment will affect {boldCount} selected hosts. Some hosts may already have been associated with the selected environment.": [
+        ""
+      ],
+      "Changing the Puppet environment will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Some hosts may already have been associated with the selected environment.": [
+        ""
+      ],
+      "Changing the Puppet proxy will affect {boldCount} selected hosts. Some hosts may already have been associated with the selected Puppet proxy.": [
+        ""
+      ],
+      "Changing the Puppet proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Some hosts may already have been associated with the selected Puppet proxy.": [
+        ""
+      ],
       "Check/Uncheck all": [
         "選取/反選全部"
       ],
@@ -261,12 +309,48 @@
       "Failed": [
         ""
       ],
+      "Failed to change %{proxy_type} for %{count} host": [
+        "",
+        ""
+      ],
+      "Failed to change Puppet CA Proxy": [
+        ""
+      ],
+      "Failed to change Puppet Environment": [
+        ""
+      ],
+      "Failed to change Puppet Proxy": [
+        ""
+      ],
+      "Failed to change environment for %{count} host": [
+        "",
+        ""
+      ],
       "Failed to import %{klass} for %{name}: doesn't exists in our database - ignoring": [
         "為 %{name} 匯入 %{klass} 失敗：不存在我們的資料庫中 - 將被忽略"
       ],
+      "Failed to remove %{proxy_type} for %{count} host": [
+        "",
+        ""
+      ],
+      "Failed to remove Puppet CA Proxy": [
+        ""
+      ],
+      "Failed to remove Puppet Environment": [
+        ""
+      ],
+      "Failed to remove Puppet Proxy": [
+        ""
+      ],
       "Failed to set %{proxy_type} proxy for %{host}.": [
         "設定 %{proxy_type} 代理給 %{host} 時失敗。"
       ],
+      "Failed to set Puppet environment for %{host}.": [
+        ""
+      ],
+      "Failed to set proxy for %{host}.": [
+        ""
+      ],
       "Failed to start": [
         ""
       ],
@@ -348,6 +432,15 @@
       "ID of puppet environment": [
         ""
       ],
+      "ID of the Puppet environment to set for the selected hosts": [
+        ""
+      ],
+      "ID of the Puppet proxy to reassign the hosts to": [
+        ""
+      ],
+      "ID of the organization": [
+        ""
+      ],
       "IDs of associated ConfigGroups": [
         ""
       ],
@@ -450,6 +543,12 @@
       "List of config groups": [
         "配置群組清單"
       ],
+      "List of host ids to exclude and not run an action on": [
+        ""
+      ],
+      "List of host ids to perform an action on": [
+        ""
+      ],
       "List of override values for a specific smart class parameter": [
         "特定智慧型類別參數的置換值之清單"
       ],
@@ -597,6 +696,9 @@
       "Puppet CA Smart Proxy": [
         ""
       ],
+      "Puppet CA proxy": [
+        ""
+      ],
       "Puppet Class": [
         "Puppet 類別"
       ],
@@ -651,6 +753,9 @@
       "Puppet parameter": [
         "Puppet 參數"
       ],
+      "Puppet proxy": [
+        ""
+      ],
       "Puppetclass|Name": [
         "名稱"
       ],
@@ -660,6 +765,27 @@
       "Remove Combination": [
         ""
       ],
+      "Remove Puppet (CA) Proxy": [
+        ""
+      ],
+      "Remove Puppet CA Proxy": [
+        ""
+      ],
+      "Remove Puppet CA proxy": [
+        ""
+      ],
+      "Remove Puppet Environment": [
+        ""
+      ],
+      "Remove Puppet Proxy": [
+        ""
+      ],
+      "Remove Puppet environment": [
+        ""
+      ],
+      "Remove Puppet proxy": [
+        ""
+      ],
       "Remove a Puppet class from host": [
         "從主機移除一個 Puppet 類別"
       ],
@@ -675,6 +801,24 @@
       "Remove:": [
         "移除："
       ],
+      "Removing the Puppet CA proxy will affect {boldCount} selected hosts. Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!": [
+        ""
+      ],
+      "Removing the Puppet CA proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!": [
+        ""
+      ],
+      "Removing the Puppet environment will affect {boldCount} selected hosts.": [
+        ""
+      ],
+      "Removing the Puppet environment will affect {boldCount} selected {count, plural, one {host} other {hosts}}.": [
+        ""
+      ],
+      "Removing the Puppet proxy will affect {boldCount} selected hosts.": [
+        ""
+      ],
+      "Removing the Puppet proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}.": [
+        ""
+      ],
       "Reports": [
         "報告"
       ],
@@ -687,12 +831,27 @@
       "Scheduled": [
         ""
       ],
+      "Search string for hosts to perform an action on": [
+        ""
+      ],
+      "Select a Puppet CA Proxy": [
+        ""
+      ],
+      "Select a Puppet Proxy": [
+        ""
+      ],
+      "Select an Environment": [
+        ""
+      ],
       "Select environment": [
         "選擇環境"
       ],
       "Select the changes you want to apply to Foreman": [
         ""
       ],
+      "Selected Puppet environment is not assigned to the proper organization and/or location for all hosts.": [
+        ""
+      ],
       "Set parameters to defaults": [
         "將參數設為預設值"
       ],
@@ -778,6 +937,9 @@
       "There are no puppet environments set up on this puppet master. Please check the puppet master configuration.": [
         "此 puppet master 上並未設定 puppet 環境。請檢查 puppet master 的配置。"
       ],
+      "There is no Smart Proxy with the feature '%s' available.": [
+        ""
+      ],
       "This Puppet class has no parameters in its signature.": [
         "此 puppet 類別的簽章中沒有參數。"
       ],
@@ -799,6 +961,12 @@
       "Total": [
         "總數"
       ],
+      "True, if Puppet CA proxy should be changed instead of the Puppet proxy": [
+        ""
+      ],
+      "True, if Puppet CA proxy should be removed instead of the Puppet proxy": [
+        ""
+      ],
       "Types of validation values": [
         "驗證值的類型"
       ],
@@ -838,6 +1006,18 @@
       "Updated": [
         "已更新"
       ],
+      "Updated host: changed %{proxy_type}": [
+        "",
+        ""
+      ],
+      "Updated host: changed environment": [
+        "",
+        ""
+      ],
+      "Updated host: removed %{proxy_type}": [
+        "",
+        ""
+      ],
       "Updated hosts: changed environment": [
         "已更新主機：已更改的環境"
       ],

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

@@ -126,7 +126,7 @@ module ForemanPuppet
 
       def get_environment_for(host, id)
         if id == 'inherit' && host.hostgroup.present?
-          host.hostgroup.environment
+          host.hostgroup.puppet&.environment
         else
           ForemanPuppet::Environment.find_by(id: id)
         end

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

@@ -3,7 +3,9 @@ module ForemanPuppet
     module V2
       class HostsBulkActionsController < ::ForemanPuppet::Api::V2::PuppetBaseController
         include ::Api::V2::BulkHostsExtension
-        before_action :find_editable_hosts, only: %i[change_puppet_proxy remove_puppet_proxy]
+        before_action :find_editable_hosts, only: %i[change_puppet_environment change_puppet_proxy remove_puppet_proxy]
+        before_action :find_environment, only: %i[change_puppet_environment]
+        before_action :validate_environment_taxonomies, only: %i[change_puppet_environment]
         before_action :find_smart_proxy, only: %i[change_puppet_proxy]
 
         def_param_group :bulk_params do
@@ -17,6 +19,27 @@ module ForemanPuppet
           end
         end
 
+        api :PUT, '/hosts/bulk/change_puppet_environment', N_('Change Puppet environment')
+        param_group :bulk_params
+        param :environment_id, String, required: false, desc: N_('ID of the Puppet environment to set for the selected hosts')
+        def change_puppet_environment
+          error_hosts = ::BulkHostsManager.new(hosts: @hosts).change_puppet_environment(resolved_environment)
+
+          process_bulk_response(
+            error_hosts,
+            success_message: format(n_(
+              'Updated host: changed environment',
+              'Updated hosts: changed environment',
+              @hosts.count
+            )),
+            error_message: format(n_(
+              'Failed to change environment for %{count} host',
+              'Failed to change environment for %{count} hosts',
+              error_hosts.count
+            ), count: error_hosts.count)
+          )
+        end
+
         api :PUT, '/hosts/bulk/change_puppet_proxy', N_('Change Puppet (CA) Proxy')
         param_group :bulk_params
         param :proxy_id, :number, required: true, desc: N_('ID of the Puppet proxy to reassign the hosts to')
@@ -65,6 +88,14 @@ module ForemanPuppet
         end
 
         def process_bulk_puppet_proxy_response(error_hosts, success_message:, error_message:)
+          process_bulk_response(
+            error_hosts,
+            success_message: success_message,
+            error_message: error_message
+          )
+        end
+
+        def process_bulk_response(error_hosts, success_message:, error_message:)
           if error_hosts.empty?
             process_response(true, { message: success_message })
           else
@@ -93,6 +124,49 @@ module ForemanPuppet
           Foreman::Cast.to_bool(params[:ca_proxy])
         end
 
+        def find_environment
+          return true if environment_value == 'inherit' || environment_value.blank?
+
+          @environment = ForemanPuppet::Environment.find_by(id: environment_value)
+          return true if @environment.present?
+
+          render json: {
+            error: {
+              message: format(_('A Puppet environment with id %{id} could not be found.'), id: environment_value),
+            },
+          }, status: :unprocessable_entity
+          false
+        end
+
+        def validate_environment_taxonomies
+          return true if resolved_environment.blank? || resolved_environment == 'inherit'
+
+          invalid_host_ids = @hosts.reject do |host|
+            ForemanPuppet::Environment.with_taxonomy_scope(host.organization, host.location)
+                                      .exists?(id: resolved_environment.id)
+          end.map(&:id)
+
+          return true if invalid_host_ids.empty?
+
+          render_error(:bulk_hosts_error, status: :unprocessable_entity,
+            locals: {
+              message: _('Selected Puppet environment is not assigned to the proper organization and/or location for all hosts.'),
+              failed_host_ids: invalid_host_ids,
+            })
+          false
+        end
+
+        def environment_value
+          params[:environment_id]
+        end
+
+        def resolved_environment
+          return 'inherit' if environment_value == 'inherit'
+          return nil if environment_value.blank?
+
+          @environment
+        end
+
         def proxy_type
           ca_proxy? ? _('Puppet CA proxy') : _('Puppet proxy')
         end

data/app/models/foreman_puppet/config_group.rb

@@ -16,7 +16,9 @@ module ForemanPuppet
 
     validates :name, presence: true, uniqueness: true
 
-    scope :assigned_to_hosts, -> { where(id: ForemanPuppet::HostConfigGroup.select(:config_group_id)) }
+    scope :assigned_to_hosts, lambda {
+      where(id: ForemanPuppet::HostConfigGroup.assigned_to_taxonomy.select(:config_group_id))
+    }
 
     scoped_search on: :name, complete_value: true
     scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ ']

data/app/models/foreman_puppet/host_config_group.rb

@@ -8,6 +8,18 @@ module ForemanPuppet
 
     validates :host_id, uniqueness: { scope: %i[config_group_id host_type] }
 
+    scope :assigned_to_taxonomy, lambda {
+      host_facets = ForemanPuppet::HostPuppetFacet
+                    .where(host_id: ::Host::Managed.reorder(nil).select(:id))
+                    .select(:id)
+      hostgroup_facets = ForemanPuppet::HostgroupPuppetFacet
+                         .where(hostgroup_id: ::Hostgroup.reorder(nil).select(:id))
+                         .select(:id)
+
+      where(host_type: ForemanPuppet::HostPuppetFacet.polymorphic_name, host_id: host_facets)
+        .or(where(host_type: ForemanPuppet::HostgroupPuppetFacet.polymorphic_name, host_id: hostgroup_facets))
+    }
+
     def check_permissions_after_save
       true
     end

data/app/models/foreman_puppet/puppetclass.rb

@@ -42,10 +42,21 @@ module ForemanPuppet
     default_scope -> { order(:name) }
 
     scope :assigned_to_hosts, lambda {
-      direct = ForemanPuppet::HostClass.select(:puppetclass_id)
-      via_hostgroup = ForemanPuppet::HostgroupClass.select(:puppetclass_id)
+      host_facets = ForemanPuppet::HostPuppetFacet
+                    .where(host_id: ::Host::Managed.reorder(nil).select(:id))
+                    .select(:id)
+      hostgroup_facets = ForemanPuppet::HostgroupPuppetFacet
+                         .where(hostgroup_id: ::Hostgroup.unscoped.with_taxonomy_scope.reorder(nil).select(:id))
+                         .select(:id)
+      direct = ForemanPuppet::HostClass
+               .where(host_puppet_facet_id: host_facets)
+               .select(:puppetclass_id)
+      via_hostgroup = ForemanPuppet::HostgroupClass
+                      .where(hostgroup_puppet_facet_id: hostgroup_facets)
+                      .select(:puppetclass_id)
+      config_group_ids = ForemanPuppet::HostConfigGroup.assigned_to_taxonomy.select(:config_group_id)
       via_config_group = ForemanPuppet::ConfigGroupClass
-                         .where(config_group_id: ForemanPuppet::HostConfigGroup.select(:config_group_id))
+                         .where(config_group_id: config_group_ids)
                          .select(:puppetclass_id)
 
       where(id: direct).or(where(id: via_hostgroup)).or(where(id: via_config_group))

data/app/services/concerns/foreman_puppet/extensions/bulk_hosts_manager.rb

@@ -3,6 +3,24 @@ module ForemanPuppet
     module BulkHostsManager
       extend ActiveSupport::Concern
 
+      def change_puppet_environment(environment)
+        error_hosts = []
+        @hosts.each do |host|
+          puppet = host.puppet || host.build_puppet
+          puppet.environment = if environment == 'inherit'
+                                 host.hostgroup&.puppet&.environment
+                               else
+                                 environment
+                               end
+          host.save(validate: false)
+        rescue StandardError => e
+          message = format(_('Failed to set Puppet environment for %{host}.'), host: host)
+          Foreman::Logging.exception(message, e)
+          error_hosts << host.id
+        end
+        error_hosts
+      end
+
       def change_puppet_proxy(proxy, is_ca_proxy)
         error_hosts = []
         @hosts.each do |host|

data/config/api_routes.rb

@@ -4,6 +4,7 @@ Foreman::Application.routes.draw do
       scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v1|v2/, constraints: ApiConstraints.new(version: 2, default: true) do
         match 'hosts/bulk/change_puppet_proxy', to: 'hosts_bulk_actions#change_puppet_proxy', via: [:put]
         match 'hosts/bulk/remove_puppet_proxy', to: 'hosts_bulk_actions#remove_puppet_proxy', via: [:put]
+        match 'hosts/bulk/change_puppet_environment', to: 'hosts_bulk_actions#change_puppet_environment', via: [:put]
       end
     end
   end

data/db/seeds.d/111_puppet_proxy_feature.rb

@@ -4,5 +4,5 @@ proxy_features = %w[Puppet]
 
 proxy_features.each do |f_name|
   f = Feature.where(name: f_name).first_or_create
-  raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+  raise "Unable to create proxy feature: #{SeedHelper.format_errors(f)}" if f.nil? || f.errors.any?
 end

data/lib/foreman_puppet/register.rb

@@ -62,6 +62,7 @@ Foreman::Plugin.register :foreman_puppet do
       p.actions << 'hosts/update_multiple_environment'
       p.actions << 'hosts/select_multiple_puppet_proxy'
       p.actions << 'hosts/update_multiple_puppet_proxy'
+      p.actions << 'foreman_puppet/api/v2/hosts_bulk_actions/change_puppet_environment'
       p.actions << 'foreman_puppet/api/v2/hosts_bulk_actions/change_puppet_proxy'
       p.actions << 'foreman_puppet/api/v2/hosts_bulk_actions/remove_puppet_proxy'
     end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '11.0.0'.freeze
+  VERSION = '11.2.0'.freeze
 end