Add make target for formatting

Author: ashald

Makefile

@@ -5,11 +5,14 @@ PLUGIN_FULL_NAME	:=	${AUTHOR}/${PLUGIN_NAME}
 ROOTFS_CONTAINER	:=	${PLUGIN_NAME}-rootfs
 ROOTFS_IMAGE		:=	${AUTHOR}/${ROOTFS_CONTAINER}
 
+all: format build
+
+format:
+	go fmt ./...
 
 build:
 	GOOS=linux GOARCH=amd64 go build -o "$(PLUGIN_NAME)"
 
-
 rootfs-image:
 	docker build -t $(ROOTFS_IMAGE) .
 

README.md

@@ -7,4 +7,11 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bc
 ```
 chown -1:-1
 
+```
+
+## Development
+Go 1.11
+```bash
+go mod vendor
+go mod tidy
 ```

driver/driver.go

@@ -15,12 +15,11 @@ import (
 	v "github.com/docker/go-plugins-helpers/volume"
 )
 
-
 type Config struct {
-	StateDir    		string
-	DataDir    			string
-	MountDir    		string
-	DefaultSize    		string
+	StateDir    string
+	DataDir     string
+	MountDir    string
+	DefaultSize string
 }
 
 type Driver struct {
@@ -37,9 +36,9 @@ func NewDriver(cfg Config) (d Driver, err error) {
 	}
 
 	m, err := manager.New(manager.Config{
-		StateDir:	cfg.StateDir,
-		DataDir:	cfg.DataDir,
-		MountDir:	cfg.MountDir,
+		StateDir: cfg.StateDir,
+		DataDir:  cfg.DataDir,
+		MountDir: cfg.MountDir,
 	})
 	if err != nil {
 		err = errors.Wrapf(err,
@@ -215,7 +214,7 @@ func (d Driver) Get(req *v.GetRequest) (*v.GetResponse, error) {
 		CreatedAt:  fmt.Sprintf(vol.CreatedAt.Format(time.RFC3339)),
 		Mountpoint: vol.MountPointPath,
 		Status: map[string]interface{}{
-			"size-max": 	strconv.FormatUint(vol.MaxSizeInBytes, 10),
+			"size-max":     strconv.FormatUint(vol.MaxSizeInBytes, 10),
 			"size-current": strconv.FormatUint(vol.CurrentSizeInBytes, 10),
 		},
 	}
@@ -298,7 +297,7 @@ func (d Driver) Mount(req *v.MountRequest) (*v.MountResponse, error) {
 	return resp, nil
 }
 
-func (d Driver) Unmount(req *v.UnmountRequest) (error) {
+func (d Driver) Unmount(req *v.UnmountRequest) error {
 	var logger = d.logger.With().
 		Str("log-id", shortid.MustGenerate()).
 		Str("method", "unmount").
@@ -318,11 +317,10 @@ func (d Driver) Unmount(req *v.UnmountRequest) (error) {
 	return err
 }
 
-func (d Driver) Capabilities() (resp *v.CapabilitiesResponse) {
-	resp = &v.CapabilitiesResponse{
+func (d Driver) Capabilities() *v.CapabilitiesResponse {
+	return &v.CapabilitiesResponse{
 		Capabilities: v.Capability{
 			Scope: "local",
 		},
 	}
-	return
 }

driver/utils.go

@@ -7,7 +7,6 @@ import (
 	"github.com/docker/go-units"
 )
 
-
 func FromHumanSize(size string) (bytesInt int64, err error) {
 	if strings.Contains(strings.ToLower(size), "i") {
 		bytesInt, err = units.RAMInBytes(size)

manager/manager.go

@@ -170,7 +170,6 @@ func (m Manager) Create(name string, sizeInBytes int64, sparse bool, uid, gid in
 		return errors.Wrapf(err,
 			"Error creating volume '%s' - data dir does not exist: '%s'",
 			name, m.dataDir)
-
 	}
 
 	// create data file
@@ -184,9 +183,7 @@ func (m Manager) Create(name string, sizeInBytes int64, sparse bool, uid, gid in
 			name, dataFilePath)
 	}
 
-	fmt.Println(fmt.Sprintf("--- %v", sparse))
 	if sparse {
-		fmt.Println(fmt.Sprintf("--- Creating as sparse"))
 		err = dataFileInfo.Truncate(sizeInBytes)
 		if err != nil {
 			_ = os.Remove(dataFilePath) // attempt to cleanup
@@ -195,13 +192,11 @@ func (m Manager) Create(name string, sizeInBytes int64, sparse bool, uid, gid in
 				name, sizeInBytes)
 		}
 	} else {
-		fmt.Println(fmt.Sprintf("--- Creating as fallocate"))
 		// Try using fallocate - super fast if data dir is on ext4 or xfs
 		errBytes, err := exec.Command("fallocate", "-l", fmt.Sprint(sizeInBytes), dataFilePath).CombinedOutput()
 
 		// fallocate failed - either not enough space or unsupported FS
 		if err != nil {
-			fmt.Println(fmt.Sprintf("--- fallocate failed"))
 			errStr := strings.TrimSpace(string(errBytes[:]))
 
 			// If there is not enough space then we just error out