Chore: use any rather than interface{} (#74066)
This commit is contained in:
@@ -166,9 +166,9 @@ func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time)
|
||||
if q.isSearchExpression() {
|
||||
metricExpressions := &metricExpression{Expression: q.UsedExpression}
|
||||
metricExpressions.Label = q.Label
|
||||
link.Metrics = []interface{}{metricExpressions}
|
||||
link.Metrics = []any{metricExpressions}
|
||||
} else {
|
||||
metricStat := []interface{}{q.Namespace, q.MetricName}
|
||||
metricStat := []any{q.Namespace, q.MetricName}
|
||||
for dimensionKey, dimensionValues := range q.Dimensions {
|
||||
metricStat = append(metricStat, dimensionKey, dimensionValues[0])
|
||||
}
|
||||
@@ -181,7 +181,7 @@ func (q *CloudWatchQuery) BuildDeepLink(startTime time.Time, endTime time.Time)
|
||||
metricStatMeta.AccountId = *q.AccountId
|
||||
}
|
||||
metricStat = append(metricStat, metricStatMeta)
|
||||
link.Metrics = []interface{}{metricStat}
|
||||
link.Metrics = []any{metricStat}
|
||||
}
|
||||
|
||||
linkProps, err := json.Marshal(link)
|
||||
@@ -464,13 +464,13 @@ func getRetainedPeriods(timeSince time.Duration) []int {
|
||||
}
|
||||
}
|
||||
|
||||
func parseDimensions(dimensions map[string]interface{}) (map[string][]string, error) {
|
||||
func parseDimensions(dimensions map[string]any) (map[string][]string, error) {
|
||||
parsedDimensions := make(map[string][]string)
|
||||
for k, v := range dimensions {
|
||||
// This is for backwards compatibility. Before 6.5 dimensions values were stored as strings and not arrays
|
||||
if value, ok := v.(string); ok {
|
||||
parsedDimensions[k] = []string{value}
|
||||
} else if values, ok := v.([]interface{}); ok {
|
||||
} else if values, ok := v.([]any); ok {
|
||||
for _, value := range values {
|
||||
parsedDimensions[k] = append(parsedDimensions[k], value.(string))
|
||||
}
|
||||
|
||||
@@ -903,7 +903,7 @@ func Test_migrateAliasToDynamicLabel_single_query_preserves_old_alias_and_create
|
||||
MetricName: kindsys.Ptr("CPUUtilization"),
|
||||
Alias: kindsys.Ptr(tc.inputAlias),
|
||||
Dimensions: &dataquery.Dimensions{
|
||||
"InstanceId": []interface{}{"test"},
|
||||
"InstanceId": []any{"test"},
|
||||
},
|
||||
Statistic: &average,
|
||||
Period: kindsys.Ptr("600"),
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func parseDimensionFilter(dimensionFilter string) ([]*Dimension, error) {
|
||||
dimensionFilters := map[string]interface{}{}
|
||||
dimensionFilters := map[string]any{}
|
||||
dimensionFilterJson := []byte(dimensionFilter)
|
||||
if len(dimensionFilterJson) > 0 {
|
||||
err := json.Unmarshal(dimensionFilterJson, &dimensionFilters)
|
||||
@@ -33,7 +33,7 @@ func parseDimensionFilter(dimensionFilter string) ([]*Dimension, error) {
|
||||
// due to legacy, value can be a string, a string slice or nil
|
||||
if vv, ok := v.(string); ok {
|
||||
addDimension(k, vv)
|
||||
} else if vv, ok := v.([]interface{}); ok {
|
||||
} else if vv, ok := v.([]any); ok {
|
||||
for _, v := range vv {
|
||||
addDimension(k, v.(string))
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ func LoadCloudWatchSettings(config backend.DataSourceInstanceSettings) (CloudWat
|
||||
}
|
||||
|
||||
func (duration *Duration) UnmarshalJSON(b []byte) error {
|
||||
var unmarshalledJson interface{}
|
||||
var unmarshalledJson any
|
||||
|
||||
err := json.Unmarshal(b, &unmarshalledJson)
|
||||
if err != nil {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package models
|
||||
|
||||
type cloudWatchLink struct {
|
||||
View string `json:"view"`
|
||||
Stacked bool `json:"stacked"`
|
||||
Title string `json:"title"`
|
||||
Start string `json:"start"`
|
||||
End string `json:"end"`
|
||||
Region string `json:"region"`
|
||||
Metrics []interface{} `json:"metrics"`
|
||||
View string `json:"view"`
|
||||
Stacked bool `json:"stacked"`
|
||||
Title string `json:"title"`
|
||||
Start string `json:"start"`
|
||||
End string `json:"end"`
|
||||
Region string `json:"region"`
|
||||
Metrics []any `json:"metrics"`
|
||||
}
|
||||
|
||||
type metricExpression struct {
|
||||
|
||||
Reference in New Issue
Block a user