Skip to content

Commit 15b683c

Browse files
committed
revert indent and fix linting
1 parent e4ab1d3 commit 15b683c

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

lib/puppet/provider/mysql_user/mysql.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ def password_hash=(string)
172172
%r{^\*|^$}.match?(string) || %r{0x[A-F0-9]+$}.match?(string)
173173

174174
sql = "ALTER USER #{merged_name} IDENTIFIED WITH"
175-
if plugin == 'caching_sha2_password'
176-
sql << " 'caching_sha2_password' AS X'#{string[2..-1]}'"
175+
sql << if plugin == 'caching_sha2_password'
176+
" 'caching_sha2_password' AS X'#{string[2..-1]}'"
177177
else
178-
sql << " 'mysql_native_password' AS '#{string}'"
178+
" 'mysql_native_password' AS '#{string}'"
179179
end
180180
self.class.mysql_caller(sql, 'system')
181181
else

manifests/db.pp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@
5050
# Specify the path in which mysql has been installed if done in the non-standard bin/sbin path.
5151
#
5252
define mysql::db (
53-
String[1] $user,
54-
Variant[String, Sensitive[String]] $password,
55-
String[1] $plugin = 'mysql_native_password',
56-
Optional[Array[String[1]]] $tls_options = undef,
57-
String $dbname = $name,
58-
String[1] $charset = 'utf8',
59-
String[1] $collate = 'utf8_general_ci',
60-
String[1] $host = 'localhost',
61-
Variant[String[1], Array[String[1]]] $grant = 'ALL',
62-
Optional[Variant[String[1], Array[String[1]]]] $grant_options = undef,
63-
Optional[Array] $sql = undef,
64-
Boolean $enforce_sql = false,
65-
Enum['absent', 'present'] $ensure = 'present',
66-
Integer $import_timeout = 300,
67-
Enum['cat', 'zcat', 'bzcat'] $import_cat_cmd = 'cat',
68-
Optional[String] $mysql_exec_path = undef,
53+
String[1] $user,
54+
Variant[String, Sensitive[String]] $password,
55+
String[1] $plugin = 'mysql_native_password',
56+
Optional[Array[String[1]]] $tls_options = undef,
57+
String $dbname = $name,
58+
String[1] $charset = 'utf8',
59+
String[1] $collate = 'utf8_general_ci',
60+
String[1] $host = 'localhost',
61+
Variant[String[1], Array[String[1]]] $grant = 'ALL',
62+
Optional[Variant[String[1], Array[String[1]]]] $grant_options = undef,
63+
Optional[Array] $sql = undef,
64+
Boolean $enforce_sql = false,
65+
Enum['absent', 'present'] $ensure = 'present',
66+
Integer $import_timeout = 300,
67+
Enum['cat', 'zcat', 'bzcat'] $import_cat_cmd = 'cat',
68+
Optional[String] $mysql_exec_path = undef,
6969
) {
7070
include 'mysql::client'
7171

0 commit comments

Comments
 (0)