Merge pull request #109 from cyberious/Lint

(maint) Lint and strict variables

Author: ferventcoder

manifests/login/permissions.pp

@@ -40,10 +40,11 @@
   validate_re($_state,'^(GRANT|REVOKE|DENY)$', "State parameter can only be one of 'GRANT', 'REVOKE' or 'DENY', you passed a value of ${state}")
 
   validate_bool($with_grant_option)
-  if $with_grant_option {
-    $grant_option = "-WITH_GRANT_OPTION"
+  $_grant_option =  $with_grant_option ? {
+    true => '-WITH_GRANT_OPTION',
+    default => ''
   }
-  sqlserver_tsql{ "login-permission-${instance}-${login}-${_state}${grant_option}":
+  sqlserver_tsql{ "login-permission-${instance}-${login}-${_state}${_grant_option}":
     instance => $instance,
     command  => template('sqlserver/create/login/permission.sql.erb'),
     onlyif   => template('sqlserver/query/login/permission_exists.sql.erb'),

manifests/user/permissions.pp

@@ -53,13 +53,14 @@
 
   sqlserver_validate_range($user, 1, 128, 'User must be between 1 and 128 characters')
 
-  if $with_grant_option {
-    $grant_option = "-WITH_GRANT_OPTION"
+  $_grant_option =  $with_grant_option ? {
+    true => '-WITH_GRANT_OPTION',
+    default => ''
   }
   sqlserver_tsql{
-    "user-permissions-${instance}-${database}-${user}-${_state}${grant_option}":
+    "user-permissions-${instance}-${database}-${user}-${_state}${_grant_option}":
       instance => $instance,
-      command  => template("sqlserver/create/user/permission.sql.erb"),
+      command  => template('sqlserver/create/user/permission.sql.erb'),
       onlyif   => template('sqlserver/query/user/permission_exists.sql.erb'),
       require  => Sqlserver::Config[$instance],
   }