Merge pull request #47 from civo/feat-format

feat: handle formatting

Author: hlts2

Diff for: e2e/preexiting_volume_test.go

@@ -112,5 +112,4 @@ func Test_ExistingCivoVolume(t *testing.T) {
 
 	t.Log("Wait for deployment to become ready")
 	g.Eventually(deployStateFunc(context.TODO(), e2eTest.tenantClient, g, deployment), "3m", "5s").Should(Equal("ready"))
-
 }

Diff for: e2e/suite_test.go

@@ -18,8 +18,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const Image = "dmajrekar/civo-csi"
-const TestClusterName = "csi-e2e-test"
+const (
+	Image           = "dmajrekar/civo-csi"
+	TestClusterName = "csi-e2e-test"
+)
 
 var CivoRegion, CivoURL string
 
@@ -36,6 +38,7 @@ type E2ETest struct {
 func init() {
 	flag.BoolVar(&retainClusters, "retain", false, "Retain the created cluster(s) on failure. (Clusters are always cleaned up on success.) Ignored if -kubeconfig is specified.")
 }
+
 func TestMain(m *testing.M) {
 	flag.Parse()
 
@@ -131,7 +134,6 @@ func TestMain(m *testing.M) {
 	e2eTest.cleanUpCluster()
 
 	os.Exit(exitCode)
-
 }
 
 func (e *E2ETest) provisionCluster() {

Diff for: main.go

@@ -14,9 +14,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-var (
-	versionInfo = flag.Bool("version", false, "Print the driver version")
-)
+var versionInfo = flag.Bool("version", false, "Print the driver version")
 
 func main() {
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix

Diff for: pkg/driver/controller_server.go

@@ -72,7 +72,6 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 			log.Debug().Str("volume_id", v.ID).Msg("Volume already exists")
 			if v.SizeGigabytes != int(desiredSize) {
 				return nil, status.Error(codes.AlreadyExists, "Volume already exists with a differnt size")
-
 			}
 
 			available, err := d.waitForVolumeStatus(&v, "available", CivoVolumeAvailableRetries)
@@ -471,7 +470,6 @@ func (d *Driver) ControllerExpandVolume(ctx context.Context, req *csi.Controller
 		CapacityBytes:         int64(volume.SizeGigabytes) * BytesInGigabyte,
 		NodeExpansionRequired: true,
 	}, nil
-
 }
 
 // ControllerGetVolume is for optional Kubernetes health checking of volumes and we don't support it yet

Diff for: pkg/driver/controller_server_test.go

@@ -290,11 +290,9 @@ func TestGetCapacity(t *testing.T) {
 
 		assert.Equal(t, int64(0), resp.AvailableCapacity)
 	})
-
 }
 
 func TestControllerExpandVolume(t *testing.T) {
-
 	tests := []struct {
 		name           string
 		volumeID       string
@@ -324,9 +322,9 @@ func TestControllerExpandVolume(t *testing.T) {
 				RequiredBytes: 20*driver.BytesInGigabyte + 1, // 20 GB + 1 byte
 			},
 			initialVolume: &civogo.Volume{
-				ID:             "vol-123",
-				SizeGigabytes:  10,
-				Status:         "available",
+				ID:            "vol-123",
+				SizeGigabytes: 10,
+				Status:        "available",
 			},
 			expectedError:  nil,
 			expectedSizeGB: 21, // Desired size should be rounded up to 21 GB
@@ -413,7 +411,6 @@ func TestControllerExpandVolume(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			fc, _ := civogo.NewFakeClient()
 			d, _ := driver.NewTestDriver(fc)
 

Diff for: pkg/driver/hotplug_disk.go

@@ -110,13 +110,13 @@ func (p *RealDiskHotPlugger) Mount(path, mountpoint, filesystem string, flags ..
 	if filesystem == "" {
 		// Bind-mount requires a file to bind to
 		log.Debug().Str("path", path).Str("mountpoint", mountpoint).Msg("Bind mounting filesystem, making parent folder")
-		err := os.MkdirAll(filepath.Dir(mountpoint), 0750)
+		err := os.MkdirAll(filepath.Dir(mountpoint), 0o750)
 		if err != nil {
 			return fmt.Errorf("creating mountpoint containing folder failed: %v", err)
 		}
 
 		log.Debug().Str("mountpoint", mountpoint).Msg("Making bind-mount file")
-		file, err := os.OpenFile(mountpoint, os.O_CREATE, 0660)
+		file, err := os.OpenFile(mountpoint, os.O_CREATE, 0o660)
 		if err != nil {
 			return fmt.Errorf("failed to create target file for raw block bind mount: %v", err)
 		}
@@ -125,7 +125,7 @@ func (p *RealDiskHotPlugger) Mount(path, mountpoint, filesystem string, flags ..
 		// Block mounts require a folder to mount to
 		log.Debug().Str("mountpoint", mountpoint).Msg("Device mounting - ensuring folder exists")
 
-		err := os.MkdirAll(mountpoint, 0750)
+		err := os.MkdirAll(mountpoint, 0o750)
 		if err != nil {
 			return fmt.Errorf("creating mountpoint failed: %v", err)
 		}