Avoid global ECS client for easier test

Author: huww98

pkg/disk/cloud.go

@@ -67,6 +67,7 @@ const (
 
 type DiskAttachDetach struct {
 	slots   AttachDetachSlots
+	ecs     cloud.ECSInterface
 	waiter  waitstatus.StatusWaiter[ecs.Disk]
 	batcher batcher.Batcher[ecs.Disk]
 
@@ -167,7 +168,6 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 	logger := klog.FromContext(ctx)
 	logger.V(2).Info("Starting Do AttachDisk", "instanceID", nodeID, "region", GlobalConfigVar.Region)
 
-	ecsClient := GlobalConfigVar.EcsClient
 	// Step 1: check disk status
 	disk, err := ad.findDiskByID(ctx, diskID)
 	if err != nil {
@@ -192,7 +192,7 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 
 	// tag disk as k8s.aliyun.com=true
 	if GlobalConfigVar.DiskTagEnable {
-		tagDiskAsK8sAttached(diskID, ecsClient)
+		tagDiskAsK8sAttached(diskID, GlobalConfigVar.EcsClient)
 	}
 
 	cate, ok := AllCategories[Category(disk.Category)]
@@ -237,7 +237,7 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 		}
 
 		if GlobalConfigVar.DiskBdfEnable {
-			if allowed, err := forceDetachAllowed(ecsClient, disk); err != nil {
+			if allowed, err := forceDetachAllowed(GlobalConfigVar.EcsClient, disk); err != nil {
 				return "", status.Errorf(codes.Aborted, "forceDetachAllowed failed: %v", err)
 			} else if !allowed {
 				return "", status.Errorf(codes.Aborted, "AttachDisk: Disk %s is already attached to instance %s, and depend bdf, reject force detach", disk.DiskId, disk.InstanceId)
@@ -257,7 +257,7 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 			for key, value := range GlobalConfigVar.RequestBaseInfo {
 				detachRequest.AppendUserAgent(key, value)
 			}
-			_, err = ecsClient.DetachDisk(detachRequest)
+			_, err = ad.ecs.DetachDisk(detachRequest)
 			if err != nil {
 				klog.Errorf("AttachDisk: Can't Detach disk %s from instance %s: with error: %v", diskID, disk.InstanceId, err)
 				return "", status.Errorf(codes.Aborted, "AttachDisk: Can't Detach disk %s from instance %s: with error: %v", diskID, disk.InstanceId, err)
@@ -297,7 +297,7 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 	for key, value := range GlobalConfigVar.RequestBaseInfo {
 		attachRequest.AppendUserAgent(key, value)
 	}
-	response, err := throttle.Throttled(ad.attachThrottler, ecsClient.AttachDisk)(ctx, attachRequest)
+	response, err := throttle.Throttled(ad.attachThrottler, ad.ecs.AttachDisk)(ctx, attachRequest)
 	if err != nil {
 		var aliErr *alicloudErr.ServerError
 		if errors.As(err, &aliErr) {
@@ -338,7 +338,6 @@ func (ad *DiskAttachDetach) attachDisk(ctx context.Context, diskID, nodeID strin
 func (ad *DiskAttachDetach) attachMultiAttachDisk(ctx context.Context, diskID, nodeID string) (string, error) {
 	klog.Infof("AttachDisk: Starting Do AttachMultiAttachDisk: DiskId: %s, InstanceId: %s, Region: %v", diskID, nodeID, GlobalConfigVar.Region)
 
-	ecsClient := GlobalConfigVar.EcsClient
 	// Step 1: check disk status
 	disk, err := ad.findDiskByID(ctx, diskID)
 	if err != nil {
@@ -360,7 +359,7 @@ func (ad *DiskAttachDetach) attachMultiAttachDisk(ctx context.Context, diskID, n
 	attachRequest := ecs.CreateAttachDiskRequest()
 	attachRequest.InstanceId = nodeID
 	attachRequest.DiskId = diskID
-	response, err := ecsClient.AttachDisk(attachRequest)
+	response, err := ad.ecs.AttachDisk(attachRequest)
 	if err != nil {
 		if strings.Contains(err.Error(), DiskLimitExceeded) {
 			return "", status.Error(codes.Internal, err.Error()+", Node("+nodeID+")exceed the limit attachments of disk")

pkg/disk/controllerserver.go

@@ -99,6 +99,7 @@ func NewControllerServer(csiCfg utils.Config, ecs cloud.ECSInterface, m metadata
 		meta:     m,
 		ecs:      ecs,
 		ad: DiskAttachDetach{
+			ecs:     ecs,
 			waiter:  waiter,
 			batcher: batcher,
 

pkg/disk/disk.go

@@ -133,7 +133,7 @@ func NewDriver(m metadata.MetadataProvider, endpoint string, serviceType utils.S
 		servers.ControllerServer = NewControllerServer(csiCfg, client, m)
 	}
 	if serviceType&utils.Node != 0 {
-		servers.NodeServer = NewNodeServer(m)
+		servers.NodeServer = NewNodeServer(client, m)
 	}
 	if features.FunctionalMutableFeatureGate.Enabled(features.EnableVolumeGroupSnapshots) {
 		servers.GroupControllerServer = NewGroupControllerServer()

pkg/disk/nodeserver.go

@@ -30,6 +30,7 @@ import (
 	"syscall"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud/metadata"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/disk/sfdisk"
@@ -171,7 +172,7 @@ func parseVolumeCountEnv() (int, error) {
 }
 
 // NewNodeServer creates node server
-func NewNodeServer(m metadata.MetadataProvider) csi.NodeServer {
+func NewNodeServer(ecs cloud.ECSInterface, m metadata.MetadataProvider) csi.NodeServer {
 	// Create Directory
 	err := os.MkdirAll(VolumeDir, os.FileMode(0755))
 	if err != nil {
@@ -224,6 +225,7 @@ func NewNodeServer(m metadata.MetadataProvider) csi.NodeServer {
 		podCGroup:    podCgroup,
 		clientSet:    GlobalConfigVar.ClientSet,
 		ad: DiskAttachDetach{
+			ecs:     ecs,
 			waiter:  waiter,
 			batcher: batcher,
 			// if ADController is not enabled, we need serial attach to recognize old disk