fmt: Fix syntax

Author: Maxime Ancellin

cmd/main.go

@@ -3,15 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/neo9/mongodb-backups/pkg/api"
 	"github.com/neo9/mongodb-backups/pkg/config"
 	"github.com/neo9/mongodb-backups/pkg/mongodb"
 	"github.com/neo9/mongodb-backups/pkg/restore"
 	"github.com/neo9/mongodb-backups/pkg/scheduler"
 	"github.com/neo9/mongodb-backups/pkg/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"runtime"
 )
 
 func printVersion() {
@@ -119,4 +120,3 @@ func main() {
 		log.SetFormatter(&log.JSONFormatter{})
 	}
 }
-

pkg/api/server.go

@@ -14,7 +14,6 @@ func init() {
 	log.SetFormatter(&log.JSONFormatter{})
 }
 
-
 type HttpServer struct {
 	Port int32
 }
@@ -28,7 +27,6 @@ func metricsRouter() http.Handler {
 	return r
 }
 
-
 func (server *HttpServer) Start() {
 
 	r := chi.NewRouter()
@@ -38,4 +36,3 @@ func (server *HttpServer) Start() {
 
 	log.Error(http.ListenAndServe(fmt.Sprintf(":%v", server.Port), r))
 }
-

pkg/bucket/gs.go

@@ -3,13 +3,14 @@ package bucket
 import (
 	"context"
 	"fmt"
-	"github.com/neo9/mongodb-backups/pkg/config"
-	"google.golang.org/api/iterator"
 	"io"
 	"os"
 	"path"
 	"strings"
 
+	"github.com/neo9/mongodb-backups/pkg/config"
+	"google.golang.org/api/iterator"
+
 	"cloud.google.com/go/storage"
 
 	log "github.com/sirupsen/logrus"
@@ -70,10 +71,10 @@ func (bucket *GSBucket) ListFiles(destFolder string) ([]S3File, error) {
 			break
 		}
 		if err != nil {
-			fmt.Errorf("listBucket: unable to list bucket %q: %v", bucket.GS.Name, err)
+			_ = fmt.Errorf("listBucket: unable to list bucket %q: %v", bucket.GS.Name, err)
 			return []S3File{}, err
 		}
-		if destFolder == obj.Name || (destFolder + "/") == obj.Name {
+		if destFolder == obj.Name || (destFolder+"/") == obj.Name {
 			continue
 		}
 
@@ -99,6 +100,9 @@ func (bucket *GSBucket) DownloadFile(src string) (string, error) {
 
 	filename := path.Join("/tmp", path.Base(src))
 	file, err := os.Create(filename)
+	if err != nil {
+		return "", err
+	}
 	defer file.Close()
 
 	rc, err := bucketClient.Object(src).NewReader(ctx)

pkg/bucket/s3.go

@@ -2,21 +2,22 @@ package bucket
 
 import (
 	"fmt"
+	"os"
+	"path"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/neo9/mongodb-backups/pkg/config"
 	"github.com/neo9/mongodb-backups/pkg/utils"
-	"os"
-	"path"
-	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 )
 
 type S3Bucket struct {
 	Session *session.Session
-	S3 *config.S3
+	S3      *config.S3
 }
 
 type S3File struct {
@@ -32,11 +33,10 @@ func NewS3Bucket(s3 *config.S3) *S3Bucket {
 
 	return &S3Bucket{
 		Session: s3Session,
-		S3: s3,
+		S3:      s3,
 	}
 }
 
-
 func (bucket *S3Bucket) Upload(filename string, destFolder string) error {
 	uploader := s3manager.NewUploader(bucket.Session)
 	file, err := os.Open(filename)
@@ -46,20 +46,20 @@ func (bucket *S3Bucket) Upload(filename string, destFolder string) error {
 	defer file.Close()
 
 	_, err = uploader.Upload(&s3manager.UploadInput{
-		Bucket: aws.String(bucket.S3.Name),
-		Key:    aws.String(path.Join(destFolder, path.Base(filename))),
-		Body:   file,
+		Bucket:               aws.String(bucket.S3.Name),
+		Key:                  aws.String(path.Join(destFolder, path.Base(filename))),
+		Body:                 file,
 		ServerSideEncryption: aws.String("AES256"),
 	})
 
 	return err
 }
 
 func (bucket *S3Bucket) ListFiles(destFolder string) ([]S3File, error) {
-    svc := s3.New(bucket.Session)
+	svc := s3.New(bucket.Session)
 
 	var files []S3File
-    i := 0
+	i := 0
 	err := svc.ListObjectsPages(&s3.ListObjectsInput{
 		Bucket: &bucket.S3.Name,
 		Prefix: &destFolder,
@@ -94,13 +94,16 @@ func (bucket *S3Bucket) DownloadFile(src string) (string, error) {
 
 	filename := path.Join("/tmp", path.Base(src))
 	file, err := os.Create(filename)
+	if err != nil {
+		return "", err
+	}
 	defer file.Close()
 
 	writer := &progressWriter{
-		writer: file,
-		size: size,
+		writer:    file,
+		size:      size,
 		humanSize: utils.GetHumanBytes(size),
-		written: 0,
+		written:   0,
 	}
 	params := &s3.GetObjectInput{
 		Bucket: aws.String(bucket.S3.Name),
@@ -120,7 +123,7 @@ func (bucket *S3Bucket) DeleteFile(filename string) error {
 	svc := s3.New(bucket.Session)
 	_, err := svc.DeleteObject(&s3.DeleteObjectInput{
 		Bucket: &bucket.S3.Name,
-		Key: aws.String("//" + filename),
+		Key:    aws.String("//" + filename),
 	})
 
 	return err

pkg/metrics/metrics.go

@@ -3,11 +3,11 @@ package metrics
 import "github.com/prometheus/client_golang/prometheus"
 
 type BackupMetrics struct {
-	Total     *prometheus.CounterVec
-	RetentionTotal     *prometheus.CounterVec
-	BucketCount  *prometheus.GaugeVec
-	Size      *prometheus.GaugeVec
-	Latency  *prometheus.SummaryVec
+	Total                  *prometheus.CounterVec
+	RetentionTotal         *prometheus.CounterVec
+	BucketCount            *prometheus.GaugeVec
+	Size                   *prometheus.GaugeVec
+	Latency                *prometheus.SummaryVec
 	LastSuccessfulSnapshot *prometheus.GaugeVec
 }
 
@@ -82,4 +82,4 @@ func New(namespace string, subsystem string) *BackupMetrics {
 	prometheus.MustRegister(prom.LastSuccessfulSnapshot)
 
 	return prom
-}
+}

pkg/mongodb/dump.go

@@ -27,7 +27,7 @@ func CreateDump(plan *config.Plan) (MongoDBDump, error) {
 
 	authArgs := getAuthenticationArguments()
 	dumpCommand := fmt.Sprintf(
-		"mongodump --authenticationDatabase admin %s --archive=%v --gzip --host %s --port %s",
+		"mongodump --forceTableScan --authenticationDatabase admin %s --archive=%v --gzip --host %s --port %s",
 		authArgs,
 		mongoDBDump.ArchiveFile,
 		plan.MongoDB.Host,

pkg/mongodb/mongodb.go

@@ -2,16 +2,16 @@ package mongodb
 
 import (
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
+
+	log "github.com/sirupsen/logrus"
 )
 
 func init() {
 	log.SetFormatter(&log.JSONFormatter{})
 }
 
-
 func RemoveFile(filename string) {
 	err := os.Remove(filename)
 	if err != nil {

pkg/mongodb/restore.go

@@ -2,11 +2,12 @@ package mongodb
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/codeskyblue/go-sh"
 	"github.com/neo9/mongodb-backups/pkg/config"
 	"github.com/neo9/mongodb-backups/pkg/utils"
 	"github.com/prometheus/common/log"
-	"time"
 )
 
 func RestoreDump(filename string, args string, plan *config.Plan) error {

pkg/restore/restore.go

@@ -2,16 +2,17 @@ package restore
 
 import (
 	"errors"
+	"os"
+	"path"
+	"strings"
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/neo9/mongodb-backups/pkg/bucket"
 	"github.com/neo9/mongodb-backups/pkg/mongodb"
 	"github.com/neo9/mongodb-backups/pkg/scheduler"
 	"github.com/neo9/mongodb-backups/pkg/utils"
 	log "github.com/sirupsen/logrus"
-	"os"
-	"path"
-	"strings"
-	"time"
 )
 
 func DisplayBackups(scheduler *scheduler.Scheduler) error {
@@ -53,7 +54,7 @@ func RestoreLast(scheduler *scheduler.Scheduler, args string) error {
 		return errors.New("NO_BACKUP")
 	}
 
-	file := files[len(files) - 1]
+	file := files[len(files)-1]
 	log.Infof("Restoring backup %s from snapshot %s", file.Etag, file.Name)
 	return restoreBackup(scheduler, file.Name, args)
 }
@@ -111,4 +112,3 @@ func getFiles(scheduler *scheduler.Scheduler) ([]bucket.S3File, error) {
 
 	return dumpFiles, nil
 }
-

pkg/scheduler/backup.go

@@ -1,11 +1,12 @@
 package scheduler
 
 import (
-	"github.com/neo9/mongodb-backups/pkg/mongodb"
-	log "github.com/sirupsen/logrus"
 	"os"
 	"path"
 	"time"
+
+	"github.com/neo9/mongodb-backups/pkg/mongodb"
+	log "github.com/sirupsen/logrus"
 )
 
 func init() {
@@ -72,4 +73,3 @@ func (scheduler *Scheduler) uploadToS3(filename string, destFolder string) error
 
 	return nil
 }
-

pkg/scheduler/retention.go

@@ -2,67 +2,68 @@ package scheduler
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/neo9/mongodb-backups/pkg/utils"
 	log "github.com/sirupsen/logrus"
-	"time"
 )
 
 func init() {
 	log.SetFormatter(&log.JSONFormatter{})
 }
 
 func (scheduler *Scheduler) deleteOldBackups() {
-    files, err := scheduler.Bucket.ListFiles(scheduler.Plan.Name)
-    if err != nil {
+	files, err := scheduler.Bucket.ListFiles(scheduler.Plan.Name)
+	if err != nil {
 		scheduler.incRetentionMetricError(fmt.Sprintf("Could not list files for plan %s", scheduler.Plan.Name))
-    	return
+		return
 	}
 
-    retentionDuration, err := utils.GetDurationFromTimeString(scheduler.Plan.Retention)
-    if err != nil {
+	retentionDuration, err := utils.GetDurationFromTimeString(scheduler.Plan.Retention)
+	if err != nil {
 		scheduler.incRetentionMetricError(fmt.Sprintf("Could not execute retention: %v", err))
-    	return
+		return
 	}
 
-    var removeFiles []string
+	var removeFiles []string
 
-    for i := 0; i < len(files); i++ {
-    	file := files[i]
-    	log.Debugf("File: ", file.Name)
-    	timestamp, err := utils.GetBucketFileTimestamp(file.Name)
-    	if err != nil {
+	for i := 0; i < len(files); i++ {
+		file := files[i]
+		log.Debugf("File: ", file.Name)
+		timestamp, err := utils.GetBucketFileTimestamp(file.Name)
+		if err != nil {
 			scheduler.incRetentionMetricError(fmt.Sprintf("Could not apply retention: %v", err))
 		}
 
-        ageInSeconds := time.Now().Unix() - timestamp
-        diffInSeconds := ageInSeconds - int64(retentionDuration.Seconds())
+		ageInSeconds := time.Now().Unix() - timestamp
+		diffInSeconds := ageInSeconds - int64(retentionDuration.Seconds())
 
-        if diffInSeconds > 0 {
+		if diffInSeconds > 0 {
 			log.Debugf("File is %s old and schedule for removal", file.Name)
-        	removeFiles = append(removeFiles, file.Name)
+			removeFiles = append(removeFiles, file.Name)
 		} else {
 			log.Debugf("File is %s old and will be removed in %s", file.Name,
-				time.Duration(diffInSeconds * -1) * time.Second)
+				time.Duration(diffInSeconds*-1)*time.Second)
 		}
 	}
 
-    log.Infof("Retention: %d file(s) to remove", len(removeFiles))
+	log.Infof("Retention: %d file(s) to remove", len(removeFiles))
 
-    status := "success"
-    for i := 0; i < len(removeFiles); i++ {
-    	err := scheduler.Bucket.DeleteFile(removeFiles[i])
-    	if err != nil {
+	status := "success"
+	for i := 0; i < len(removeFiles); i++ {
+		err := scheduler.Bucket.DeleteFile(removeFiles[i])
+		if err != nil {
 			scheduler.incRetentionMetricError(fmt.Sprintf("Could not remove file %s", removeFiles[i]))
-            status = "error"
+			status = "error"
 		}
 	}
 
-    snapshotCount := float64(len(files) / 2 - len(removeFiles))
+	snapshotCount := float64(len(files)/2 - len(removeFiles))
 	scheduler.Metrics.BucketCount.WithLabelValues(scheduler.Plan.Name).Set(snapshotCount)
 	scheduler.Metrics.RetentionTotal.WithLabelValues(scheduler.Plan.Name, status).Inc()
 }
 
 func (scheduler *Scheduler) incRetentionMetricError(error string) {
-    log.Error(error)
-    scheduler.Metrics.RetentionTotal.WithLabelValues(scheduler.Plan.Name, "error").Inc()
+	log.Error(error)
+	scheduler.Metrics.RetentionTotal.WithLabelValues(scheduler.Plan.Name, "error").Inc()
 }