try additional-args ssl

mittwald · Feb 12, 2025 · 2d1e404 · 2d1e404
1 parent a516f67
commit 2d1e404
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/pkg/source/mysqldump/cli.go b/pkg/source/mysqldump/cli.go
@@ -48,7 +48,6 @@ type Flags struct {
 	SslCrl                     string   `flag:"--ssl-crl="`
 	SslCrlPath                 string   `flag:"--ssl-crlpath="`
 	SslKey                     string   `flag:"--ssl-key="`
-	Ssl                        *int     `flag:"--ssl="`
 	Tab                        string   `flag:"--tab="`
 	TLSCipherSuites            string   `flag:"--tls-ciphersuites="`
 	TLSVersion                 string   `flag:"--tls-version="`

diff --git a/pkg/source/mysqlrestore/cli.go b/pkg/source/mysqlrestore/cli.go
@@ -38,7 +38,6 @@ type Flags struct {
 	ServerPublicKeyPath    string `flag:"--server-public-key-path="`
 	SharedMemoryBaseName   string `flag:"--shared-memory-base-name="`
 	Socket                 string `flag:"--socket="`
-	Ssl                    *int   `flag:"--ssl="`
 	SslCa                  string `flag:"--ssl-ca="`
 	SslCaPath              string `flag:"--ssl-capath="`
 	SslCert                string `flag:"--ssl-cert="`

diff --git a/test/pkg/source/mysqltest/mysql_test.go b/test/pkg/source/mysqltest/mysql_test.go
@@ -182,14 +182,12 @@ func (mySQLDumpAndRestoreTestSuite *MySQLDumpAndRestoreTestSuite) TestMySQLDumpA
 	}()
 
 	// backup test data with brudi and retain test data for verification
-	var testData []TestStruct
-	testData, err = mySQLDoBackup(ctx, true, resticContainer, backupPathZip)
-	mySQLDumpAndRestoreTestSuite.Require().NoError(err)
+	testData, backupErr := mySQLDoBackup(ctx, true, resticContainer, backupPathZip)
+	mySQLDumpAndRestoreTestSuite.Require().NoError(backupErr)
 
 	// restore database from backup and pull test data from it for verification
-	var restoreResult []TestStruct
-	restoreResult, err = mySQLDoRestore(ctx, true, resticContainer, backupPathZip)
-	mySQLDumpAndRestoreTestSuite.Require().NoError(err)
+	restoreResult, restoreErr := mySQLDoRestore(ctx, true, resticContainer, backupPathZip)
+	mySQLDumpAndRestoreTestSuite.Require().NoError(restoreErr)
 
 	mySQLDumpAndRestoreTestSuite.Require().True(reflect.DeepEqual(testData, restoreResult))
 }
@@ -399,7 +397,7 @@ mysqldump:
       allDatabases: true
       resultFile: %s
       ssl: 0
-    additionalArgs: []
+    additionalArgs: ["--ssl=0"]
 mysqlrestore:
   options:
     flags:
@@ -409,7 +407,7 @@ mysqlrestore:
       user: %s
       Database: %s
       ssl: 0
-    additionalArgs: []
+    additionalArgs: ["--ssl=0"]
     sourceFile: %s%s
 `, hostName, container.Port, mySQLRootPW, mySQLRoot, path,
 		hostName, container.Port, mySQLRootPW, mySQLRoot, mySQLDatabase, path,