small refactoring

Author: Акулов Александр Яковлевич

main.go

@@ -14,7 +14,10 @@ import (
 	"github.com/urfave/cli"
 )
 
-const BackupTimeFormat = "2006-01-02T15-04-05"
+const (
+	BackupTimeFormat  = "2006-01-02T15-04-05"
+	defaultConfigPath = "/etc/clickhouse-backup/config.yml"
+)
 
 var (
 	version   = "unknown"
@@ -24,10 +27,6 @@ var (
 	ErrUnknownClickhouseDataPath = errors.New("clickhouse data path is unknown, you can set data_path in config file")
 )
 
-const (
-	defaultConfigPath = "/etc/clickhouse-backup/config.yml"
-)
-
 func main() {
 	log.SetOutput(os.Stdout)
 	cliapp := cli.NewApp()

s3.go

@@ -237,18 +237,18 @@ func (s *S3) UploadDirectory(localPath string, dstPath string) error {
 }
 
 // UploadFile - synchronize localPath to dstPath on s3
-func (s *S3) UploadFile(config *Config, localPath string, dstPath string) error {
+func (s *S3) UploadFile(localPath string, dstPath string) error {
 	uploader := s3manager.NewUploader(s.session)
-	uploader.PartSize = config.S3.PartSize
+	uploader.PartSize = s.Config.PartSize
 
 	file, err := os.Open(localPath)
 	if err != nil {
 		return fmt.Errorf("error opening file %v: %v", localPath, err)
 	}
 	if !s.DryRun {
 		if _, err := uploader.UploadWithContext(aws.BackgroundContext(), &s3manager.UploadInput{
-			ACL:    aws.String(config.S3.ACL),
-			Bucket: aws.String(config.S3.Bucket),
+			ACL:    aws.String(s.Config.ACL),
+			Bucket: aws.String(s.Config.Bucket),
 			Key:    aws.String(path.Join(s.Config.Path, dstPath)),
 			Body:   file,
 		}); err != nil {