InfluxDB: Use database input for SQL configuration instead of metadata (#79579)

* introduce constants file

* update frontend to use database field

* use dbName field instead of metadata

* use secureGrpc

* betterer
This commit is contained in:
ismail simsek
2023-12-15 18:41:32 +01:00
committed by GitHub
parent d89a8a3a82
commit 2edcf0edbd
9 changed files with 58 additions and 146 deletions
+2 -10
View File
@@ -98,17 +98,9 @@ func runnerFromDataSource(dsInfo *models.DatasourceInfo) (*runner, error) {
}
md := metadata.MD{}
for _, m := range dsInfo.Metadata {
for k, v := range m {
if _, ok := md[k]; ok {
return nil, fmt.Errorf("metadata: duplicate key: %s", k)
}
if k != "" {
md.Set(k, v)
}
}
if dsInfo.DbName != "" {
md.Set("database", dsInfo.DbName)
}
if dsInfo.Token != "" {
md.Set("Authorization", fmt.Sprintf("Bearer %s", dsInfo.Token))
}
@@ -63,11 +63,6 @@ func (suite *FSQLTestSuite) TestIntegration_QueryData() {
DbName: "influxdb",
Version: "test",
HTTPMode: "proxy",
Metadata: []map[string]string{
{
"bucket": "bucket",
},
},
SecureGrpc: false,
},
backend.QueryDataRequest{
-1
View File
@@ -81,7 +81,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
TimeInterval: jsonData.TimeInterval,
DefaultBucket: jsonData.DefaultBucket,
Organization: jsonData.Organization,
Metadata: jsonData.Metadata,
MaxSeries: maxSeries,
SecureGrpc: true,
Token: settings.DecryptedSecureJSONData["token"],
@@ -18,8 +18,6 @@ type DatasourceInfo struct {
Organization string `json:"organization"`
MaxSeries int `json:"maxSeries"`
// Flight SQL metadata
Metadata []map[string]string `json:"metadata"`
// FlightSQL grpc connection
SecureGrpc bool `json:"secureGrpc"`
}