Merge pull request #320 from RandomNoun7/tickets/MODULES-9912-fix-tem…

…plate-frozen-string-error (MODULES-9912) ERB Template Errors
puppetlabs · Sep 17, 2019 · bad8ab5 · bad8ab5
2 parents 669132d + 0f52ec7
commit bad8ab5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/manifests/role/permissions.pp b/manifests/role/permissions.pp
@@ -45,7 +45,6 @@
     sqlserver_validate_instance_name($instance)
     $_state = upcase($state)
 
-    $_upermissions = upcase($permissions)
     $_grant_option = $with_grant_option ? {
       true => '-WITH_GRANT_OPTION',
       false => '',

diff --git a/templates/create/login/permission.sql.erb b/templates/create/login/permission.sql.erb
@@ -1,7 +1,7 @@
 USE [master];
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
-<% @permissions.each do |permission|
-    permission.upcase!
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
 %>
 SET @permission = '<%= permission %>'
 BEGIN

diff --git a/templates/create/role/permissions.sql.erb b/templates/create/role/permissions.sql.erb
@@ -1,15 +1,15 @@
 USE [<%= @database %>];
 <%= scope.function_template(['sqlserver/snippets/role/declare_and_set_variables.sql.erb']) -%>
 
- <%- @_upermissions.each do |permission|
-  permission.upcase!
- -%>
- SET @permission = '<%= permission %>';
- <% if @with_grant_option == false %>
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
+%>
+SET @permission = '<%= permission %>';
+<% if @with_grant_option == false %>
     IF 'GRANT_WITH_GRANT_OPTION' = <%= scope.function_template(['sqlserver/snippets/principal/permission/get_perm_state.sql.erb']) -%>
     BEGIN
         REVOKE GRANT OPTION FOR <%= permission %> TO [<%= @role %>] CASCADE;
     END
     <% end -%>
     <%= @_state %> <%= permission %> TO [<%= @role %>]<% if @with_grant_option == true %> WITH GRANT OPTION<% end %>;
- <% end %>
+<% end %>
diff --git a/templates/create/user/permission.sql.erb b/templates/create/user/permission.sql.erb
@@ -1,8 +1,8 @@
- USE [<%= @database %>];
- DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
- <% @permissions.each do |permission|
-  permission.upcase!
- %>
+USE [<%= @database %>];
+DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
+%>
 SET @permission = '<%= permission %>'
 BEGIN
     <% if @with_grant_option == false %>

diff --git a/templates/query/login/permission_exists.sql.erb b/templates/query/login/permission_exists.sql.erb
@@ -1,8 +1,8 @@
 USE [master];
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
- <% @permissions.each do |permission|
-  permission.upcase!
- %>
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
+%>
 SET @permission = '<%= permission %>'
 <%= scope.function_template(['sqlserver/snippets/login/permission/exists.sql.erb']) %>
 <% end %>
diff --git a/templates/query/role/permission_exists.sql.erb b/templates/query/role/permission_exists.sql.erb
@@ -1,8 +1,9 @@
 USE [<%= @database %>];
 <%= scope.function_template(['sqlserver/snippets/role/declare_and_set_variables.sql.erb']) -%>
 
-<% @permissions.each do |permission|
-    permission.upcase! -%>
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
+%>
 SET @permission = '<%= permission %>';
 <%= scope.function_template(['sqlserver/snippets/principal/permission/exists.sql.erb']) -%>
 <% end -%>
diff --git a/templates/query/user/permission_exists.sql.erb b/templates/query/user/permission_exists.sql.erb
@@ -1,8 +1,9 @@
 USE [<%= @database %>];
 
 DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
-<% @permissions.each do |permission|
-permission.upcase! %>
+<% @permissions.each do |requested_permission|
+    permission = requested_permission.upcase
+%>
 SET @permission = '<%= permission %>'
 <%= scope.function_template(['sqlserver/snippets/user/permission/exists.sql.erb']) %>
 <% end %>