move ECS inteface to its own package

this maybe used by multiple drivers
mozillazg · Sep 25, 2023 · 4b23ffc · 4b23ffc
1 parent 5f5dfe6
commit 4b23ffc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -55,5 +55,5 @@ build-nas:
 build-disk:
 	./build/build-disk.sh "" $(REPONAME)
 
-pkg/disk/ecsmock.go: pkg/disk/ecsinterface.go
-	mockgen -source pkg/disk/ecsinterface.go -destination $@ -package disk
+pkg/cloud/ecsmock.go: pkg/cloud/ecsinterface.go
+	mockgen -source pkg/cloud/ecsinterface.go -destination $@ -package cloud
diff --git a/pkg/disk/ecsinterface.go → pkg/cloud/ecsinterface.go b/pkg/disk/ecsinterface.go → pkg/cloud/ecsinterface.go
@@ -1,4 +1,4 @@
-package disk
+package cloud
 
 import "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 

diff --git a/pkg/disk/ecsmock.go → pkg/cloud/ecsmock.go b/pkg/disk/ecsmock.go → pkg/cloud/ecsmock.go
diff --git a/pkg/disk/cloud.go b/pkg/disk/cloud.go
@@ -27,6 +27,7 @@ import (
 	alicloudErr "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
 	log "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/log"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
 	perrors "github.com/pkg/errors"
@@ -1050,7 +1051,7 @@ func IsDiskCreatedByCsi(disk ecs.Disk) bool {
 	return false
 }
 
-func deleteDisk(ecsClient ECSInterface, diskId string) (*ecs.DeleteDiskResponse, error) {
+func deleteDisk(ecsClient cloud.ECSInterface, diskId string) (*ecs.DeleteDiskResponse, error) {
 	deleteDiskRequest := ecs.CreateDeleteDiskRequest()
 	deleteDiskRequest.DiskId = diskId
 

diff --git a/pkg/disk/cloud_test.go b/pkg/disk/cloud_test.go
@@ -6,6 +6,7 @@ import (
 	alicloudErr "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 	gomock "github.com/golang/mock/gomock"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
 	csilog "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/log"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -23,7 +24,7 @@ func init() {
 
 func TestDeleteDisk(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	c := NewMockECSInterface(ctrl)
+	c := cloud.NewMockECSInterface(ctrl)
 
 	c.EXPECT().DeleteDisk(gomock.Any()).Return(deleteDiskResponse, nil)
 
@@ -33,7 +34,7 @@ func TestDeleteDisk(t *testing.T) {
 
 func TestDeleteDiskRetryOnInitError(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	c := NewMockECSInterface(ctrl)
+	c := cloud.NewMockECSInterface(ctrl)
 
 	initErr := alicloudErr.NewServerError(400, `{"Code": "IncorrectDiskStatus.Initializing"}`, "")
 	c.EXPECT().DeleteDisk(gomock.Any()).Return(nil, initErr)
@@ -45,7 +46,7 @@ func TestDeleteDiskRetryOnInitError(t *testing.T) {
 
 func TestDeleteDiskPassthroughError(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	c := NewMockECSInterface(ctrl)
+	c := cloud.NewMockECSInterface(ctrl)
 
 	serverErr := alicloudErr.NewServerError(400, `{"Code": "AnyOtherErrors"}`, "")
 	c.EXPECT().DeleteDisk(gomock.Any()).Return(nil, serverErr)

diff --git a/pkg/disk/utils.go b/pkg/disk/utils.go
@@ -48,6 +48,7 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	volumeSnapshotV1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	snapClientset "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
 	proto "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/disk/proto"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
@@ -1170,7 +1171,7 @@ func getBlockDeviceCapacity(devicePath string) float64 {
 	return float64(pos) / GBSIZE
 }
 
-func GetAvailableDiskTypes(ctx context.Context, c ECSInterface, instanceType, zoneID string) (types []string, err error) {
+func GetAvailableDiskTypes(ctx context.Context, c cloud.ECSInterface, instanceType, zoneID string) (types []string, err error) {
 	request := ecs.CreateDescribeAvailableResourceRequest()
 	request.InstanceType = instanceType
 	request.DestinationResource = describeResourceType
@@ -1217,7 +1218,7 @@ func GetAvailableDiskTypes(ctx context.Context, c ECSInterface, instanceType, zo
 }
 
 // Retries for at most 1 hour if ECS OpenAPI or k8s API server is unavailable
-func UpdateNode(nodes corev1.NodeInterface, c ECSInterface, maxDiskCount int64) {
+func UpdateNode(nodes corev1.NodeInterface, c cloud.ECSInterface, maxDiskCount int64) {
 	ctx, cancel := context.WithTimeout(context.Background(), UpdateNodeTimeout)
 	defer cancel()
 	nodeName := os.Getenv(kubeNodeName)

diff --git a/pkg/disk/utils_test.go b/pkg/disk/utils_test.go
@@ -35,6 +35,7 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 	gomock "github.com/golang/mock/gomock"
 	fakesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -307,7 +308,7 @@ func TestUpdateNode(t *testing.T) {
 			nodes := clientset.CoreV1().Nodes()
 
 			ctrl := gomock.NewController(t)
-			c := NewMockECSInterface(ctrl)
+			c := cloud.NewMockECSInterface(ctrl)
 
 			if !test.skipDiskLabel {
 				if test.retryECS {