foreman_setup 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be2c21aab067c9a71805c4a61c9d79c803c01e55
-  data.tar.gz: a61f30441ef62da762a8686b848bb861f8c1a743
+  metadata.gz: d5a8af59d427af8214977639e543c4cd4f4fa5f1
+  data.tar.gz: 68f2949405814f9f0cb1009c9cfc0303c3a4965a
 SHA512:
-  metadata.gz: 1fdc207acb0b3f85419b13cc436193376965226e30f0b008796898b8cf5000e029de48cc0a9d60036bb53d0478e4ebb47a815683053acc7b08ec07c837eac0d1
-  data.tar.gz: 29de4ecac44e3e9cc0ebe12f5e3879595b422518ddc5cd1368ab751553f6cb28325c1096d107d69f4af16fdad81b85ade4c09c05a2bb6e8b016b159cfb612882
+  metadata.gz: 3ae2f7c5df551c5640faa48e72ed4fc44006d9bb7fa773060c2461f3ae71cf66907b3eddd01b585c13bd94bdd22cf67a9ee8cdf00adf9c2c2d8695ebaec7ad90
+  data.tar.gz: 93eb0b0da19d50b86dfef0630d32ba86b86f051acc048e2e466cbc7c22dbebf4810c436f54b4d73875f6645dac00e8186e87964179e04de1651da5c947d24479

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v5.0.0
+* fix Foreman 1.13 compatibility with parameter filtering
+
 ## v4.0.0
 * fix Foreman 1.12 compatibility with icons, CSS, template rendering etc.
 * fix empty DHCP range in installer arguments if left blank

data/README.md

@@ -24,6 +24,7 @@ RPM users can install the "tfm-rubygem-foreman_setup" or
 | >= 1.5          | ~> 2.0         |
 | >= 1.9          | ~> 3.0         |
 | >= 1.12         | ~> 4.0         |
+| >= 1.13         | ~> 5.0         |
 
 # Areas this should help
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -3,6 +3,8 @@ require 'facter'
 module ForemanSetup
   class ProvisionersController < ::ApplicationController
     include Foreman::Controller::ProvisioningTemplates
+    include Foreman::Controller::Parameters::Medium
+    include Foreman::Controller::Parameters::Subnet
     include Foreman::Renderer
 
     before_filter :find_myself, :only => [:new, :create]
@@ -27,7 +29,7 @@ module ForemanSetup
     end
 
     def create
-      @provisioner = Provisioner.new(params['foreman_setup_provisioner'])
+      @provisioner = Provisioner.new(provisioner_params)
       if @provisioner.save
         redirect_to step2_foreman_setup_provisioner_path(@provisioner)
       else
@@ -52,11 +54,11 @@ module ForemanSetup
     def step2_update
       @provisioner.hostgroup ||= Hostgroup.where(:name => _("Provision from %s") % @provisioner.fqdn).first_or_create
       @provisioner.subnet ||= Subnet.find_by_id(params['foreman_setup_provisioner']['subnet_attributes']['id'])
-      domain_name = params['foreman_setup_provisioner'].delete('domain_name')
+      domain_name = provisioner_params['domain_name']
       @provisioner.domain = Domain.find_by_name(domain_name)
       @provisioner.domain ||= Domain.new(:name => domain_name)
 
-      if @provisioner.update_attributes(params['foreman_setup_provisioner'])
+      if @provisioner.update_attributes(provisioner_params)
         @provisioner.subnet.domains << @provisioner.domain unless @provisioner.subnet.domains.include? @provisioner.domain
         process_success :success_msg => _("Successfully updated subnet %s.") % @provisioner.subnet.name, :success_redirect => step3_foreman_setup_provisioner_path
       else
@@ -98,7 +100,7 @@ module ForemanSetup
       warning msg unless status == 200
 
       @provisioner.hostgroup.medium ||= @provisioner.host.os.media.first
-      @medium = Medium.new(params['foreman_setup_provisioner'].try(:[], 'medium_attributes'))
+      @medium = Medium.new(provisioner_params.try(:[], 'medium_attributes'))
     end
 
     def step4_update
@@ -107,7 +109,7 @@ module ForemanSetup
         @medium = Medium.find(medium_id) || raise('unable to find medium')
       else
         @provisioner.hostgroup.medium_id = nil
-        @medium = Medium.new(params['foreman_setup_provisioner']['create_medium'].slice(:name, :path))
+        @medium = Medium.new(provisioner_params['create_medium'].slice(:name, :path))
       end
 
       # Associate medium with the host OS
@@ -176,5 +178,26 @@ module ForemanSetup
       @provisioner = Provisioner.authorized(:edit_provisioning).find(params[:id]) or raise('unknown id')
     end
 
+    def provisioner_params
+      @provisioner_params ||=
+        begin
+          medium_attrs = self.class.medium_params_filter.filter(parameter_filter_context)
+          subnet_attrs = self.class.subnet_params_filter.filter(parameter_filter_context)
+
+          params.permit(:'foreman_setup_provisioner' => [
+            :domain_name,
+            :host,
+            :host_id,
+            :provision_interface,
+            :smart_proxy,
+            :smart_proxy_id,
+            :subnet,
+            :create_medium => medium_attrs,
+            :hostgroup_attributes => [:id],
+            :medium_attributes => medium_attrs,
+            :subnet_attributes => subnet_attrs,
+          ])['foreman_setup_provisioner']
+        end
+    end
   end
 end

data/app/models/foreman_setup/provisioner.rb

@@ -5,8 +5,6 @@ module ForemanSetup
     include ::Authorizable
     include ::Host::Hostmix
 
-    attr_accessible :host, :smart_proxy, :host_id, :smart_proxy_id, :provision_interface, :domain_name, :subnet, :subnet_attributes
-
     before_save :populate_hostgroup
 
     belongs_to_host

data/lib/foreman_setup/engine.rb

@@ -16,7 +16,7 @@ module ForemanSetup
 
     initializer 'foreman_setup.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_setup do
-        requires_foreman '>= 1.12.0'
+        requires_foreman '>= 1.13.0'
 
         menu :top_menu, :provisioners, :url_hash => {:controller=> :'foreman_setup/provisioners', :action=>:index},
                  :caption=> N_('Provisioning setup'),

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that helps set up provisioning.
 email: dcleal@redhat.com