Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(server): validate flux template type variable upon update/save

pull/5697/head
Pavel Zavora 2021-03-11 12:57:33 +01:00
parent c807246ef5
commit d833b03529
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/templates.go
View File

@ -22,7 +22,7 @@ func ValidTemplateRequest(template *chronograf.Template) error {
switch v.Type { switch v.Type {
default: default:
return fmt.Errorf("Unknown template variable type %s", v.Type) return fmt.Errorf("Unknown template variable type %s", v.Type)
case "csv", "map", "fieldKey", "tagKey", "tagValue", "measurement", "database", "constant", "influxql": case "csv", "map", "fieldKey", "tagKey", "tagValue", "measurement", "database", "constant", "influxql", "flux":
} }
if template.Type == "map" && v.Key == "" { if template.Type == "map" && v.Key == "" {
@ -30,8 +30,8 @@ func ValidTemplateRequest(template *chronograf.Template) error {
} }
} }
if template.Type == "influxql" && template.Query == nil { if (template.Type == "influxql" || template.Type == "flux") && template.Query == nil {
return fmt.Errorf("No query set for template of type 'influxql'") return fmt.Errorf("No query set for template of type '%s'", template.Type)
} }
return nil return nil

7
server/templates_test.go
View File

@ -60,6 +60,13 @@ func TestValidTemplateRequest(t *testing.T) {
Type: "influxql", Type: "influxql",
}, },
}, },
{
name: "No query set",
wantErr: true,
template: &chronograf.Template{
Type: "flux",
},
},
{ {
name: "Valid Map type", name: "Valid Map type",
template: &chronograf.Template{ template: &chronograf.Template{