Chef 14 testing (#108)

* Chef 14 testing * Fix cop errors Signed-off-by: Amelia Aronsohn <WagThatTail@Me.com>
dnsimple · Jan 7, 2019 · 993bc54 · 993bc54
1 parent 9259cc0
commit 993bc54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -5,7 +5,7 @@ driver:
 provisioner:
   name: chef_zero
   product_name: chef
-  product_version: 13
+  product_version: 14
   # On CentOS 6, restart the 'postgres' database could fail the first time so
   # let's try twice before failing:
   # https://github.com/sous-chefs/postgresql/issues/421

diff --git a/resources/authoritative_config.rb b/resources/authoritative_config.rb
@@ -42,8 +42,8 @@
 property :run_user_home, String, default: lazy { default_user_attributes[:home] }
 property :run_user_shell, String, default: lazy { default_user_attributes[:shell] }
 property :socket_dir, String, default: '/var/run'
-property :setuid, String, default:  lazy { |resource| resource.run_user } # rubocop:disable Style/SymbolProc
-property :setgid, String, default:  lazy { |resource| resource.run_group } # rubocop:disable Style/SymbolProc
+property :setuid, String, default:  lazy { |resource| resource.run_user }
+property :setgid, String, default:  lazy { |resource| resource.run_group }
 
 property :source, String, default: 'authoritative_service.conf.erb'
 property :cookbook, String, default: 'pdns'

diff --git a/resources/recursor_config.rb b/resources/recursor_config.rb
@@ -41,8 +41,8 @@
 property :run_user, String, default: lazy { default_recursor_run_user }
 property :run_user_home, String, default: lazy { default_user_attributes[:home] }
 property :run_user_shell, String, default: lazy { default_user_attributes[:shell] }
-property :setuid, String, default: lazy { |resource| resource.run_user } # rubocop:disable Style/SymbolProc
-property :setgid, String, default: lazy { |resource| resource.run_group } # rubocop:disable Style/SymbolProc
+property :setuid, String, default: lazy { |resource| resource.run_user }
+property :setgid, String, default: lazy { |resource| resource.run_group }
 
 property :source, String, default: 'recursor_service.conf.erb'
 property :cookbook, String, default: 'pdns'