[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix Style/RegexpLiteral RuboCop offenses

2018-01-09 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359479 )

Change subject: Fix Style/RegexpLiteral RuboCop offenses
..


Fix Style/RegexpLiteral RuboCop offenses

Mostly in bacula but also a couple in servermon.

Change-Id: I123ac7fb80d9bcbc0ecf0a55bed1b2f93e908134
---
M .rubocop_todo.yml
M modules/bacula/spec/classes/bacula_client_spec.rb
M modules/bacula/spec/classes/bacula_director_spec.rb
M modules/bacula/spec/classes/bacula_storage_spec.rb
M modules/bacula/spec/defines/fileset_spec.rb
M modules/bacula/spec/defines/storage_device_spec.rb
M modules/servermon/spec/classes/servermon_app_spec.rb
7 files changed, 15 insertions(+), 24 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 681b2a0..8c5ff72 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -47,15 +47,6 @@
 Style/NegatedIf:
   Enabled: false
 
-Style/RegexpLiteral:
-  Exclude:
-- 'modules/bacula/spec/classes/bacula_client_spec.rb'
-- 'modules/bacula/spec/classes/bacula_director_spec.rb'
-- 'modules/bacula/spec/classes/bacula_storage_spec.rb'
-- 'modules/bacula/spec/defines/fileset_spec.rb'
-- 'modules/bacula/spec/defines/storage_device_spec.rb'
-- 'modules/servermon/spec/classes/servermon_app_spec.rb'
-
 Style/RescueModifier:
   Exclude:
 - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb 
b/modules/bacula/spec/classes/bacula_client_spec.rb
index 2d01eb4..ebec576 100644
--- a/modules/bacula/spec/classes/bacula_client_spec.rb
+++ b/modules/bacula/spec/classes/bacula_client_spec.rb
@@ -23,10 +23,10 @@
 }) \
 .with_content(/Name = "testdirector"/) \
 .with_content(/Password = "testdirectorpass"/) \
-.with_content(/TLS Certificate = "\/etc\/bacula\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = "/etc/bacula/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/ssl/server.key"}) \
 .with_content(/Name = "testhost.example.com-fd"/) \
 .with_content(/FDport = 2000/) \
-.with_content(/PKI Keypair = "\/etc\/bacula\/ssl\/server-keypair.pem"/)
+.with_content(%r{PKI Keypair = "/etc/bacula/ssl/server-keypair.pem"})
 end
 end
diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb 
b/modules/bacula/spec/classes/bacula_director_spec.rb
index da9f398..c62f930 100644
--- a/modules/bacula/spec/classes/bacula_director_spec.rb
+++ b/modules/bacula/spec/classes/bacula_director_spec.rb
@@ -65,8 +65,8 @@
 }) \
 .with_content(/Name = "testhost.example.com"/) \
 .with_content(/Password = "bconsolepass"/) \
-.with_content(/TLS Certificate = 
"\/etc\/bacula\/director\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/director\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = 
"/etc/bacula/director/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/director/ssl/server.key"}) \
 .with_content(/DIRport = 9900/) \
 .with_content(/Maximum Concurrent Jobs = 10/)
 end
diff --git a/modules/bacula/spec/classes/bacula_storage_spec.rb 
b/modules/bacula/spec/classes/bacula_storage_spec.rb
index 32a8320..67c97c1 100644
--- a/modules/bacula/spec/classes/bacula_storage_spec.rb
+++ b/modules/bacula/spec/classes/bacula_storage_spec.rb
@@ -33,8 +33,8 @@
 }) \
 .with_content(/Name = "testdirector"/) \
 .with_content(/Password = "testdirectorpass"/) \
-.with_content(/TLS Certificate = "\/etc\/bacula\/sd\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/sd\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = "/etc/bacula/sd/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/sd/ssl/server.key"}) \
 .with_content(/Name = "testhost.example.com-fd"/) \
 .with_content(/SDport = 9000/) \
 .with_content(/Maximum Concurrent Jobs = 10/)
diff --git a/modules/bacula/spec/defines/fileset_spec.rb 
b/modules/bacula/spec/defines/fileset_spec.rb
index 7bea6cd..08fd77a 100644
--- a/modules/bacula/spec/defines/fileset_spec.rb
+++ b/modules/bacula/spec/defines/fileset_spec.rb
@@ -16,8 +16,8 @@
 context 'without excludes' do
 it 'should create valid content for 
/etc/bacula/conf.d/fileset-something.conf' do
 should contain_file('/etc/bacula/conf.d/fileset-something.conf') \
-.with_content(/File = \//) \
-.with_content(/File = \/var/)
+.with_content(%r{File = /}) \
+.with_content(%r{File = /var})
 end
 end
 
@@ -29,9 +29,9 @@
 }
 it 'should create valid content for 
/etc/bacula/conf.d/fileset-something.conf'

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix Style/RegexpLiteral Rubocop offenses

2017-06-16 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359479 )

Change subject: Fix Style/RegexpLiteral Rubocop offenses
..

