public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: use any rather than interface{} (#74066)

Browse Source
This commit is contained in:
Ryan McKinley
2023-08-30 18:46:47 +03:00
committed by GitHub
parent 3e272d2bda
commit 025b2f3011
525 changed files with 2528 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/alerting/api_admin_configuration_test.go
+11 -11
View File
@@ -79,7 +79,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := getRequest(t, alertsURL, http.StatusNotFound) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "no admin configuration available", res["message"])
@@ -99,7 +99,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, alertsURL, buf.String(), http.StatusBadRequest) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "Invalid alertmanager choice specified", res["message"])
@@ -120,7 +120,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, alertsURL, buf.String(), http.StatusBadRequest) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "At least one Alertmanager must be provided or configured as a datasource that handles alerts to choose this option", res["message"])
@@ -134,7 +134,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
Type: datasources.DS_ALERTMANAGER,
Access: "proxy",
URL: fakeAM1.URL(),
JsonData: simplejson.NewFromAny(map[string]interface{}{
JsonData: simplejson.NewFromAny(map[string]any{
"handleGrafanaManagedAlerts": true,
"implementation": "prometheus",
}),
@@ -147,7 +147,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, dataSourcesUrl, buf.String(), http.StatusOK) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "Datasource added", res["message"])
@@ -161,7 +161,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
Type: datasources.DS_ALERTMANAGER,
Access: "proxy",
URL: fakeAM2.URL(),
JsonData: simplejson.NewFromAny(map[string]interface{}{
JsonData: simplejson.NewFromAny(map[string]any{
"handleGrafanaManagedAlerts": true,
"implementation": "prometheus",
}),
@@ -174,7 +174,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, dataSourcesUrl, buf.String(), http.StatusOK) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "Datasource added", res["message"])
@@ -195,7 +195,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, alertsURL, buf.String(), http.StatusCreated) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "admin configuration updated", res["message"])
@@ -290,7 +290,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
Type: datasources.DS_ALERTMANAGER,
Access: "proxy",
URL: fakeAM3.URL(),
JsonData: simplejson.NewFromAny(map[string]interface{}{
JsonData: simplejson.NewFromAny(map[string]any{
"handleGrafanaManagedAlerts": true,
"implementation": "prometheus",
}),
@@ -303,7 +303,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, dataSourcesUrl, buf.String(), http.StatusOK) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "Datasource added", res["message"])
@@ -322,7 +322,7 @@ func TestIntegrationAdminConfiguration_SendingToExternalAlertmanagers(t *testing
resp := postRequest(t, alertsURL, buf.String(), http.StatusCreated) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
err = json.Unmarshal(b, &res)
require.NoError(t, err)
require.Equal(t, "admin configuration updated", res["message"])
pkg/tests/api/alerting/api_alertmanager_configuration_test.go
+2 -2
View File
@@ -100,7 +100,7 @@ func TestIntegrationAlertmanagerConfigurationIsTransactional(t *testing.T) {
resp := postRequest(t, alertConfigURL, payload, http.StatusBadRequest) // nolint
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Regexp(t, `^failed to save and apply Alertmanager configuration: failed to validate integration "slack.receiver" \(UID [^\)]+\) of type "slack": token must be specified when using the Slack chat API`, res["message"])
resp = getRequest(t, alertConfigURL, http.StatusOK) // nolint
@@ -223,7 +223,7 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
resp := postRequest(t, alertConfigURL, payload, http.StatusBadRequest) // nolint
s := getBody(t, resp.Body)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal([]byte(s), &res))
require.Equal(t, "unknown receiver: invalid", res["message"])
}
pkg/tests/api/alerting/api_alertmanager_test.go
+5 -5
View File
@@ -449,7 +449,7 @@ func TestIntegrationAlertAndGroupsQuery(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, http.StatusUnauthorized, resp.StatusCode)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
assert.Equal(t, "Invalid username or password", res["message"])
}
@@ -1341,7 +1341,7 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
status, body := apiClient.PostRulesGroup(t, "default", &rules)
assert.Equal(t, http.StatusNotFound, status)
var res map[string]interface{}
var res map[string]any
assert.NoError(t, json.Unmarshal([]byte(body), &res))
require.Equal(t, "failed to update rule group: failed to update rule with UID unknown because could not find alert rule", res["message"])
@@ -1447,7 +1447,7 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
}
status, body := apiClient.PostRulesGroup(t, "default", &rules)
assert.Equal(t, http.StatusBadRequest, status)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal([]byte(body), &res))
require.Equal(t, fmt.Sprintf("rule [1] has UID %s that is already assigned to another rule at index 0", ruleUID), res["message"])
@@ -1813,7 +1813,7 @@ func TestIntegrationAlertRuleCRUD(t *testing.T) {
require.NoError(t, err)
require.Equal(t, http.StatusAccepted, resp.StatusCode)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, "rules deleted", res["message"])
})
@@ -1995,7 +1995,7 @@ func TestIntegrationQuota(t *testing.T) {
}
status, body := apiClient.PostRulesGroup(t, "default", &rules)
assert.Equal(t, http.StatusForbidden, status)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal([]byte(body), &res))
require.Equal(t, "quota has been exceeded", res["message"])
})
pkg/tests/api/alerting/api_prometheus_test.go
+4 -4
View File
@@ -210,7 +210,7 @@ func TestIntegrationPrometheusRules(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, 400, resp.StatusCode)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, "invalid rule specification at index [0]: both annotations __dashboardUid__ and __panelId__ must be specified", res["message"])
}
@@ -618,7 +618,7 @@ func TestIntegrationPrometheusRulesFilterByDashboard(t *testing.T) {
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, `invalid panel_id: strconv.ParseInt: parsing "invalid": invalid syntax`, res["message"])
}
@@ -636,7 +636,7 @@ func TestIntegrationPrometheusRulesFilterByDashboard(t *testing.T) {
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, "panel_id must be set with dashboard_uid", res["message"])
}
@@ -802,5 +802,5 @@ type rulesData struct {
type groupData struct {
Name string
File string
Rules []interface{}
Rules []any
}
pkg/tests/api/alerting/api_ruler_test.go
+4 -4
View File
@@ -371,7 +371,7 @@ func TestIntegrationAlertRuleConflictingTitle(t *testing.T) {
status, body := apiClient.PostRulesGroup(t, "folder1", &rulesWithUID)
assert.Equal(t, http.StatusInternalServerError, status)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal([]byte(body), &res))
require.Equal(t, "failed to update rule group: failed to add rules: a conflicting alert rule is found: rule title under the same organisation and folder should be unique", res["message"])
})
@@ -383,7 +383,7 @@ func TestIntegrationAlertRuleConflictingTitle(t *testing.T) {
status, body := apiClient.PostRulesGroup(t, "folder1", &rulesWithUID)
assert.Equal(t, http.StatusInternalServerError, status)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal([]byte(body), &res))
require.Equal(t, "failed to update rule group: failed to update rules: a conflicting alert rule is found: rule title under the same organisation and folder should be unique", res["message"])
})
@@ -736,7 +736,7 @@ func TestIntegrationRulerRulesFilterByDashboard(t *testing.T) {
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, `invalid panel_id: strconv.ParseInt: parsing "invalid": invalid syntax`, res["message"])
}
@@ -754,7 +754,7 @@ func TestIntegrationRulerRulesFilterByDashboard(t *testing.T) {
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
var res map[string]any
require.NoError(t, json.Unmarshal(b, &res))
require.Equal(t, "panel_id must be set with dashboard_uid", res["message"])
}
pkg/tests/api/azuremonitor/azuremonitor_test.go
+6 -6
View File
@@ -44,13 +44,13 @@ func TestIntegrationAzureMonitor(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpHeaderName1": "X-CUSTOM-HEADER",
"clientId": "test-client-id",
"tenantId": "test-tenant-id",
"cloudName": "customizedazuremonitor",
"customizedRoutes": map[string]interface{}{
"Azure Monitor": map[string]interface{}{
"customizedRoutes": map[string]any{
"Azure Monitor": map[string]any{
"URL": outgoingServer.URL,
"Headers": map[string]string{
"custom-azure-header": "custom-azure-value",
@@ -77,13 +77,13 @@ func TestIntegrationAzureMonitor(t *testing.T) {
require.NoError(t, err)
t.Run("When calling /api/ds/query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"type": "grafana-azure-monitor-datasource",
"uid": uid,
},
"queryType": "Azure Monitor",
"azureMonitor": map[string]interface{}{
"azureMonitor": map[string]any{
"resourceGroup": "test-rg",
"metricNamespace": "microsoft.storage/storageaccounts",
"resourceName": "testacct",
pkg/tests/api/correlations/correlations_create_test.go
+1 -1
View File
@@ -266,7 +266,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
require.Equal(t, label, response.Result.Label)
require.Equal(t, configType, response.Result.Config.Type)
require.Equal(t, fieldName, response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "foo"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "foo"}, response.Result.Config.Target)
require.Equal(t, transformation, response.Result.Config.Transformations[0])
require.Equal(t, transformation2, response.Result.Config.Transformations[1])
pkg/tests/api/correlations/correlations_read_test.go
+1 -1
View File
@@ -80,7 +80,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
Config: correlations.CorrelationConfig{
Type: correlations.ConfigTypeQuery,
Field: "foo",
Target: map[string]interface{}{},
Target: map[string]any{},
Transformations: []correlations.Transformation{
{Type: "logfmt"},
},
pkg/tests/api/correlations/correlations_update_test.go
+7 -7
View File
@@ -266,7 +266,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
Config: correlations.CorrelationConfig{
Field: "fieldName",
Type: "query",
Target: map[string]interface{}{"expr": "foo"},
Target: map[string]any{"expr": "foo"},
},
})
@@ -298,7 +298,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "1", response.Result.Label)
require.Equal(t, "1", response.Result.Description)
require.Equal(t, "field", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "bar"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "bar"}, response.Result.Config.Target)
require.Equal(t, correlations.Transformation{Type: "logfmt"}, response.Result.Config.Transformations[0])
require.NoError(t, res.Body.Close())
@@ -322,7 +322,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "2", response.Result.Label)
require.Equal(t, "1", response.Result.Description)
require.Equal(t, "field", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "bar"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "bar"}, response.Result.Config.Target)
require.NoError(t, res.Body.Close())
// partially updating only description
@@ -345,7 +345,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "2", response.Result.Label)
require.Equal(t, "2", response.Result.Description)
require.Equal(t, "field", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "bar"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "bar"}, response.Result.Config.Target)
require.NoError(t, res.Body.Close())
// partially updating whole config
@@ -372,7 +372,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "2", response.Result.Label)
require.Equal(t, "2", response.Result.Description)
require.Equal(t, "name", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "baz"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "baz"}, response.Result.Config.Target)
require.NoError(t, res.Body.Close())
// partially updating only config field
@@ -397,7 +397,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "2", response.Result.Label)
require.Equal(t, "2", response.Result.Description)
require.Equal(t, "newName", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "baz"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "baz"}, response.Result.Config.Target)
require.NoError(t, res.Body.Close())
// partially updating only config target
@@ -422,7 +422,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
require.Equal(t, "2", response.Result.Label)
require.Equal(t, "2", response.Result.Description)
require.Equal(t, "newName", response.Result.Config.Field)
require.Equal(t, map[string]interface{}{"expr": "foo"}, response.Result.Config.Target)
require.Equal(t, map[string]any{"expr": "foo"}, response.Result.Config.Target)
require.NoError(t, res.Body.Close())
// setting label, description and config field to empty strings (testing whether empty strings are handled correctly)
pkg/tests/api/elasticsearch/elasticsearch_test.go
+5 -5
View File
@@ -44,7 +44,7 @@ func TestIntegrationElasticsearch(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpMethod": "post",
"httpHeaderName1": "X-CUSTOM-HEADER",
"timeField": "@timestamp",
@@ -70,15 +70,15 @@ func TestIntegrationElasticsearch(t *testing.T) {
require.NoError(t, err)
t.Run("When calling /api/ds/query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"rawQuery": "*",
"type": "",
"timeField": "@timestamp",
"metrics": []interface{}{
map[string]interface{}{
"metrics": []any{
map[string]any{
"type": "logs",
},
},
pkg/tests/api/graphite/graphite_test.go
+3 -3
View File
@@ -44,7 +44,7 @@ func TestIntegrationGraphite(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpMethod": "post",
"httpHeaderName1": "X-CUSTOM-HEADER",
})
@@ -69,8 +69,8 @@ func TestIntegrationGraphite(t *testing.T) {
require.NoError(t, err)
t.Run("When calling query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"expr": "up",
pkg/tests/api/influxdb/influxdb_test.go
+3 -3
View File
@@ -44,7 +44,7 @@ func TestIntegrationInflux(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpMethod": "post",
"httpHeaderName1": "X-CUSTOM-HEADER",
})
@@ -69,8 +69,8 @@ func TestIntegrationInflux(t *testing.T) {
require.NoError(t, err)
t.Run("When calling query?db=mybucket&epoch=ms should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"expr": "up",
pkg/tests/api/opentdsb/opentdsb_test.go
+3 -3
View File
@@ -44,7 +44,7 @@ func TestIntegrationOpenTSDB(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpMethod": "post",
"httpHeaderName1": "X-CUSTOM-HEADER",
})
@@ -69,8 +69,8 @@ func TestIntegrationOpenTSDB(t *testing.T) {
require.NoError(t, err)
t.Run("When calling query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"expr": "up",
pkg/tests/api/plugins/backendplugin/backendplugin_test.go
+1 -1
View File
@@ -40,7 +40,7 @@ func TestIntegrationBackendPlugins(t *testing.T) {
RefreshToken: "refresh-token",
Expiry: time.Now().UTC().Add(24 * time.Hour),
}
oauthToken = oauthToken.WithExtra(map[string]interface{}{"id_token": "id-token"})
oauthToken = oauthToken.WithExtra(map[string]any{"id_token": "id-token"})
newTestScenario(t, "Datasource with no custom HTTP settings",
options(
pkg/tests/api/prometheus/prometheus_test.go
+5 -5
View File
@@ -43,7 +43,7 @@ func TestIntegrationPrometheus(t *testing.T) {
}))
t.Cleanup(outgoingServer.Close)
jsonData := simplejson.NewFromAny(map[string]interface{}{
jsonData := simplejson.NewFromAny(map[string]any{
"httpMethod": "post",
"httpHeaderName1": "X-CUSTOM-HEADER",
"customQueryParameters": "q1=1&q2=2",
@@ -69,8 +69,8 @@ func TestIntegrationPrometheus(t *testing.T) {
require.NoError(t, err)
t.Run("When calling /api/ds/query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"expr": "1",
@@ -101,8 +101,8 @@ func TestIntegrationPrometheus(t *testing.T) {
})
t.Run("When calling /api/ds/query should set expected headers on outgoing HTTP request", func(t *testing.T) {
query := simplejson.NewFromAny(map[string]interface{}{
"datasource": map[string]interface{}{
query := simplejson.NewFromAny(map[string]any{
"datasource": map[string]any{
"uid": uid,
},
"expr": "up",