-
Notifications
You must be signed in to change notification settings - Fork 43
K8SPS-763: ensure --defaults-file is first flag
#1468
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
pooknull
wants to merge
11
commits into
main
Choose a base branch
from
K8SPS-763
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
4e31028
K8SPS-763: ensure `--defaults-file` is first flag
pooknull 031511c
fix unit-tests
pooknull 05299fd
Merge remote-tracking branch 'origin/main' into K8SPS-763
pooknull 7576d42
fix formatting
pooknull 2910548
Merge branch 'main' into K8SPS-763
hors cfcb512
address copilot comments
pooknull afe2bd3
add unit-test
pooknull 987f517
improve comment
pooknull a841dfc
address georges comments
pooknull ad68dc0
Merge branch 'main' into K8SPS-763
pooknull 8e6ad52
Merge branch 'main' into K8SPS-763
pooknull File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| package backup | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| apiv1 "github.com/percona/percona-server-mysql-operator/api/v1" | ||
| xb "github.com/percona/percona-server-mysql-operator/pkg/xtrabackup" | ||
| ) | ||
|
|
||
| func TestXtrabackupArgs(t *testing.T) { | ||
| defaultArgs := []string{ | ||
| "--backup", | ||
| "--stream=xbstream", | ||
| "--safe-slave-backup", | ||
| "--slave-info", | ||
| "--target-dir=/backup/", | ||
| "--databases-exclude=lost+found", | ||
| "--user=backup-user", | ||
| "--password=backup-password", | ||
| } | ||
|
|
||
| tests := map[string]struct { | ||
| conf *xb.BackupConfig | ||
| want []string | ||
| }{ | ||
| "nil config": { | ||
| want: defaultArgs, | ||
| }, | ||
| "empty config": { | ||
| conf: &xb.BackupConfig{}, | ||
| want: defaultArgs, | ||
| }, | ||
| "empty container options": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{}, | ||
| }, | ||
| want: defaultArgs, | ||
| }, | ||
| "custom arguments": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--compress", "--parallel=2"}}, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--compress", "--parallel=2"), | ||
| }, | ||
| "defaults file with equals is first": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{ | ||
| Xtrabackup: []string{"--defaults-file=/etc/my.cnf", "--compress", "--parallel=2"}, | ||
| }, | ||
| }, | ||
| }, | ||
| want: append( | ||
| []string{"--defaults-file=/etc/my.cnf"}, | ||
| append(defaultArgs, "--compress", "--parallel=2")..., | ||
| ), | ||
| }, | ||
| "defaults file with separate value is not promoted": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{ | ||
| Xtrabackup: []string{"--defaults-file", "/etc/my.cnf", "--compress", "--parallel=2"}, | ||
| }, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--defaults-file", "/etc/my.cnf", "--compress", "--parallel=2"), | ||
| }, | ||
| "defaults file without value is not promoted": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--defaults-file"}}, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--defaults-file"), | ||
| }, | ||
| "defaults file followed by flag is not promoted": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--defaults-file", "--compress"}}, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--defaults-file", "--compress"), | ||
| }, | ||
| "defaults file with empty equals value is not promoted": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--defaults-file="}}, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--defaults-file="), | ||
| }, | ||
| "defaults file with separate empty value is not promoted": { | ||
| conf: &xb.BackupConfig{ | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--defaults-file", ""}}, | ||
| }, | ||
| }, | ||
| want: append(defaultArgs, "--defaults-file", ""), | ||
| }, | ||
| "encryption uses default algorithm": { | ||
| conf: &xb.BackupConfig{ | ||
| EncryptionKeyFile: "/etc/mysql/encryption-key", | ||
| }, | ||
| want: append( | ||
| defaultArgs, | ||
| "--encrypt-key-file=/etc/mysql/encryption-key", | ||
| "--encrypt=AES256", | ||
| ), | ||
| }, | ||
| "custom encryption algorithm overrides default": { | ||
| conf: &xb.BackupConfig{ | ||
| EncryptionKeyFile: "/etc/mysql/encryption-key", | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{Xtrabackup: []string{"--encrypt=AES192"}}, | ||
| }, | ||
| }, | ||
| want: append( | ||
| defaultArgs, | ||
| "--encrypt-key-file=/etc/mysql/encryption-key", | ||
| "--encrypt=AES192", | ||
| ), | ||
| }, | ||
| "incremental backup": { | ||
| conf: &xb.BackupConfig{ | ||
| IncrementalLsn: "123:456", | ||
| }, | ||
| want: append(defaultArgs, "--incremental-lsn=123:456"), | ||
| }, | ||
| "all optional arguments preserve required ordering": { | ||
| conf: &xb.BackupConfig{ | ||
| EncryptionKeyFile: "/etc/mysql/encryption-key", | ||
| ContainerOptions: &apiv1.BackupContainerOptions{ | ||
| Args: apiv1.BackupContainerArgs{ | ||
| Xtrabackup: []string{"--defaults-file=/etc/my.cnf", "--encrypt=AES192", "--parallel=2"}, | ||
| }, | ||
| }, | ||
| IncrementalLsn: "123:456", | ||
| }, | ||
| want: append( | ||
| []string{"--defaults-file=/etc/my.cnf"}, | ||
| append( | ||
| defaultArgs, | ||
| "--encrypt-key-file=/etc/mysql/encryption-key", | ||
| "--encrypt=AES192", | ||
| "--parallel=2", | ||
| "--incremental-lsn=123:456", | ||
| )..., | ||
| ), | ||
| }, | ||
| } | ||
|
|
||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| assert.Equal(t, test.want, xtrabackupArgs("backup-user", "backup-password", test.conf)) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're re-ordering it anyway, do we need a CRD validation? Can we also do the same for restore?