xtrabackup: handle missing facts gracefully

fraenki · fraenki · commit bd606f90a2c0 · 2024-05-08T15:55:22.000+02:00
diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp
@@ -50,7 +50,7 @@
       require       => Class['mysql::server::root_password'],
     }
     # Percona XtraBackup needs additional grants/privileges to work with MySQL 8
-    if versioncmp($facts['mysql_version'], '8') >= 0 and !(/(?i:mariadb)/ in $facts['mysqld_version']) {
+    if ('mysql_version' in $facts) and ('mysqld_version' in $facts) and versioncmp($facts['mysql_version'], '8') >= 0 and !(/(?i:mariadb)/ in $facts['mysqld_version']) {
       if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0) or
       ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') >= 0) {
         mysql_grant { "${backupuser}@localhost/*.*":

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`require => Class['mysql::server::root_password'],`
`51`	`51`	`}`
`52`	`52`	`# Percona XtraBackup needs additional grants/privileges to work with MySQL 8`
`53`		`- if versioncmp($facts['mysql_version'], '8') >= 0 and !(/(?i:mariadb)/ in $facts['mysqld_version']) {`
	`53`	`+ if ('mysql_version' in $facts) and ('mysqld_version' in $facts) and versioncmp($facts['mysql_version'], '8') >= 0 and !(/(?i:mariadb)/ in $facts['mysqld_version']) {`
`54`	`54`	`if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0) or`
`55`	`55`	`($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') >= 0) {`
`56`	`56`	`mysql_grant { "${backupuser}@localhost/.":`