From c0b89246b46a7b21183a4ca38b12b4967c5807d7 Mon Sep 17 00:00:00 2001 From: Pierre Jacquot Date: Tue, 11 Oct 2022 21:47:49 +0200 Subject: [PATCH 1/2] [rubocop] Rubocop autofix deprecated ERB function calls. --- lib/refrepo/gen/puppet/dhcpg5k.rb | 2 +- lib/refrepo/gen/puppet/kadeployg5k.rb | 2 +- lib/refrepo/gen/puppet/kavlang5k.rb | 10 +++++----- lib/refrepo/gen/puppet/kwollectg5k.rb | 8 ++++---- lib/refrepo/gen/puppet/oxidizedg5k.rb | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/refrepo/gen/puppet/dhcpg5k.rb b/lib/refrepo/gen/puppet/dhcpg5k.rb index 066f65d551..d4115b1b5c 100644 --- a/lib/refrepo/gen/puppet/dhcpg5k.rb +++ b/lib/refrepo/gen/puppet/dhcpg5k.rb @@ -42,7 +42,7 @@ def write_dhcp_files(data, options) end ["dhcp", "dhcpv6"].each { |dhcpkind| - output = ERB.new(File.read(File.expand_path("templates/dhcp.erb", File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path("templates/dhcp.erb", File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}/platforms/production/modules/generated/files/grid5000/#{dhcpkind}/#{data.fetch("site_uid")}/#{data.fetch('filename')}") output_file.dirname.mkpath() File.write(output_file, output) diff --git a/lib/refrepo/gen/puppet/kadeployg5k.rb b/lib/refrepo/gen/puppet/kadeployg5k.rb index edb7b7fe31..525575454d 100644 --- a/lib/refrepo/gen/puppet/kadeployg5k.rb +++ b/lib/refrepo/gen/puppet/kadeployg5k.rb @@ -150,7 +150,7 @@ def generate_puppet_kadeployg5k(options) next end - output = ERB.new(File.read(File.expand_path('templates/kadeployg5k.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kadeployg5k.conf.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kadeploy/server#{suffix.tr('-', '_')}/#{site_uid}/#{cluster_uid}-cluster.conf") diff --git a/lib/refrepo/gen/puppet/kavlang5k.rb b/lib/refrepo/gen/puppet/kavlang5k.rb index b6468a71d5..675e64e62e 100644 --- a/lib/refrepo/gen/puppet/kavlang5k.rb +++ b/lib/refrepo/gen/puppet/kavlang5k.rb @@ -44,24 +44,24 @@ def generate_puppet_kavlang5k(options) next unless options[:sites].include?(site_uid) - conf = YAML::load(ERB.new(File.read("#{options[:conf_dir]}/kavlang5k.yaml"), nil, '-').result(binding))[site_uid] + conf = YAML::load(ERB.new(File.read("#{options[:conf_dir]}/kavlang5k.yaml"), trim_mode: '-').result(binding))[site_uid] if not conf warn "No generator configuration for site #{site_uid} found in #{options[:conf_dir]}/kavlang5k.yaml, skipping kavlan.conf" else - output = ERB.new(File.read(File.expand_path('templates/kavlan.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kavlan.conf.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kavlan/#{site_uid}/kavlan.conf") output_file.dirname.mkpath() File.write(output_file, output) end - output = ERB.new(File.read(File.expand_path('templates/kavlan-cluster.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kavlan-cluster.conf.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kavlan/#{site_uid}/#{site_uid}.conf") output_file.dirname.mkpath() File.write(output_file, output) (1..9).each do |kavlan_id| ["dhcpd", "dhcpd6"].each { |dhcpkind| - output = ERB.new(File.read(File.expand_path('templates/kavlan-dhcp.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kavlan-dhcp.conf.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kavlan/#{site_uid}/dhcp/#{dhcpkind}-#{kavlan_id}.conf") output_file.dirname.mkpath() File.write(output_file, output) @@ -72,7 +72,7 @@ def generate_puppet_kavlang5k(options) # TODO fix dirty convertion to_i below kavlan_id = refapi['sites'][site_uid]['kavlans'].each_key.select {|k| k.to_i > 9}.pop().to_i ["dhcpd", "dhcpd6"].each { |dhcpkind| - output = ERB.new(File.read(File.expand_path('templates/kavlan-dhcp.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kavlan-dhcp.conf.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kavlan/#{site_uid}/dhcp/#{dhcpkind}-0.conf") File.write(output_file, output) } diff --git a/lib/refrepo/gen/puppet/kwollectg5k.rb b/lib/refrepo/gen/puppet/kwollectg5k.rb index 32f53231c4..aaf2a0fd88 100644 --- a/lib/refrepo/gen/puppet/kwollectg5k.rb +++ b/lib/refrepo/gen/puppet/kwollectg5k.rb @@ -39,7 +39,7 @@ def generate_puppet_kwollectg5k(options) ipmi_credentials.map! { |s| ERB::Util.url_encode(s) } ipmi_credentials = ipmi_credentials.join(":") - output = ERB.new(File.read(File.expand_path('templates/kwollect-node.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kwollect-node.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kwollect/#{site_uid}/#{node_uid}.conf") output_file.dirname.mkpath() File.write(output_file, output) @@ -49,7 +49,7 @@ def generate_puppet_kwollectg5k(options) # Metrics configuration for network device site['network_equipments'].each { |neteq_uid, neteq| - output = ERB.new(File.read(File.expand_path('templates/kwollect-network.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kwollect-network.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kwollect/#{site_uid}/#{neteq_uid}.conf") output_file.dirname.mkpath() File.write(output_file, output) @@ -74,7 +74,7 @@ def generate_puppet_kwollectg5k(options) ## Then, write PDU metrics config site.fetch('pdus', {}).each { |pdu_uid, pdu| - output = ERB.new(File.read(File.expand_path('templates/kwollect-pdu.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kwollect-pdu.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kwollect/#{site_uid}/#{pdu_uid}.conf") output_file.dirname.mkpath() File.write(output_file, output) @@ -94,7 +94,7 @@ def generate_puppet_kwollectg5k(options) } } if not wattmetre_port_per_node.empty? - output = ERB.new(File.read(File.expand_path('templates/kwollect-wattmetre-mapping.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/kwollect-wattmetre-mapping.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kwollect-wattmetre/#{site_uid}/wattmetre-mapping.conf") output_file.dirname.mkpath() File.write(output_file, output) diff --git a/lib/refrepo/gen/puppet/oxidizedg5k.rb b/lib/refrepo/gen/puppet/oxidizedg5k.rb index d59972432d..55dc179faf 100644 --- a/lib/refrepo/gen/puppet/oxidizedg5k.rb +++ b/lib/refrepo/gen/puppet/oxidizedg5k.rb @@ -18,7 +18,7 @@ def generate_puppet_oxidizedg5k(options) if not conf warn "No generator configuration for oxidized found in #{options[:conf_dir]}/oxidizedg5k.yaml, skipping oxidized" else - output = ERB.new(File.read(File.expand_path('templates/oxidized.db.erb', File.dirname(__FILE__))), nil, '-').result(binding) + output = ERB.new(File.read(File.expand_path('templates/oxidized.db.erb', File.dirname(__FILE__))), trim_mode: '-').result(binding) output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/oxidized/oxidized.db") output_file.dirname.mkpath() File.write(output_file, output) From 98069c0515c699498de7c4b5b5a3ea35762fd012 Mon Sep 17 00:00:00 2001 From: Pierre Jacquot Date: Tue, 11 Oct 2022 21:50:56 +0200 Subject: [PATCH 2/2] [rubocop] Reenable ERB deprecation checks. --- .rubocop.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8102edeb43..325fa09a0a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,3 @@ --- Lint/UnusedBlockArgument: Severity: convention - -Lint/ErbNewArguments: - Enabled: false