From f3547ab7e8a7dd14395caa8141463e229a56ec2c Mon Sep 17 00:00:00 2001 From: akumari Date: Thu, 22 Feb 2024 15:00:54 +0530 Subject: [PATCH] Fixes #37424 - Fix Style/RedundantRegexpEscape cop --- app/models/architecture.rb | 2 +- app/models/compute_resources/foreman/model/openstack.rb | 2 +- app/models/medium.rb | 2 +- app/models/operatingsystems/solaris.rb | 2 +- app/models/setting.rb | 2 +- app/models/user.rb | 4 ++-- app/services/fact_parser.rb | 4 ++-- app/services/foreman_ansible/operating_system_parser.rb | 2 +- app/services/ipam/eui64.rb | 2 +- app/services/puppet_fact_parser.rb | 4 ++-- lib/tasks/puppet.rake | 2 +- test/controllers/registration_commands_controller_test.rb | 8 ++++---- test/helpers/form_helper_test.rb | 2 +- test/models/concerns/hostext/search_test.rb | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/models/architecture.rb b/app/models/architecture.rb index 78f10c84495..acf3a84d0ec 100644 --- a/app/models/architecture.rb +++ b/app/models/architecture.rb @@ -26,7 +26,7 @@ def bootfilename_efi when /aarch64|aa64/ 'aa64' else # ppc64, ppc64le and others - name.parameterize.gsub(/[^\w\.-]/, '_') + name.parameterize.gsub(/[^\w.-]/, '_') end end end diff --git a/app/models/compute_resources/foreman/model/openstack.rb b/app/models/compute_resources/foreman/model/openstack.rb index dfc54d6843e..bf616344f0a 100644 --- a/app/models/compute_resources/foreman/model/openstack.rb +++ b/app/models/compute_resources/foreman/model/openstack.rb @@ -262,7 +262,7 @@ def normalize_vm_attrs(vm_attrs) def url_for_fog u = URI.parse(url) - match_data = u.path.match(%r{(.*)\/v\d+.*}) + match_data = u.path.match(%r{(.*)/v\d+.*}) path = match_data && (match_data[1] || '') "#{u.scheme}://#{u.host}:#{u.port}#{path}" end diff --git a/app/models/medium.rb b/app/models/medium.rb index ad357172555..5cb5faf6501 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -16,7 +16,7 @@ class Medium < ApplicationRecord has_many :hostgroups, :dependent => :nullify # We need to include $ in this as $arch, $release, can be in this string - VALID_NFS_PATH = /\A([-\w\d\.]+):(\/[\w\d\/\$\.]+)\Z/ + VALID_NFS_PATH = /\A([-\w\d.]+):(\/[\w\d\/$.]+)\Z/ validates :name, :uniqueness => true, :presence => true validates :path, :uniqueness => true, :presence => true, :url_schema => ['http', 'https', 'ftp', 'nfs'] diff --git a/app/models/operatingsystems/solaris.rb b/app/models/operatingsystems/solaris.rb index 43ca16f6f4a..b73833bb21b 100644 --- a/app/models/operatingsystems/solaris.rb +++ b/app/models/operatingsystems/solaris.rb @@ -2,7 +2,7 @@ class Solaris < Operatingsystem PXEFILES = {:initrd => "x86.miniroot", :kernel => "multiboot"} def file_prefix - to_s.gsub(/[\s\(\)]/, "-").gsub("--", "-").gsub(/-\Z/, "") + to_s.gsub(/[\s()]/, "-").gsub("--", "-").gsub(/-\Z/, "") end # sets the prefix for the tftp files based on the OS diff --git a/app/models/setting.rb b/app/models/setting.rb index d80420d1977..a1a529e90aa 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -134,7 +134,7 @@ def parse_string_value(val) when "array" if val =~ /\A\[.*\]\Z/ begin - self.value = YAML.safe_load(val.gsub(/(\,)(\S)/, "\\1 \\2")) + self.value = YAML.safe_load(val.gsub(/(,)(\S)/, "\\1 \\2")) rescue => e invalid_value_error e.to_s end diff --git a/app/models/user.rb b/app/models/user.rb index 50bfc5dc514..f6f98923215 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -93,11 +93,11 @@ def self.title_name end def self.name_format - /\A[[:alnum:]\s'_\-\.()<>;=,]*\z/ + /\A[[:alnum:]\s'_\-.()<>;=,]*\z/ end validates :login, :presence => true, :uniqueness => {:case_sensitive => false, :message => N_("already exists")}, - :format => {:with => /\A[[:alnum:]_\-@\.\\$#+]*\Z/}, :length => {:maximum => 100}, + :format => {:with => /\A[[:alnum:]_\-@.\\$#+]*\Z/}, :length => {:maximum => 100}, :exclusion => { in: %w(current_user) } validates :auth_source_id, :presence => true validates :password_hash, :presence => true, :if => proc { |user| user.manage_password? } diff --git a/app/services/fact_parser.rb b/app/services/fact_parser.rb index 473929c1cd2..1deeeada866 100644 --- a/app/services/fact_parser.rb +++ b/app/services/fact_parser.rb @@ -1,9 +1,9 @@ class FactParser delegate :logger, :to => :Rails - VIRTUAL = /\A([a-z0-9]+)[_|\.|:]([a-z0-9]+)\Z/ + VIRTUAL = /\A([a-z0-9]+)[_|.|:]([a-z0-9]+)\Z/ BRIDGES = /\A(vir|lxc)?br(\d+|-[a-z0-9]+)(_nic)?\Z/ BONDS = /\A(bond\d+)\Z|\A(lagg\d+)\Z/ - ALIASES = /(\A[a-z0-9\.]+):([a-z0-9]+)\Z/ + ALIASES = /(\A[a-z0-9.]+):([a-z0-9]+)\Z/ VLANS = /\A([a-zA-Z0-9]+)\.([0-9]+)\Z/ VIRTUAL_NAMES = /#{ALIASES}|#{VLANS}|#{VIRTUAL}|#{BRIDGES}|#{BONDS}/ # spend 500ms per IP on primary interface lookup diff --git a/app/services/foreman_ansible/operating_system_parser.rb b/app/services/foreman_ansible/operating_system_parser.rb index 529af5884d7..ab8a0c060e5 100644 --- a/app/services/foreman_ansible/operating_system_parser.rb +++ b/app/services/foreman_ansible/operating_system_parser.rb @@ -52,7 +52,7 @@ def os_release_name def os_major if os_name == 'Debian' && - (facts[:ansible_distribution_major_version][%r{\/sid}i] || + (facts[:ansible_distribution_major_version][%r{/sid}i] || facts[:ansible_distribution_major_version] == 'n/a') debian_os_major_sid else diff --git a/app/services/ipam/eui64.rb b/app/services/ipam/eui64.rb index 5f76942207a..e77de710560 100644 --- a/app/services/ipam/eui64.rb +++ b/app/services/ipam/eui64.rb @@ -24,7 +24,7 @@ def validate def mac_to_ip(mac) # cleanup MAC address - mac.gsub!(/[\.\:\-]/, '') + mac.gsub!(/[.:\-]/, '') # separate the 48-bit MAC address into two 24-bits oui = mac.slice(0..5) diff --git a/app/services/puppet_fact_parser.rb b/app/services/puppet_fact_parser.rb index b9fa40704ad..3095b2f2fe4 100644 --- a/app/services/puppet_fact_parser.rb +++ b/app/services/puppet_fact_parser.rb @@ -7,7 +7,7 @@ def operatingsystem if orel.present? major, minor = orel.split('.', 2) major = major.to_s.gsub(/\D/, '') - minor = minor.to_s.gsub(/[^\d\.]/, '') + minor = minor.to_s.gsub(/[^\d.]/, '') args = {:name => os_name, :major => major, :minor => minor} os = Operatingsystem.find_or_initialize_by(args) if os_name[/debian|ubuntu/i] || os.family == 'Debian' @@ -238,7 +238,7 @@ def os_release majorjunos, minorjunos = os_release_full.split("R") majorjunos + "." + minorjunos when /FreeBSD/i - os_release_full.gsub(/\-RELEASE\-p[0-9]+/, '') + os_release_full.gsub(/-RELEASE-p[0-9]+/, '') when /Solaris/i os_release_full.gsub(/_u/, '.') when /PSBM/i diff --git a/lib/tasks/puppet.rake b/lib/tasks/puppet.rake index 9fc23915dfd..d3050f62222 100644 --- a/lib/tasks/puppet.rake +++ b/lib/tasks/puppet.rake @@ -15,7 +15,7 @@ namespace :puppet do name = yaml.match(/.*\/(.*).yaml/)[1] puts "Importing #{name}" puppet_facts = File.read(yaml) - facts_stripped_of_class_names = YAML.safe_load(puppet_facts.gsub(/\!ruby\/object.*$/, '')) + facts_stripped_of_class_names = YAML.safe_load(puppet_facts.gsub(/!ruby\/object.*$/, '')) User.as_anonymous_admin do host = Host::Managed.import_host(facts_stripped_of_class_names['name'], 'puppet') HostFactImporter.new(host).import_facts(facts_stripped_of_class_names['values']) diff --git a/test/controllers/registration_commands_controller_test.rb b/test/controllers/registration_commands_controller_test.rb index b0bc2b69c2a..cf8361d62b4 100644 --- a/test/controllers/registration_commands_controller_test.rb +++ b/test/controllers/registration_commands_controller_test.rb @@ -101,21 +101,21 @@ class RegistrationCommandsControllerTest < ActionController::TestCase test 'with default expiration' do post :create, session: set_session_user command = JSON.parse(@response.body)['command'] - parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=\')/).flatten[0] + parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=')/).flatten[0] assert JwtToken.new(parsed_token).decode['exp'] end test 'with expiration' do post :create, params: { jwt_expiration: 23 }, session: set_session_user command = JSON.parse(@response.body)['command'] - parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=\')/).flatten[0] + parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=')/).flatten[0] assert JwtToken.new(parsed_token).decode['exp'] end test 'unlimited' do post :create, params: { jwt_expiration: 'unlimited' }, session: set_session_user command = JSON.parse(@response.body)['command'] - parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=\')/).flatten[0] + parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=')/).flatten[0] refute JwtToken.new(parsed_token).decode['exp'] end @@ -123,7 +123,7 @@ class RegistrationCommandsControllerTest < ActionController::TestCase test '0' do post :create, params: { jwt_expiration: 0 }, session: set_session_user command = JSON.parse(@response.body)['command'] - parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=\')/).flatten[0] + parsed_token = command.scan(/(?<=Bearer )(.*)(?=.*)(?=')/).flatten[0] refute JwtToken.new(parsed_token).decode['exp'] end diff --git a/test/helpers/form_helper_test.rb b/test/helpers/form_helper_test.rb index df55a981684..14f9fcb8555 100644 --- a/test/helpers/form_helper_test.rb +++ b/test/helpers/form_helper_test.rb @@ -102,7 +102,7 @@ class FormHelperTest < ActionView::TestCase user = FactoryBot.build_stubbed(:user, :organizations => [taxonomies(:organization1)]) form_for Filter.new do |f| - assert_match(/input name=\"filter\[organization_ids\]\[\].*/, + assert_match(/input name="filter\[organization_ids\]\[\].*/, multiple_checkboxes(f, :organizations, f.object, user.organizations)) end end diff --git a/test/models/concerns/hostext/search_test.rb b/test/models/concerns/hostext/search_test.rb index 5b7aae671c8..cb3a2d2ac86 100644 --- a/test/models/concerns/hostext/search_test.rb +++ b/test/models/concerns/hostext/search_test.rb @@ -111,8 +111,8 @@ class SearchTest < ActiveSupport::TestCase end test "invalid fact property should properly format" do - assert_match /\'goofy.bad\'/, Host.search_for("facts.goofy.bad=value").to_sql - assert_match /\'goofy\'/, Host.search_for("facts.goofy=value").to_sql + assert_match /'goofy.bad'/, Host.search_for("facts.goofy.bad=value").to_sql + assert_match /'goofy'/, Host.search_for("facts.goofy=value").to_sql end test "searching fact on complex search returns correct host" do