Skip to content

Commit cea4d21

Browse files
shreddedbaconshreddedbacon
authored
fix: add slashes to backup commands (#463)
1 parent 1824ba3 commit cea4d21

File tree

7 files changed

+161
-161
lines changed

7 files changed

+161
-161
lines changed

‎internal/templating/template_prebackuppod.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -330,36 +330,36 @@ func RemoveCreationTimestamp(a []byte) ([]byte, error) {
330330
return yaml.Marshal(tmpMap)
331331
}
332332

333-
var mariadbBackupCommand = `/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
334-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
335-
fi &&
336-
dump=$(mktemp)
337-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
338-
--add-locks --no-autocommit --single-transaction --no-create-db
339-
--no-data --no-tablespaces
340-
-h $BACKUP_DB_HOST
341-
-u $BACKUP_DB_USERNAME
342-
-p$BACKUP_DB_PASSWORD
343-
$BACKUP_DB_DATABASE
344-
> $dump
345-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
346-
--add-locks --no-autocommit --single-transaction --no-create-db
347-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
348-
--no-create-info --no-tablespaces --skip-triggers
349-
-h $BACKUP_DB_HOST
350-
-u $BACKUP_DB_USERNAME
351-
-p$BACKUP_DB_PASSWORD
352-
$BACKUP_DB_DATABASE
353-
>> $dump
333+
var mariadbBackupCommand = `/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
334+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
335+
fi && \
336+
dump=$(mktemp) \
337+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
338+
--add-locks --no-autocommit --single-transaction --no-create-db \
339+
--no-data --no-tablespaces \
340+
-h $BACKUP_DB_HOST \
341+
-u $BACKUP_DB_USERNAME \
342+
-p$BACKUP_DB_PASSWORD \
343+
$BACKUP_DB_DATABASE \
344+
> $dump \
345+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
346+
--add-locks --no-autocommit --single-transaction --no-create-db \
347+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
348+
--no-create-info --no-tablespaces --skip-triggers \
349+
-h $BACKUP_DB_HOST \
350+
-u $BACKUP_DB_USERNAME \
351+
-p$BACKUP_DB_PASSWORD \
352+
$BACKUP_DB_DATABASE \
353+
>> $dump \
354354
&& cat $dump && rm $dump"`
355355

356-
var postgresBackupCommand = `/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
357-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
358-
fi && PGPASSWORD=$BACKUP_DB_PASSWORD pg_dump
359-
--host=$BACKUP_DB_HOST
360-
--port=$BACKUP_DB_PORT
361-
--dbname=$BACKUP_DB_DATABASE
362-
--username=$BACKUP_DB_USERNAME
356+
var postgresBackupCommand = `/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
357+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
358+
fi && PGPASSWORD=$BACKUP_DB_PASSWORD pg_dump \
359+
--host=$BACKUP_DB_HOST \
360+
--port=$BACKUP_DB_PORT \
361+
--dbname=$BACKUP_DB_DATABASE \
362+
--username=$BACKUP_DB_USERNAME \
363363
--format=t -w"`
364364

365365
var mongoBackupCommand = `/bin/sh -c "dump=$(mktemp) && mongodump \

‎internal/templating/test-resources/backups/result-prebackuppod1.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ metadata:
2020
name: mariadb-database-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi &&
26-
dump=$(mktemp)
27-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
28-
--add-locks --no-autocommit --single-transaction --no-create-db
29-
--no-data --no-tablespaces
30-
-h $BACKUP_DB_HOST
31-
-u $BACKUP_DB_USERNAME
32-
-p$BACKUP_DB_PASSWORD
33-
$BACKUP_DB_DATABASE
34-
> $dump
35-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
36-
--add-locks --no-autocommit --single-transaction --no-create-db
37-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
38-
--no-create-info --no-tablespaces --skip-triggers
39-
-h $BACKUP_DB_HOST
40-
-u $BACKUP_DB_USERNAME
41-
-p$BACKUP_DB_PASSWORD
42-
$BACKUP_DB_DATABASE
43-
>> $dump
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && \
26+
dump=$(mktemp) \
27+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
28+
--add-locks --no-autocommit --single-transaction --no-create-db \
29+
--no-data --no-tablespaces \
30+
-h $BACKUP_DB_HOST \
31+
-u $BACKUP_DB_USERNAME \
32+
-p$BACKUP_DB_PASSWORD \
33+
$BACKUP_DB_DATABASE \
34+
> $dump \
35+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
36+
--add-locks --no-autocommit --single-transaction --no-create-db \
37+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
38+
--no-create-info --no-tablespaces --skip-triggers \
39+
-h $BACKUP_DB_HOST \
40+
-u $BACKUP_DB_USERNAME \
41+
-p$BACKUP_DB_PASSWORD \
42+
$BACKUP_DB_DATABASE \
43+
>> $dump \
4444
&& cat $dump && rm $dump"
4545
fileExtension: .mariadb-database.sql
4646
pod:

‎internal/templating/test-resources/backups/result-prebackuppod2.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ metadata:
2020
name: postgres-database-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi && PGPASSWORD=$BACKUP_DB_PASSWORD pg_dump
26-
--host=$BACKUP_DB_HOST
27-
--port=$BACKUP_DB_PORT
28-
--dbname=$BACKUP_DB_DATABASE
29-
--username=$BACKUP_DB_USERNAME
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && PGPASSWORD=$BACKUP_DB_PASSWORD pg_dump \
26+
--host=$BACKUP_DB_HOST \
27+
--port=$BACKUP_DB_PORT \
28+
--dbname=$BACKUP_DB_DATABASE \
29+
--username=$BACKUP_DB_USERNAME \
3030
--format=t -w"
3131
fileExtension: .postgres-database.tar
3232
pod:

‎internal/templating/test-resources/backups/result-prebackuppod4.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ metadata:
2020
name: mariadb-database-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi &&
26-
dump=$(mktemp)
27-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
28-
--add-locks --no-autocommit --single-transaction --no-create-db
29-
--no-data --no-tablespaces
30-
-h $BACKUP_DB_HOST
31-
-u $BACKUP_DB_USERNAME
32-
-p$BACKUP_DB_PASSWORD
33-
$BACKUP_DB_DATABASE
34-
> $dump
35-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
36-
--add-locks --no-autocommit --single-transaction --no-create-db
37-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
38-
--no-create-info --no-tablespaces --skip-triggers
39-
-h $BACKUP_DB_HOST
40-
-u $BACKUP_DB_USERNAME
41-
-p$BACKUP_DB_PASSWORD
42-
$BACKUP_DB_DATABASE
43-
>> $dump
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && \
26+
dump=$(mktemp) \
27+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
28+
--add-locks --no-autocommit --single-transaction --no-create-db \
29+
--no-data --no-tablespaces \
30+
-h $BACKUP_DB_HOST \
31+
-u $BACKUP_DB_USERNAME \
32+
-p$BACKUP_DB_PASSWORD \
33+
$BACKUP_DB_DATABASE \
34+
> $dump \
35+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
36+
--add-locks --no-autocommit --single-transaction --no-create-db \
37+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
38+
--no-create-info --no-tablespaces --skip-triggers \
39+
-h $BACKUP_DB_HOST \
40+
-u $BACKUP_DB_USERNAME \
41+
-p$BACKUP_DB_PASSWORD \
42+
$BACKUP_DB_DATABASE \
43+
>> $dump \
4444
&& cat $dump && rm $dump"
4545
fileExtension: .mariadb-database.sql
4646
pod:

‎internal/templating/test-resources/backups/result-prebackuppod5.yaml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ metadata:
2020
name: mariadb-database-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi &&
26-
dump=$(mktemp)
27-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
28-
--add-locks --no-autocommit --single-transaction --no-create-db
29-
--no-data --no-tablespaces
30-
-h $BACKUP_DB_HOST
31-
-u $BACKUP_DB_USERNAME
32-
-p$BACKUP_DB_PASSWORD
33-
$BACKUP_DB_DATABASE
34-
> $dump
35-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
36-
--add-locks --no-autocommit --single-transaction --no-create-db
37-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
38-
--no-create-info --no-tablespaces --skip-triggers
39-
-h $BACKUP_DB_HOST
40-
-u $BACKUP_DB_USERNAME
41-
-p$BACKUP_DB_PASSWORD
42-
$BACKUP_DB_DATABASE
43-
>> $dump
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && \
26+
dump=$(mktemp) \
27+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
28+
--add-locks --no-autocommit --single-transaction --no-create-db \
29+
--no-data --no-tablespaces \
30+
-h $BACKUP_DB_HOST \
31+
-u $BACKUP_DB_USERNAME \
32+
-p$BACKUP_DB_PASSWORD \
33+
$BACKUP_DB_DATABASE \
34+
> $dump \
35+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
36+
--add-locks --no-autocommit --single-transaction --no-create-db \
37+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
38+
--no-create-info --no-tablespaces --skip-triggers \
39+
-h $BACKUP_DB_HOST \
40+
-u $BACKUP_DB_USERNAME \
41+
-p$BACKUP_DB_PASSWORD \
42+
$BACKUP_DB_DATABASE \
43+
>> $dump \
4444
&& cat $dump && rm $dump"
4545
fileExtension: .mariadb-database.sql
4646
pod:
@@ -102,27 +102,27 @@ metadata:
102102
name: mariadb-prebackuppod
103103
spec:
104104
backupCommand: |-
105-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
106-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
107-
fi &&
108-
dump=$(mktemp)
109-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
110-
--add-locks --no-autocommit --single-transaction --no-create-db
111-
--no-data --no-tablespaces
112-
-h $BACKUP_DB_HOST
113-
-u $BACKUP_DB_USERNAME
114-
-p$BACKUP_DB_PASSWORD
115-
$BACKUP_DB_DATABASE
116-
> $dump
117-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
118-
--add-locks --no-autocommit --single-transaction --no-create-db
119-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
120-
--no-create-info --no-tablespaces --skip-triggers
121-
-h $BACKUP_DB_HOST
122-
-u $BACKUP_DB_USERNAME
123-
-p$BACKUP_DB_PASSWORD
124-
$BACKUP_DB_DATABASE
125-
>> $dump
105+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
106+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
107+
fi && \
108+
dump=$(mktemp) \
109+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
110+
--add-locks --no-autocommit --single-transaction --no-create-db \
111+
--no-data --no-tablespaces \
112+
-h $BACKUP_DB_HOST \
113+
-u $BACKUP_DB_USERNAME \
114+
-p$BACKUP_DB_PASSWORD \
115+
$BACKUP_DB_DATABASE \
116+
> $dump \
117+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
118+
--add-locks --no-autocommit --single-transaction --no-create-db \
119+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
120+
--no-create-info --no-tablespaces --skip-triggers \
121+
-h $BACKUP_DB_HOST \
122+
-u $BACKUP_DB_USERNAME \
123+
-p$BACKUP_DB_PASSWORD \
124+
$BACKUP_DB_DATABASE \
125+
>> $dump \
126126
&& cat $dump && rm $dump"
127127
fileExtension: .mariadb.sql
128128
pod:

‎internal/testdata/complex/backup-templates/backup-1/prebackuppods.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ metadata:
2020
name: mariadb-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi &&
26-
dump=$(mktemp)
27-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
28-
--add-locks --no-autocommit --single-transaction --no-create-db
29-
--no-data --no-tablespaces
30-
-h $BACKUP_DB_HOST
31-
-u $BACKUP_DB_USERNAME
32-
-p$BACKUP_DB_PASSWORD
33-
$BACKUP_DB_DATABASE
34-
> $dump
35-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
36-
--add-locks --no-autocommit --single-transaction --no-create-db
37-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
38-
--no-create-info --no-tablespaces --skip-triggers
39-
-h $BACKUP_DB_HOST
40-
-u $BACKUP_DB_USERNAME
41-
-p$BACKUP_DB_PASSWORD
42-
$BACKUP_DB_DATABASE
43-
>> $dump
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && \
26+
dump=$(mktemp) \
27+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
28+
--add-locks --no-autocommit --single-transaction --no-create-db \
29+
--no-data --no-tablespaces \
30+
-h $BACKUP_DB_HOST \
31+
-u $BACKUP_DB_USERNAME \
32+
-p$BACKUP_DB_PASSWORD \
33+
$BACKUP_DB_DATABASE \
34+
> $dump \
35+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
36+
--add-locks --no-autocommit --single-transaction --no-create-db \
37+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
38+
--no-create-info --no-tablespaces --skip-triggers \
39+
-h $BACKUP_DB_HOST \
40+
-u $BACKUP_DB_USERNAME \
41+
-p$BACKUP_DB_PASSWORD \
42+
$BACKUP_DB_DATABASE \
43+
>> $dump \
4444
&& cat $dump && rm $dump"
4545
fileExtension: .mariadb.sql
4646
pod:

‎internal/testdata/complex/backup-templates/backup-2/prebackuppods.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ metadata:
2020
name: mariadb-prebackuppod
2121
spec:
2222
backupCommand: |-
23-
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then
24-
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1);
25-
fi &&
26-
dump=$(mktemp)
27-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
28-
--add-locks --no-autocommit --single-transaction --no-create-db
29-
--no-data --no-tablespaces
30-
-h $BACKUP_DB_HOST
31-
-u $BACKUP_DB_USERNAME
32-
-p$BACKUP_DB_PASSWORD
33-
$BACKUP_DB_DATABASE
34-
> $dump
35-
&& mysqldump --max-allowed-packet=1G --events --routines --quick
36-
--add-locks --no-autocommit --single-transaction --no-create-db
37-
--ignore-table=$BACKUP_DB_DATABASE.watchdog
38-
--no-create-info --no-tablespaces --skip-triggers
39-
-h $BACKUP_DB_HOST
40-
-u $BACKUP_DB_USERNAME
41-
-p$BACKUP_DB_PASSWORD
42-
$BACKUP_DB_DATABASE
43-
>> $dump
23+
/bin/sh -c "if [ ! -z $BACKUP_DB_READREPLICA_HOSTS ]; then \
24+
BACKUP_DB_HOST=$(echo $BACKUP_DB_READREPLICA_HOSTS | cut -d ',' -f1); \
25+
fi && \
26+
dump=$(mktemp) \
27+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
28+
--add-locks --no-autocommit --single-transaction --no-create-db \
29+
--no-data --no-tablespaces \
30+
-h $BACKUP_DB_HOST \
31+
-u $BACKUP_DB_USERNAME \
32+
-p$BACKUP_DB_PASSWORD \
33+
$BACKUP_DB_DATABASE \
34+
> $dump \
35+
&& mysqldump --max-allowed-packet=1G --events --routines --quick \
36+
--add-locks --no-autocommit --single-transaction --no-create-db \
37+
--ignore-table=$BACKUP_DB_DATABASE.watchdog \
38+
--no-create-info --no-tablespaces --skip-triggers \
39+
-h $BACKUP_DB_HOST \
40+
-u $BACKUP_DB_USERNAME \
41+
-p$BACKUP_DB_PASSWORD \
42+
$BACKUP_DB_DATABASE \
43+
>> $dump \
4444
&& cat $dump && rm $dump"
4545
fileExtension: .mariadb.sql
4646
pod:

0 commit comments

Comments
 (0)