Skip to content

Commit 40ccd73

Browse files
beizhanyongtravilyu
authored andcommitted
[feature] Return value adjustment when notetype equals internet_ip
**Phenomenon and reproduction steps** **Root cause and solution** **Impactions** **Test method** **Affected branch(es)** * main **Checklist** - [ ] Dependencies update required - [ ] Common bug (similar problem in other repo)
1 parent fa1eefb commit 40ccd73

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

deepflow-querier-datasource/pkg/formattools/formattools.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,9 @@ func AddResourceFieldsInData(ss map[string]interface{}, role string) {
7373
ss[prefix+"resource_type"] = nodeType
7474

7575
if nodeType == "ip" || nodeType == "internet_ip" {
76-
if v, ok := ss["subnet_id"+suffix]; ok {
77-
str := fmt.Sprintf("%v", v)
78-
ss[prefix+"resource_id"] = ss["ip"+suffix].(string) + "(" + str + ")"
79-
} else {
80-
ss[prefix+"resource_id"] = ss["ip"+suffix]
81-
}
82-
ss[prefix+"resource"] = ss["ip"+suffix]
76+
str := fmt.Sprintf("%v(%v)", ss[resourceKeyPrefix+suffix], ss[resourceKeyPrefix+"_id"+suffix])
77+
ss[prefix+"resource_id"] = str
78+
ss[prefix+"resource"] = ss[resourceKeyPrefix+suffix]
8379
} else {
8480
if v, ok := ss[nodeType+"_id"+suffix]; ok {
8581
ss[prefix+"resource_id"] = v

0 commit comments

Comments
 (0)