From 914407bb2f581c00999e13f7d406a3af384afbde Mon Sep 17 00:00:00 2001 From: Jethro van Ginkel Date: Wed, 21 Dec 2022 00:10:09 +0100 Subject: [PATCH 1/2] xtrabackup.sh only touch when backup_success_file_path is set --- spec/classes/mysql_backup_xtrabackup_spec.rb | 17 +++++++++++++++++ templates/xtrabackup.sh.erb | 2 ++ 2 files changed, 19 insertions(+) diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb index 64dfe1e76..35d2397d5 100644 --- a/spec/classes/mysql_backup_xtrabackup_spec.rb +++ b/spec/classes/mysql_backup_xtrabackup_spec.rb @@ -24,6 +24,11 @@ class { 'mysql::server': } let(:params) do default_params end + it 'does not contain the touch /tmp/backup_success command' do + is_expected.to contain_file('xtrabackup.sh').without_content( + %r{(^\s+touch\s+$)}, + ) + end it 'contains the wrapper script' do is_expected.to contain_file('xtrabackup.sh').with_content( @@ -304,6 +309,18 @@ class { 'mysql::server': } ) end end + + context 'with backup_success_file_path' do + let(:params) do + { backup_success_file_path: '/tmp/backup_success' }.merge(default_params) + end + + it 'contain the touch /tmp/backup_success command' do + is_expected.to contain_file('xtrabackup.sh').with_content( + %r{(^\s+touch /tmp/backup_success$)}, + ) + end + end end end # rubocop:enable RSpec/NestedGroups diff --git a/templates/xtrabackup.sh.erb b/templates/xtrabackup.sh.erb index 19b6ad753..11093b077 100644 --- a/templates/xtrabackup.sh.erb +++ b/templates/xtrabackup.sh.erb @@ -59,7 +59,9 @@ cleanup <% unless @delete_before_dump -%> if [ $? -eq 0 ] ; then cleanup + <% if @backup_success_file_path -%> touch <%= @backup_success_file_path %> + <% end -%> fi <% end -%> From cf4628b7c47297d643cf0a96a821123120ae46f0 Mon Sep 17 00:00:00 2001 From: Jethro van Ginkel Date: Wed, 21 Dec 2022 00:18:02 +0100 Subject: [PATCH 2/2] RuboCop EmptyLineAfterFinalLet --- spec/classes/mysql_backup_xtrabackup_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb index 35d2397d5..914687523 100644 --- a/spec/classes/mysql_backup_xtrabackup_spec.rb +++ b/spec/classes/mysql_backup_xtrabackup_spec.rb @@ -24,7 +24,8 @@ class { 'mysql::server': } let(:params) do default_params end - it 'does not contain the touch /tmp/backup_success command' do + + it 'does not contain the touch command' do is_expected.to contain_file('xtrabackup.sh').without_content( %r{(^\s+touch\s+$)}, )