Chore: Refactor backend plugin manager/tsdb query data (#34944)
Move QueryData method into backend plugin manager which HandleRequest uses to query data from plugin SDK supported data sources. This allowed us to remove a lot of code no longer needed. Ref #21510 Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
This commit is contained in:
co-authored by
Will Browne
parent
56e0efbb56
commit
b3e9087557
@@ -100,7 +100,15 @@ func newExecutor(logsService *LogsService, im instancemgmt.InstanceManager, cfg
|
||||
|
||||
func NewInstanceSettings() datasource.InstanceFactoryFunc {
|
||||
return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
|
||||
var jsonData map[string]string
|
||||
jsonData := struct {
|
||||
Profile string `json:"profile"`
|
||||
Region string `json:"defaulRegion"`
|
||||
AssumeRoleARN string `json:"assumeRoleArn"`
|
||||
ExternalID string `json:"externalId"`
|
||||
Endpoint string `json:"endpoint"`
|
||||
Namespace string `json:"customMetricsNamespaces"`
|
||||
AuthType string `json:"authType"`
|
||||
}{}
|
||||
|
||||
err := json.Unmarshal(settings.JSONData, &jsonData)
|
||||
if err != nil {
|
||||
@@ -108,18 +116,17 @@ func NewInstanceSettings() datasource.InstanceFactoryFunc {
|
||||
}
|
||||
|
||||
model := datasourceInfo{
|
||||
profile: jsonData["profile"],
|
||||
region: jsonData["defaultRegion"],
|
||||
assumeRoleARN: jsonData["assumeRoleArn"],
|
||||
externalID: jsonData["externalId"],
|
||||
endpoint: jsonData["endpoint"],
|
||||
namespace: jsonData["customMetricsNamespaces"],
|
||||
profile: jsonData.Profile,
|
||||
region: jsonData.Region,
|
||||
assumeRoleARN: jsonData.AssumeRoleARN,
|
||||
externalID: jsonData.ExternalID,
|
||||
endpoint: jsonData.Endpoint,
|
||||
namespace: jsonData.Namespace,
|
||||
datasourceID: settings.ID,
|
||||
}
|
||||
|
||||
atStr := jsonData["authType"]
|
||||
at := awsds.AuthTypeDefault
|
||||
switch atStr {
|
||||
switch jsonData.AuthType {
|
||||
case "credentials":
|
||||
at = awsds.AuthTypeSharedCreds
|
||||
case "keys":
|
||||
@@ -132,7 +139,7 @@ func NewInstanceSettings() datasource.InstanceFactoryFunc {
|
||||
at = awsds.AuthTypeDefault
|
||||
plog.Warn("Authentication type \"arn\" is deprecated, falling back to default")
|
||||
default:
|
||||
plog.Warn("Unrecognized AWS authentication type", "type", atStr)
|
||||
plog.Warn("Unrecognized AWS authentication type", "type", jsonData.AuthType)
|
||||
}
|
||||
|
||||
model.authType = at
|
||||
|
||||
Reference in New Issue
Block a user