Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/238778
Change subject: rubocop: Fixed Style/WordArray offense
......................................................................
rubocop: Fixed Style/WordArray offense
Bug: T112651
Change-Id: I639bef3c654046c1ad3c5f2e7deaa5c8b323e6c1
---
M .rubocop_todo.yml
M modules/base/lib/facter/initsystem.rb
M modules/install_server/Rakefile
M modules/mirrors/Rakefile
M modules/squid3/Rakefile
M modules/wmflib/spec/functions/role_spec.rb
M modules/wmflib/spec/hiera/role_backend_spec.rb
7 files changed, 8 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/238778/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c2a60b3..efc8d3a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -447,9 +447,3 @@
Style/UnlessElse:
Exclude:
- 'modules/base/files/monitoring/check_puppetrun'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
- MinSize: 3
diff --git a/modules/base/lib/facter/initsystem.rb
b/modules/base/lib/facter/initsystem.rb
index 4e9b34b..5b7eef2 100644
--- a/modules/base/lib/facter/initsystem.rb
+++ b/modules/base/lib/facter/initsystem.rb
@@ -24,7 +24,7 @@
elsif ["Linux", "GNU/kFreeBSD"].include? Facter.value(:kernel)
# generic fallback
result = "sysvinit"
- elsif ["FreeBSD", "OpenBSD", "NetBSD"].include? Facter.value(:kernel)
+ elsif %w(FreeBSD OpenBSD NetBSD).include? Facter.value(:kernel)
result = "bsd"
elsif Facter.value(:kernel) == "SunOS"
result = "smf"
diff --git a/modules/install_server/Rakefile b/modules/install_server/Rakefile
index 0542f30..0e38911 100644
--- a/modules/install_server/Rakefile
+++ b/modules/install_server/Rakefile
@@ -5,7 +5,7 @@
# Note: The nginx puppet module is a git submodule right now, so don't forget
to
# checkout submodules before testing
-extra_modules = [ 'nginx', 'wmflib' ]
+extra_modules = %w(nginx wmflib)
modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
diff --git a/modules/mirrors/Rakefile b/modules/mirrors/Rakefile
index 0542f30..0e38911 100644
--- a/modules/mirrors/Rakefile
+++ b/modules/mirrors/Rakefile
@@ -5,7 +5,7 @@
# Note: The nginx puppet module is a git submodule right now, so don't forget
to
# checkout submodules before testing
-extra_modules = [ 'nginx', 'wmflib' ]
+extra_modules = %w(nginx wmflib)
modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
diff --git a/modules/squid3/Rakefile b/modules/squid3/Rakefile
index 5bed768..6f78f76 100644
--- a/modules/squid3/Rakefile
+++ b/modules/squid3/Rakefile
@@ -3,7 +3,7 @@
require 'rspec/core/rake_task'
-extra_modules = [ 'wmflib', 'stdlib' ]
+extra_modules = %w(wmflib stdlib)
modulename = File.basename(File.expand_path(File.dirname(__FILE__)))
diff --git a/modules/wmflib/spec/functions/role_spec.rb
b/modules/wmflib/spec/functions/role_spec.rb
index 26dd021..d0c23ce 100644
--- a/modules/wmflib/spec/functions/role_spec.rb
+++ b/modules/wmflib/spec/functions/role_spec.rb
@@ -38,7 +38,7 @@
end
it "adds the keys to the top-scope variable" do
- @scope.function_role(['test', 'test2'])
+ @scope.function_role(%w(test test2))
expect(@topscope.lookupvar('_roles')).to eq({'test' => true, 'test2' =>
true})
end
diff --git a/modules/wmflib/spec/hiera/role_backend_spec.rb
b/modules/wmflib/spec/hiera/role_backend_spec.rb
index 19c436a..39e8890 100644
--- a/modules/wmflib/spec/hiera/role_backend_spec.rb
+++ b/modules/wmflib/spec/hiera/role_backend_spec.rb
@@ -37,17 +37,17 @@
end
it "lookup raises an error if conflicting values are given in different
roles" do
- @scope.function_role(['test', 'test2'])
+ @scope.function_role(%w(test test2))
expect {@backend.lookup('admin::groups', @topscope, nil, nil)}.to
raise_error(Exception, "Conflicting value for admin::groups found in role
test2")
end
it "merges values when using an array lookup" do
- @scope.function_role(['test', 'test2'])
+ @scope.function_role(%w(test test2))
expect(@backend.lookup('admin::groups', @topscope, nil, :array)).to
eq([['FooBar'],['FooBar1']])
end
it "merges values when using hash lookup" do
- @scope.function_role(['test', 'test2'])
+ @scope.function_role(%w(test test2))
expect(@backend.lookup('an_hash', @topscope, nil, :hash)).to
eq({"test2"=>true, "test3"=>{"another"=>"level"}, "test"=>true})
end
end
--
To view, visit https://gerrit.wikimedia.org/r/238778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I639bef3c654046c1ad3c5f2e7deaa5c8b323e6c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
