percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-21 11:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for linters

Browse Source
This commit is contained in:
Carlos Salguero
2018-04-19 09:28:14 -03:00
parent 4117f1cd62
commit 2b9cf7dce6
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/go/pt-secure-collect/main.go
View File

@@ -67,12 +67,12 @@ type myDefaults struct {
} }
const ( const (
DecryptCmd = "decrypt" decryptCmd = "decrypt"
EncryptCmd = "encrypt" encryptCmd = "encrypt"
CollectCmd = "collect" collectCmd = "collect"
SanitizeCmd = "sanitize" sanitizeCmd = "sanitize"
DefaultMySQLHost = "127.0.0.1" defaultMySQLHost = "127.0.0.1"
DefaultMySQLPort = 3306 defaultMySQLPort = 3306
) )
var ( var (
@@ -100,7 +100,7 @@ func main() {
} }
switch opts.Command { switch opts.Command {
case CollectCmd: case collectCmd:
if _, err = os.Stat(*opts.TempDir); os.IsNotExist(err) { if _, err = os.Stat(*opts.TempDir); os.IsNotExist(err) {
log.Infof("Creating temporary directory: %s", *opts.TempDir) log.Infof("Creating temporary directory: %s", *opts.TempDir)
if err = os.Mkdir(*opts.TempDir, os.ModePerm); err != nil { if err = os.Mkdir(*opts.TempDir, os.ModePerm); err != nil {
@@ -116,9 +116,9 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
} }
case EncryptCmd, DecryptCmd: case encryptCmd, decryptCmd:
err = encryptorCmd(opts) err = encryptorCmd(opts)
case SanitizeCmd: case sanitizeCmd:
err = sanitizeFile(opts) err = sanitizeFile(opts)
} }
if err != nil { if err != nil {
@@ -171,10 +171,10 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions,
} }
opts := &cliOptions{ opts := &cliOptions{
CollectCommand: app.Command(CollectCmd, "Collect, sanitize, pack and encrypt data from pt-tools."), CollectCommand: app.Command(collectCmd, "Collect, sanitize, pack and encrypt data from pt-tools."),
DecryptCommand: app.Command(DecryptCmd, "Decrypt an encrypted file. The password will be requested from the terminal."), DecryptCommand: app.Command(decryptCmd, "Decrypt an encrypted file. The password will be requested from the terminal."),
EncryptCommand: app.Command(EncryptCmd, "Encrypt a file. The password will be requested from the terminal."), EncryptCommand: app.Command(encryptCmd, "Encrypt a file. The password will be requested from the terminal."),
SanitizeCommand: app.Command(SanitizeCmd, "Replace queries in a file by their fingerprints and obfuscate hostnames."), SanitizeCommand: app.Command(sanitizeCmd, "Replace queries in a file by their fingerprints and obfuscate hostnames."),
Debug: app.Flag("debug", "Enable debug log level.").Bool(), Debug: app.Flag("debug", "Enable debug log level.").Bool(),
} }
// Decrypt command flags // Decrypt command flags
@@ -241,7 +241,7 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions,
} }
switch opts.Command { switch opts.Command {
case CollectCmd: case collectCmd:
mycnf, err := getParamsFromMyCnf(*opts.ConfigFile) mycnf, err := getParamsFromMyCnf(*opts.ConfigFile)
if err == nil { if err == nil {
if err = validateMySQLParams(opts, mycnf); err != nil { if err = validateMySQLParams(opts, mycnf); err != nil {
@@ -254,9 +254,9 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions,
} }
} }
err = askEncryptionPassword(opts, true) err = askEncryptionPassword(opts, true)
case EncryptCmd: case encryptCmd:
err = askEncryptionPassword(opts, true) err = askEncryptionPassword(opts, true)
case DecryptCmd: case decryptCmd:
if !strings.HasSuffix(*opts.DecryptInFile, ".aes") && *opts.DecryptOutFile == "" { if !strings.HasSuffix(*opts.DecryptInFile, ".aes") && *opts.DecryptOutFile == "" {
return nil, fmt.Errorf("Input file does not have .aes extension. I cannot infer the output file") return nil, fmt.Errorf("Input file does not have .aes extension. I cannot infer the output file")
} }
@@ -289,12 +289,12 @@ func validateMySQLParams(opts *cliOptions, mycnf *myDefaults) error {
} }
if *opts.MySQLHost == "" { if *opts.MySQLHost == "" {
log.Debugf("MySQL host is empty. Setting it to %s", DefaultMySQLHost) log.Debugf("MySQL host is empty. Setting it to %s", defaultMySQLHost)
*opts.MySQLHost = DefaultMySQLHost *opts.MySQLHost = defaultMySQLHost
} }
if *opts.MySQLPort == 0 { if *opts.MySQLPort == 0 {
log.Debugf("MySQL port is empty. Setting it to %d", DefaultMySQLPort) log.Debugf("MySQL port is empty. Setting it to %d", defaultMySQLPort)
*opts.MySQLPort = DefaultMySQLPort *opts.MySQLPort = defaultMySQLPort
} }
if *opts.MySQLUser == "" { if *opts.MySQLUser == "" {
return fmt.Errorf("MySQL user cannot be empty") return fmt.Errorf("MySQL user cannot be empty")