Enhance error handling for DataDiskIds in mcis provision

cloud-barista · Nov 5, 2022 · b297ead · b297ead
1 parent a6d4bd9
commit b297ead
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/core/mcis/provisioning.go b/src/core/mcis/provisioning.go
@@ -1619,13 +1619,15 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo, option string) e
 
 		var DataDiskIdsTmp []string
 		for _, v := range vmInfoData.DataDiskIds {
-			CspDataDiskId, err := common.GetCspResourceId(nsId, common.StrDataDisk, v)
-			if CspDataDiskId == "" {
-				common.CBLog.Error(err)
-				return err
+			// ignore DataDiskIds == "", assume it is ignorable mistake
+			if v != "" {
+				CspDataDiskId, err := common.GetCspResourceId(nsId, common.StrDataDisk, v)
+				if err != nil || CspDataDiskId == "" {
+					common.CBLog.Error(err)
+					return err
+				}
+				DataDiskIdsTmp = append(DataDiskIdsTmp, CspDataDiskId)
 			}
-
-			DataDiskIdsTmp = append(DataDiskIdsTmp, CspDataDiskId)
 		}
 		tempReq.ReqInfo.DataDiskNames = DataDiskIdsTmp