Update FindTag() method to support ALL option

innodreamer · Aug 20, 2024 · 65d15b1 · 65d15b1
1 parent f5e6a11
commit 65d15b1
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 25 deletions.
diff --git a/cloud-control-manager/cloud-driver/drivers/ktcloud/main/Test_TagHandler.go b/cloud-control-manager/cloud-driver/drivers/ktcloud/main/Test_TagHandler.go
@@ -62,7 +62,8 @@ func handleTag() {
 
 		// rsType := irs.RSType(irs.VM)
 		// rsType := irs.RSType(irs.MYIMAGE)
-		rsType := irs.RSType(irs.DISK)
+		// rsType := irs.RSType(irs.DISK)
+		rsType := irs.RSType(irs.ALL)
 
 		rsIId := irs.IID{
 			NameId: "MyVM-1",			

diff --git a/cloud-control-manager/cloud-driver/drivers/ktcloud/resources/TagHandler.go b/cloud-control-manager/cloud-driver/drivers/ktcloud/resources/TagHandler.go
@@ -198,35 +198,73 @@ func (tagHandler *KtCloudTagHandler) FindTag(resType irs.RSType, keyword string)
 		return nil, newErr
 	}
 
-	tagList, err := tagHandler.getTagList(resType)
-	if err != nil {
-		newErr := fmt.Errorf("Failed to Get Tag List : [%v]", err)
-		cblogger.Error(newErr.Error())
-		return nil, newErr
-	}
-
+	var tagList []ktsdk.Tag
 	var tagInfoList []*irs.TagInfo
-	for _, curTag := range tagList {
-		if strings.Contains(curTag.Key, keyword) || strings.Contains(curTag.Value, keyword) {
-			var tagKVList []irs.KeyValue 
-			tagKV := irs.KeyValue {
-				Key: 	curTag.Key,
-				Value: 	curTag.Value,
+
+	if resType == irs.RSType(irs.ALL) {
+		resTypes := []irs.RSType{irs.RSType(irs.VM), irs.RSType(irs.MYIMAGE), irs.RSType(irs.DISK)}
+		for _, curType := range resTypes {
+			var err error
+			tagList, err = tagHandler.getTagList(curType)
+			if err != nil {
+				newErr := fmt.Errorf("Failed to Get Tag List : [%v]", err)
+				cblogger.Error(newErr.Error())
+				return nil, newErr
 			}
-			tagKVList = append(tagKVList, tagKV)
-
-			tagInfo := &irs.TagInfo {
-				ResType : resType,
-				ResIId  : irs.IID {
-							NameId : "",
-							SystemId: curTag.ResourceId,
-						},
-				TagList : tagKVList,
-				// KeyValueList: 		,	// reserved for optinal usage
+			for _, curTag := range tagList {
+				if strings.Contains(curTag.Key, keyword) || strings.Contains(curTag.Value, keyword) {
+					var tagKVList []irs.KeyValue 
+					tagKV := irs.KeyValue {
+						Key: 	curTag.Key,
+						Value: 	curTag.Value,
+					}
+					tagKVList = append(tagKVList, tagKV)
+
+					tagInfo := &irs.TagInfo {
+						ResType : curType,
+						ResIId  : irs.IID {
+									NameId : "",
+									SystemId: curTag.ResourceId,
+								},
+						TagList : tagKVList,
+						// KeyValueList: 		,	// reserved for optinal usage
+					}
+					tagInfoList = append(tagInfoList, tagInfo)
+				}
+			}
+		}
+	} else {
+		var err error
+		tagList, err = tagHandler.getTagList(resType)
+		if err != nil {
+			newErr := fmt.Errorf("Failed to Get Tag List : [%v]", err)
+			cblogger.Error(newErr.Error())
+			return nil, newErr
+		}
+
+		for _, curTag := range tagList {
+			if strings.Contains(curTag.Key, keyword) || strings.Contains(curTag.Value, keyword) {
+				var tagKVList []irs.KeyValue 
+				tagKV := irs.KeyValue {
+					Key: 	curTag.Key,
+					Value: 	curTag.Value,
+				}
+				tagKVList = append(tagKVList, tagKV)
+
+				tagInfo := &irs.TagInfo {
+					ResType : resType,
+					ResIId  : irs.IID {
+								NameId : "",
+								SystemId: curTag.ResourceId,
+							},
+					TagList : tagKVList,
+					// KeyValueList: 		,	// reserved for optinal usage
+				}
+				tagInfoList = append(tagInfoList, tagInfo)
 			}
-			tagInfoList = append(tagInfoList, tagInfo)
 		}
 	}
+
 	return tagInfoList, nil
 }