Fix Style/RegexpLiteral Rubocop offenses

Mostly in bacula but a couple in servermon and trebuchet.

Change-Id: I123ac7fb80d9bcbc0ecf0a55bed1b2f93e908134
---
M .rubocop_todo.yml
M modules/bacula/spec/classes/bacula_client_spec.rb
M modules/bacula/spec/classes/bacula_director_spec.rb
M modules/bacula/spec/classes/bacula_storage_spec.rb
M modules/bacula/spec/defines/fileset_spec.rb
M modules/bacula/spec/defines/storage_device_spec.rb
M modules/servermon/spec/classes/servermon_app_spec.rb
M modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
8 files changed, 17 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/359479/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0d21e87..89dc0a5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -51,16 +51,6 @@
 Style/NumericLiterals:
   MinDigits: 6
 
-Style/RegexpLiteral:
-  Exclude:
-- 'modules/bacula/spec/classes/bacula_client_spec.rb'
-- 'modules/bacula/spec/classes/bacula_director_spec.rb'
-- 'modules/bacula/spec/classes/bacula_storage_spec.rb'
-- 'modules/bacula/spec/defines/fileset_spec.rb'
-- 'modules/bacula/spec/defines/storage_device_spec.rb'
-- 'modules/servermon/spec/classes/servermon_app_spec.rb'
-- 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb'
-
 Style/RescueModifier:
   Exclude:
 - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
diff --git a/modules/bacula/spec/classes/bacula_client_spec.rb 
b/modules/bacula/spec/classes/bacula_client_spec.rb
index 2d01eb4..ebec576 100644
--- a/modules/bacula/spec/classes/bacula_client_spec.rb
+++ b/modules/bacula/spec/classes/bacula_client_spec.rb
@@ -23,10 +23,10 @@
 }) \
 .with_content(/Name = "testdirector"/) \
 .with_content(/Password = "testdirectorpass"/) \
-.with_content(/TLS Certificate = "\/etc\/bacula\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = "/etc/bacula/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/ssl/server.key"}) \
 .with_content(/Name = "testhost.example.com-fd"/) \
 .with_content(/FDport = 2000/) \
-.with_content(/PKI Keypair = "\/etc\/bacula\/ssl\/server-keypair.pem"/)
+.with_content(%r{PKI Keypair = "/etc/bacula/ssl/server-keypair.pem"})
 end
 end
diff --git a/modules/bacula/spec/classes/bacula_director_spec.rb 
b/modules/bacula/spec/classes/bacula_director_spec.rb
index da9f398..c62f930 100644
--- a/modules/bacula/spec/classes/bacula_director_spec.rb
+++ b/modules/bacula/spec/classes/bacula_director_spec.rb
@@ -65,8 +65,8 @@
 }) \
 .with_content(/Name = "testhost.example.com"/) \
 .with_content(/Password = "bconsolepass"/) \
-.with_content(/TLS Certificate = 
"\/etc\/bacula\/director\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/director\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = 
"/etc/bacula/director/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/director/ssl/server.key"}) \
 .with_content(/DIRport = 9900/) \
 .with_content(/Maximum Concurrent Jobs = 10/)
 end
diff --git a/modules/bacula/spec/classes/bacula_storage_spec.rb 
b/modules/bacula/spec/classes/bacula_storage_spec.rb
index 32a8320..67c97c1 100644
--- a/modules/bacula/spec/classes/bacula_storage_spec.rb
+++ b/modules/bacula/spec/classes/bacula_storage_spec.rb
@@ -33,8 +33,8 @@
 }) \
 .with_content(/Name = "testdirector"/) \
 .with_content(/Password = "testdirectorpass"/) \
-.with_content(/TLS Certificate = "\/etc\/bacula\/sd\/ssl\/cert.pem"/) \
-.with_content(/TLS Key = "\/etc\/bacula\/sd\/ssl\/server.key"/) \
+.with_content(%r{TLS Certificate = "/etc/bacula/sd/ssl/cert.pem"}) \
+.with_content(%r{TLS Key = "/etc/bacula/sd/ssl/server.key"}) \
 .with_content(/Name = "testhost.example.com-fd"/) \
 .with_content(/SDport = 9000/) \
 .with_content(/Maximum Concurrent Jobs = 10/)
diff --git a/modules/bacula/spec/defines/fileset_spec.rb 
b/modules/bacula/spec/defines/fileset_spec.rb
index 7bea6cd..fe4807e 100644
--- a/modules/bacula/spec/defines/fileset_spec.rb
+++ b/modules/bacula/spec/defines/fileset_spec.rb
@@ -16,8 +16,8 @@
 context 'without excludes' do
 it 'should create valid content for 
/etc/bacula/conf.d/fileset-something.conf' do
 should contain_file('/etc/bacula/conf.d/fileset-something.conf') \
-.with_content(/File = \//) \
-.with_content(/File = \/var/)
+.with_content(%r{File = /}) \
+.with_content(%r{File = /var})