mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: use any rather than interface{} (#74066)
This commit is contained in:
@@ -8,16 +8,16 @@ import (
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
func logf(format string, a ...interface{}) {
|
||||
func logf(format string, a ...any) {
|
||||
//fmt.Printf(format, a...)
|
||||
}
|
||||
|
||||
type templateVariable struct {
|
||||
current struct {
|
||||
value interface{}
|
||||
value any
|
||||
}
|
||||
name string
|
||||
query interface{}
|
||||
query any
|
||||
variableType string
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ func (d *datasourceVariableLookup) add(templateVariable templateVariable) {
|
||||
return
|
||||
}
|
||||
|
||||
if values, multiValueVariable := templateVariable.current.value.([]interface{}); multiValueVariable {
|
||||
if values, multiValueVariable := templateVariable.current.value.([]any); multiValueVariable {
|
||||
for _, value := range values {
|
||||
if valueAsString, ok := value.(string); ok {
|
||||
refs = append(refs, d.getDsRefsByTemplateVariableValue(valueAsString, datasourceType)...)
|
||||
@@ -179,7 +179,7 @@ func readDashboard(stream io.Reader, lookup DatasourceLookup) (*dashboardInfo, e
|
||||
}
|
||||
|
||||
case "time":
|
||||
obj, ok := iter.Read().(map[string]interface{})
|
||||
obj, ok := iter.Read().(map[string]any)
|
||||
if ok {
|
||||
if timeFrom, ok := obj["from"].(string); ok {
|
||||
dash.TimeFrom = timeFrom
|
||||
|
||||
@@ -29,7 +29,7 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
// This implementation moves datasources referenced by internal ID or name to UID
|
||||
func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) entity.EntitySummaryBuilder {
|
||||
return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
|
||||
var parsed map[string]interface{}
|
||||
var parsed map[string]any
|
||||
|
||||
if sanitize {
|
||||
err := json.Unmarshal(body, &parsed)
|
||||
@@ -44,7 +44,7 @@ func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) en
|
||||
|
||||
summary := &entity.EntitySummary{
|
||||
Labels: make(map[string]string),
|
||||
Fields: make(map[string]interface{}),
|
||||
Fields: make(map[string]any),
|
||||
}
|
||||
stream := bytes.NewBuffer(body)
|
||||
dash, err := readDashboard(stream, lookup)
|
||||
@@ -74,7 +74,7 @@ func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) en
|
||||
}
|
||||
p.Name = panel.Title
|
||||
p.Description = panel.Description
|
||||
p.Fields = make(map[string]interface{}, 0)
|
||||
p.Fields = make(map[string]any, 0)
|
||||
p.Fields["type"] = panel.Type
|
||||
|
||||
if panel.Type != "row" {
|
||||
|
||||
@@ -38,7 +38,7 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
Kind: entity.StandardKindDataFrame,
|
||||
Name: df.Name,
|
||||
UID: uid,
|
||||
Fields: map[string]interface{}{
|
||||
Fields: map[string]any{
|
||||
"rows": rows,
|
||||
"cols": len(df.Fields),
|
||||
},
|
||||
|
||||
@@ -28,7 +28,7 @@ func GetEntitySummaryBuilder(kind string) entity.EntitySummaryBuilder {
|
||||
"tag1": "",
|
||||
"tag2": "",
|
||||
},
|
||||
Fields: map[string]interface{}{
|
||||
Fields: map[string]any{
|
||||
"field1": "a string",
|
||||
"field2": 1.224,
|
||||
"field4": true,
|
||||
|
||||
@@ -22,7 +22,7 @@ func GetEntityKindInfo() entity.EntityKindInfo {
|
||||
// Very basic geojson validator
|
||||
func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
|
||||
var geojson map[string]interface{}
|
||||
var geojson map[string]any
|
||||
err := json.Unmarshal(body, &geojson)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
@@ -42,13 +42,13 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
Kind: entity.StandardKindGeoJSON,
|
||||
Name: store.GuessNameFromUID(uid),
|
||||
UID: uid,
|
||||
Fields: map[string]interface{}{
|
||||
Fields: map[string]any{
|
||||
"type": ftype,
|
||||
},
|
||||
}
|
||||
|
||||
if ftype == "FeatureCollection" {
|
||||
features, ok := geojson["features"].([]interface{})
|
||||
features, ok := geojson["features"].([]any)
|
||||
if ok {
|
||||
summary.Fields["count"] = len(features)
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ func GetEntityKindInfo() entity.EntityKindInfo {
|
||||
|
||||
func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
return func(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
|
||||
v := make(map[string]interface{})
|
||||
v := make(map[string]any)
|
||||
err := json.Unmarshal(body, &v)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
|
||||
@@ -33,7 +33,7 @@ func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
|
||||
Kind: entity.StandardKindSVG,
|
||||
Name: store.GuessNameFromUID(uid),
|
||||
UID: uid,
|
||||
Fields: map[string]interface{}{
|
||||
Fields: map[string]any{
|
||||
"width": int64(size.X),
|
||||
"height": int64(size.Y),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user