remove use of runtime platform

Signed-off-by: Justin Alvarez <[email protected]>

Author: pendo324

ecs-agent/daemonimages/csidriver/driver/node.go

@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"runtime"
 	"strconv"
 	"strings"
 
@@ -260,33 +259,15 @@ func (d *nodeService) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
 		sourceVolumeHostPath = strings.TrimPrefix(target, EBSPathPrefix)
 	}
 
-	// chown/chmod don't work on Windows
-	if runtime.GOOS != "windows" {
-		// Gid is generated based on SourceVolumeHostPath
-		gid := util.GenerateGIDFromPath(sourceVolumeHostPath)
-		// Set permissions on the mount point to allow non-root users to access it
-		if err := setMountPointPermissions(target, gid); err != nil {
-			return nil, status.Errorf(codes.Internal, "Failed to set permissions on mount point %s: %v", target, err)
-		}
-		klog.V(4).InfoS("Successfully set permissions on mount point", "target", target, "volumeID", volumeID, "gid", gid)
-	}
-
-	return &csi.NodeStageVolumeResponse{}, nil
-}
-
-// setMountPointPermissions sets the permissions on the mount point to allow non-root users to access it
-func setMountPointPermissions(mountPath string, gid int) error {
-	// Change group ownership to the provided GID
-	if err := chownFunc(mountPath, -1, gid); err != nil {
-		return fmt.Errorf("failed to change group ownership of %s to GID %d: %v", mountPath, gid, err)
-	}
+	// Gid is generated based on SourceVolumeHostPath
+	gid := util.GenerateGIDFromPath(sourceVolumeHostPath)
 
-	// Set permissions to 0775 with setgid bit
-	if err := chmodFunc(mountPath, 0775|os.ModeSetgid); err != nil {
-		return fmt.Errorf("failed to set permissions on %s: %v", mountPath, err)
+	// Set permissions on the mount point to allow non-root users to access it
+	if err := setMountPointPermissions(target, gid, volumeID); err != nil {
+		return nil, status.Errorf(codes.Internal, "Failed to set permissions on mount point %s: %v", target, err)
 	}
 
-	return nil
+	return &csi.NodeStageVolumeResponse{}, nil
 }
 
 func newNodeService() nodeService {

ecs-agent/daemonimages/csidriver/driver/node_linux.go

@@ -182,3 +182,19 @@ func (d *nodeService) getBlockSizeBytes(devicePath string, _ string) (int64, err
 	}
 	return gotSizeBytes, nil
 }
+
+// setMountPointPermissions sets the permissions on the mount point to allow non-root users to access it
+func setMountPointPermissions(mountPath string, gid int, volumeID string) error {
+	// Change group ownership to the provided GID
+	if err := chownFunc(mountPath, -1, gid); err != nil {
+		return fmt.Errorf("failed to change group ownership of %s to GID %d: %v", mountPath, gid, err)
+	}
+
+	// Set permissions to 0775 with setgid bit
+	if err := chmodFunc(mountPath, 0775|os.ModeSetgid); err != nil {
+		return fmt.Errorf("failed to set permissions on %s: %v", mountPath, err)
+	}
+
+	klog.V(4).InfoS("Successfully set permissions on mount point", "target", mountPath, "volumeID", volumeID, "gid", gid)
+	return nil
+}

ecs-agent/daemonimages/csidriver/driver/node_windows.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 
 	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
+	"k8s.io/klog/v2"
 )
 
 // getBlockSizeBytes gets the size of the disk in bytes
@@ -75,3 +76,9 @@ func (d *nodeService) findDevicePath(devicePath, volumeID, _ string) (string, er
 
 	return foundDiskNumber, nil
 }
+
+// setMountPointPermissions is a no-op on Windows because chown/chmod don't work on Windows
+func setMountPointPermissions(_ string, _ int, _ string) error {
+	klog.V(4).InfoS("Skipping setting mount point permissions on Windows")
+	return nil
+}