fix: Make WSREP SST user's privilege customizable

Jonathan Sabbe · Jonathan Sabbe · commit 86fe8e15f3fc · 2022-08-31T15:29:23.000+02:00
diff --git a/manifests/cluster.pp b/manifests/cluster.pp
@@ -68,6 +68,7 @@
   $wsrep_sst_password           = $mariadb::params::wsrep_sst_password,
   $wsrep_sst_user_tls_options   = undef,
   $wsrep_sst_user_grant_options = undef,
+  Array[String] $wresp_sst_user_privileges = $mariadb::params::wresp_sst_user_privileges,
   Enum['mariabackup', 'mysqldump', 'rsync', 'rsync_wan', 'xtrabackup', 'xtrabackup-v2'] $wsrep_sst_method = $mariadb::params::wsrep_sst_method, # lint:ignore:140chars
   $root_password                = $mariadb::params::root_password,
   $override_options             = {},
diff --git a/manifests/cluster/auth.pp b/manifests/cluster/auth.pp
@@ -13,6 +13,7 @@
       wsrep_sst_password           => $mariadb::cluster::wsrep_sst_password,
       wsrep_sst_user_tls_options   => $mariadb::cluster::wsrep_sst_user_tls_options,
       wsrep_sst_user_grant_options => $mariadb::cluster::wsrep_sst_user_grant_options,
+      wresp_sst_user_privileges    => $mariadb::cluster::wresp_sst_user_privileges,
     }
   }
 }
diff --git a/manifests/cluster/wsrep_sst_user.pp b/manifests/cluster/wsrep_sst_user.pp
@@ -5,9 +5,10 @@
 
 define mariadb::cluster::wsrep_sst_user (
   $wsrep_sst_password,
-  $wsrep_sst_user               = $name,
-  $wsrep_sst_user_tls_options   = undef,
-  $wsrep_sst_user_grant_options = undef,
+  $wsrep_sst_user                          = $name,
+  $wsrep_sst_user_tls_options              = undef,
+  $wsrep_sst_user_grant_options            = undef,
+  Array[String] $wresp_sst_user_privileges = ['ALL'],
 ) {
 
   mysql_user { $wsrep_sst_user:
@@ -21,7 +22,7 @@
     ensure     => present,
     user       => $wsrep_sst_user,
     table      => '*.*',
-    privileges => ['ALL'],
+    privileges => $wresp_sst_user_privileges,
     options    => $wsrep_sst_user_grant_options,
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -20,15 +20,16 @@
   }
 
   # wsrep patch config
-  $wsrep_cluster_address = undef
-  $wsrep_cluster_peers   = undef
-  $wsrep_cluster_port    = '4567'
-  $wsrep_cluster_name    = undef
-  $wsrep_sst_user        = 'wsrep_sst'
-  $wsrep_sst_user_peers  = '%'
-  $wsrep_sst_password    = 'UNSET' # lint:ignore:security_password_in_code
-  $wsrep_sst_method      = 'mysqldump'
-  $root_password         = 'UNSET' # lint:ignore:security_password_in_code
+  $wsrep_cluster_address     = undef
+  $wsrep_cluster_peers       = undef
+  $wsrep_cluster_port        = '4567'
+  $wsrep_cluster_name        = undef
+  $wsrep_sst_user            = 'wsrep_sst'
+  $wsrep_sst_user_peers      = '%'
+  $wsrep_sst_password        = 'UNSET' # lint:ignore:security_password_in_code
+  $wresp_sst_user_privileges = ['ALL']
+  $wsrep_sst_method          = 'mysqldump'
+  $root_password             = 'UNSET' # lint:ignore:security_password_in_code
 
   if ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemrelease, '6.0') >= 0) {
     # client.pp
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "edestecd-mariadb",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "author": "Chris Edester",
   "summary": "Puppet Module for managing MariaDB",
   "license": "GPL-3.0+",

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`wsrep_sst_password => $mariadb::cluster::wsrep_sst_password,`
`14`	`14`	`wsrep_sst_user_tls_options => $mariadb::cluster::wsrep_sst_user_tls_options,`
`15`	`15`	`wsrep_sst_user_grant_options => $mariadb::cluster::wsrep_sst_user_grant_options,`
	`16`	`+ wresp_sst_user_privileges => $mariadb::cluster::wresp_sst_user_privileges,`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "edestecd-mariadb",`
`3`		`- "version": "2.1.2",`
	`3`	`+ "version": "2.1.3",`
`4`	`4`	`"author": "Chris Edester",`
`5`	`5`	`"summary": "Puppet Module for managing MariaDB",`
`6`	`6`	`"license": "GPL-3.0+",`