[build] enhance api attach volume

vngcloud · Jul 1, 2024 · a18e2dc · a18e2dc
1 parent c34df86
commit a18e2dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cloud/icloud.go b/pkg/cloud/icloud.go
@@ -12,7 +12,7 @@ type Cloud interface {
 	GetVolumeByName(pvolName string) (*lsentity.Volume, lserr.IError)
 	GetVolume(volumeID string) (*lsentity.Volume, lserr.IError)
 	DeleteVolume(volID string) lserr.IError
-	AttachVolume(instanceID, volumeID string) (*lsentity.Volume, error)
+	AttachVolume(instanceID, volumeID string) (*lsentity.Volume, lserr.IError)
 	DetachVolume(instanceID, volumeID string) lserr.IError
 	ModifyVolumeType(pvolumeId, pvolumeType string, psize int) lserr.IError
 	ResizeOrModifyDisk(volumeID string, newSizeBytes int64, options *ModifyDiskOptions) (newSize int64, err error)

diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -307,9 +307,9 @@ func (s *controllerService) ControllerPublishVolume(pctx lctx.Context, preq *lcs
 	llog.InfoS("[INFO] - ControllerPublishVolume: attaching volume into the instance", "volumeID", volumeID, "nodeID", nodeID)
 
 	// Attach the volume and wait for it to be attached
-	_, err = s.cloud.AttachVolume(nodeID, volumeID)
-	if err != nil {
-		llog.ErrorS(err, "[ERROR] - ControllerPublishVolume; failed to attach volume to instance", "volumeID", volumeID, "nodeID", nodeID)
+	_, ierr := s.cloud.AttachVolume(nodeID, volumeID)
+	if ierr != nil {
+		llog.ErrorS(ierr.GetError(), "[ERROR] - ControllerPublishVolume; failed to attach volume to instance", "volumeID", volumeID, "nodeID", nodeID)
 		return nil, ErrAttachVolume(volumeID, nodeID)
 	}