Include the GRPC server changes only

ecs-agent/daemonimages/csidriver/Makefile

@@ -21,14 +21,6 @@ bin/csi-driver: $(CSI_DRIVER_SOURCES)
 test:
 	go test -v -race -tags unit -timeout=60s ./...
 
-# please include this `mockgen` into PATH
-bin/mockgen: | bin
-	go install github.com/golang/mock/mockgen@v1.6.0
-
-.PHONY: mockgen
-mockgen: bin/mockgen
-	./update-gomock
-
 .PHONY: clean
 clean:
 	rm -rf bin/

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

@@ -13,27 +13,19 @@
 
 package driver
 
-import (
-	mountutils "k8s.io/mount-utils"
-
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
-)
-
 // Mounter is the interface implemented by NodeMounter.
 type Mounter interface {
 	PathExists(path string) (bool, error)
 }
 
 // NodeMounter implements Mounter.
 type NodeMounter struct {
-	*mountutils.SafeFormatAndMount
+}
+
+func (nm NodeMounter) PathExists(path string) (bool, error) {
+	return false, nil
 }
 
 func newNodeMounter() (Mounter, error) {
-	// mounter.NewSafeMounter returns a SafeFormatAndMount
-	safeMounter, err := mounter.NewSafeMounter()
-	if err != nil {
-		return nil, err
-	}
-	return &NodeMounter{safeMounter}, nil
+	return NodeMounter{}, nil
 }

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

@@ -14,14 +14,7 @@
 package driver
 
 import (
-	"context"
-
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"k8s.io/klog/v2"
-
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/volume"
 )
 
 // nodeService represents the node service of CSI driver
@@ -31,75 +24,10 @@ type nodeService struct {
 }
 
 func newNodeService() nodeService {
-	klog.V(4).InfoS("New node service")
 	nodeMounter, err := newNodeMounter()
 	if err != nil {
 		panic(err)
 	}
 
-	return nodeService{
-		mounter: nodeMounter,
-	}
-}
-
-func (d *nodeService) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
-	klog.V(4).InfoS("NodeGetVolumeStats: called", "args", *req)
-	if len(req.VolumeId) == 0 {
-		return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume ID was empty")
-	}
-
-	if len(req.VolumePath) == 0 {
-		return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume path was empty")
-	}
-
-	exists, err := d.mounter.PathExists(req.VolumePath)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "unknown error when stat on %s: %v", req.VolumePath, err)
-	}
-	if !exists {
-		return nil, status.Errorf(codes.NotFound, "path %s does not exist", req.VolumePath)
-	}
-
-	isBlock, err := d.IsBlockDevice(req.VolumePath)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to determine whether %s is block device: %v", req.VolumePath, err)
-	}
-
-	if isBlock {
-		bcap, blockErr := d.getBlockSizeBytes(req.VolumePath)
-		if blockErr != nil {
-			return nil, status.Errorf(codes.Internal, "failed to get block capacity on path %s: %v", req.VolumePath, err)
-		}
-		return &csi.NodeGetVolumeStatsResponse{
-			Usage: []*csi.VolumeUsage{
-				{
-					Unit:  csi.VolumeUsage_BYTES,
-					Total: bcap,
-				},
-			},
-		}, nil
-	}
-
-	metricsProvider := volume.NewMetricsStatFS(req.VolumePath)
-	metrics, err := metricsProvider.GetMetrics()
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get fs info on path %s: %v", req.VolumePath, err)
-	}
-
-	return &csi.NodeGetVolumeStatsResponse{
-		Usage: []*csi.VolumeUsage{
-			{
-				Unit:      csi.VolumeUsage_BYTES,
-				Available: metrics.Available.AsDec().UnscaledBig().Int64(),
-				Total:     metrics.Capacity.AsDec().UnscaledBig().Int64(),
-				Used:      metrics.Used.AsDec().UnscaledBig().Int64(),
-			},
-			{
-				Unit:      csi.VolumeUsage_INODES,
-				Available: metrics.InodesFree.AsDec().UnscaledBig().Int64(),
-				Total:     metrics.Inodes.AsDec().UnscaledBig().Int64(),
-				Used:      metrics.InodesUsed.AsDec().UnscaledBig().Int64(),
-			},
-		},
-	}, nil
+	return nodeService{mounter: nodeMounter}
 }