Enable gofumpt linting

dabradley · Oct 10, 2024 · c45c944 · c45c944
1 parent 243db26
commit c45c944
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -2,6 +2,7 @@ linters:
   enable:
     - revive
     - gofmt
+    - gofumpt
     - testifylint
     - stylecheck
     - predeclared

diff --git a/pkg/azurelustre/fake_mount.go b/pkg/azurelustre/fake_mount.go
@@ -28,7 +28,7 @@ type fakeMounter struct {
 }
 
 // Mount overrides mount.FakeMounter.Mount.
-func (f *fakeMounter) Mount(source string, target string, fstype string, options []string) error {
+func (f *fakeMounter) Mount(source, target, fstype string, options []string) error {
 	if strings.Contains(source, "ut-container") {
 		return fmt.Errorf("fake Mount: source error")
 	} else if strings.Contains(target, "error_mount") {
@@ -39,7 +39,7 @@ func (f *fakeMounter) Mount(source string, target string, fstype string, options
 }
 
 // MountSensitive overrides mount.FakeMounter.MountSensitive.
-func (f *fakeMounter) MountSensitive(source string, target string, fstype string, options []string, sensitiveOptions []string) error {
+func (f *fakeMounter) MountSensitive(source, target, fstype string, options, sensitiveOptions []string) error {
 	if strings.Contains(source, "ut-container-sens") {
 		return fmt.Errorf("fake MountSensitive: source error")
 	} else if strings.Contains(target, "error_mount_sens") {
@@ -50,7 +50,7 @@ func (f *fakeMounter) MountSensitive(source string, target string, fstype string
 }
 
 // MountSensitiveWithoutSystemdWithMountFlags overrides mount.FakeMounter.MountSensitiveWithoutSystemdWithMountFlags.
-func (f *fakeMounter) MountSensitiveWithoutSystemdWithMountFlags(source string, target string, fstype string, options []string, sensitiveOptions []string, mountFlags []string) error {
+func (f *fakeMounter) MountSensitiveWithoutSystemdWithMountFlags(source, target, fstype string, options, sensitiveOptions, mountFlags []string) error {
 	if strings.Contains(source, "ut-container-sens-mountflags") {
 		return fmt.Errorf("fake MountSensitiveWithoutSystemdWithMountFlags: source error")
 	} else if strings.Contains(target, "error_mount_sens_mountflags") {

diff --git a/pkg/azurelustre/nodeserver.go b/pkg/azurelustre/nodeserver.go
@@ -155,7 +155,6 @@ func (d *Driver) NodePublishVolume(
 	}
 
 	err = mountVolumeAtPath(d, source, target, mountOptions)
-
 	if err != nil {
 		if removeErr := os.Remove(target); removeErr != nil {
 			return nil, status.Errorf(
@@ -249,7 +248,7 @@ func getVolume(volumeID string, context map[string]string) (*lustreVolume, error
 	return vol, nil
 }
 
-func mountVolumeAtPath(d *Driver, source string, target string, mountOptions []string) error {
+func mountVolumeAtPath(d *Driver, source, target string, mountOptions []string) error {
 	d.kernelModuleLock.Lock()
 	defer d.kernelModuleLock.Unlock()
 	err := d.mounter.MountSensitiveWithoutSystemdWithMountFlags(
@@ -529,7 +528,7 @@ func (d *Driver) ensureMountPoint(target string) (bool, error) {
 	return !notMnt, nil
 }
 
-func (d *Driver) createSubDir(vol *lustreVolume, mountPath string, subDirPath string, mountOptions []string) error {
+func (d *Driver) createSubDir(vol *lustreVolume, mountPath, subDirPath string, mountOptions []string) error {
 	if err := d.internalMount(vol, mountPath, mountOptions); err != nil {
 		return err
 	}
@@ -547,7 +546,7 @@ func (d *Driver) createSubDir(vol *lustreVolume, mountPath string, subDirPath st
 
 	klog.V(2).Infof("Making subdirectory at %q", internalVolumePath)
 
-	if err := os.MkdirAll(internalVolumePath, 0775); err != nil {
+	if err := os.MkdirAll(internalVolumePath, 0o775); err != nil {
 		return status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())
 	}
 
@@ -558,7 +557,7 @@ func getSourceString(mgsIPAddress, azureLustreName string) string {
 	return fmt.Sprintf("%s@tcp:/%s", mgsIPAddress, azureLustreName)
 }
 
-func getInternalMountPath(workingMountDir string, mountPath string) (string, error) {
+func getInternalMountPath(workingMountDir, mountPath string) (string, error) {
 	mountPath = strings.Trim(mountPath, "/")
 
 	if isSubpath := ensureStrictSubpath(mountPath); !isSubpath {
@@ -572,7 +571,7 @@ func getInternalMountPath(workingMountDir string, mountPath string) (string, err
 	return filepath.Join(workingMountDir, mountPath), nil
 }
 
-func getInternalVolumePath(workingMountDir string, mountPath string, subDirPath string) (string, error) {
+func getInternalVolumePath(workingMountDir, mountPath, subDirPath string) (string, error) {
 	internalMountPath, err := getInternalMountPath(workingMountDir, mountPath)
 	if err != nil {
 		return "", err
@@ -629,7 +628,6 @@ func (d *Driver) internalMount(vol *lustreVolume, mountPath string, mountOptions
 	)
 
 	err = mountVolumeAtPath(d, source, target, mountOptions)
-
 	if err != nil {
 		if removeErr := os.Remove(target); removeErr != nil {
 			return status.Errorf(
@@ -701,7 +699,7 @@ func getLustreVolFromID(id string) (*lustreVolume, error) {
 }
 
 // Convert context parameters to a lustreVolume
-func newLustreVolume(volumeID string, volumeName string, params map[string]string) (*lustreVolume, error) {
+func newLustreVolume(volumeID, volumeName string, params map[string]string) (*lustreVolume, error) {
 	var mgsIPAddress, azureLustreName, subDir string
 	// validate parameters (case-insensitive).
 	for k, v := range params {

diff --git a/pkg/azurelustre/nodeserver_test.go b/pkg/azurelustre/nodeserver_test.go
@@ -780,7 +780,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 }
 
 func makeDir(pathname string) error {
-	err := os.MkdirAll(pathname, os.FileMode(0755))
+	err := os.MkdirAll(pathname, os.FileMode(0o755))
 	if err != nil {
 		if !os.IsExist(err) {
 			return err

diff --git a/pkg/csi-common/driver.go b/pkg/csi-common/driver.go
@@ -34,7 +34,7 @@ type CSIDriver struct {
 
 // Creates a NewCSIDriver object. Assumes vendor version is equal to driver version &
 // does not support optional driver plugin info manifest field. Refer to CSI spec for more details.
-func NewCSIDriver(name string, v string, nodeID string) *CSIDriver {
+func NewCSIDriver(name, v, nodeID string) *CSIDriver {
 	if name == "" {
 		klog.Errorf("Driver name missing")
 		return nil

diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go
@@ -68,6 +68,7 @@ func NewControllerServiceCapability(capability csi.ControllerServiceCapability_R
 		},
 	}
 }
+
 func NewNodeServiceCapability(capability csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
 	return &csi.NodeServiceCapability{
 		Type: &csi.NodeServiceCapability_Rpc{

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -57,7 +57,7 @@ func GiBToBytes(volumeSizeGiB int64) int64 {
 // allocates volumes in gibibyte-sized chunks,
 // RoundUpSize(1500 * 1024*1024, 1024*1024*1024) returns '2'
 // (2 GiB is the smallest allocatable volume that can hold 1500MiB)
-func roundUpSize(volumeSizeBytes int64, allocationUnitBytes int64) int64 {
+func roundUpSize(volumeSizeBytes, allocationUnitBytes int64) int64 {
 	roundedUp := volumeSizeBytes / allocationUnitBytes
 	if volumeSizeBytes%allocationUnitBytes > 0 {
 		roundedUp++
@@ -78,7 +78,7 @@ func GetMountOptions(options []string) string {
 }
 
 func MakeDir(pathname string) error {
-	err := os.MkdirAll(pathname, os.FileMode(0775)) // TODO_JUSJIN: revisit the ACL
+	err := os.MkdirAll(pathname, os.FileMode(0o775)) // TODO_JUSJIN: revisit the ACL
 	if err != nil {
 		if !os.IsExist(err) {
 			return err

diff --git a/test/utils/azure/azure_helper.go b/test/utils/azure/azure_helper.go
@@ -34,7 +34,7 @@ type Client struct {
 	groupsClient   *armresources.ResourceGroupsClient
 }
 
-func GetClient(cloud string, subscriptionID string, clientID string, tenantID string, clientSecret string) (*Client, error) {
+func GetClient(cloud, subscriptionID, clientID, tenantID, clientSecret string) (*Client, error) {
 	env, err := azure.EnvironmentFromName(cloud)
 	if err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ linters: @@
       enable:
         - revive
         - gofmt
+        - gofumpt
         - testifylint
         - stylecheck
         - predeclared
@@ Expand Down @@