Merge pull request #11611 from mjtrangoni/fix-unconvert-issues

fix unconvert issues

pkg/cmd/grafana-cli/services/services.go

@@ -42,7 +42,7 @@ func Init(version string, skipTLSVerify bool) {
 	}
 	}
 
 
 	HttpClient = http.Client{
 	HttpClient = http.Client{
-		Timeout:   time.Duration(10 * time.Second),
+		Timeout:   10 * time.Second,
 		Transport: tr,
 		Transport: tr,
 	}
 	}
 }
 }

pkg/components/apikeygen/apikeygen.go

@@ -33,7 +33,7 @@ func New(orgId int64, name string) KeyGenResult {
 
 
 	jsonString, _ := json.Marshal(jsonKey)
 	jsonString, _ := json.Marshal(jsonKey)
 
 
-	result.ClientSecret = base64.StdEncoding.EncodeToString([]byte(jsonString))
+	result.ClientSecret = base64.StdEncoding.EncodeToString(jsonString)
 	return result
 	return result
 }
 }
 
 
@@ -44,7 +44,7 @@ func Decode(keyString string) (*ApiKeyJson, error) {
 	}
 	}
 
 
 	var keyObj ApiKeyJson
 	var keyObj ApiKeyJson
-	err = json.Unmarshal([]byte(jsonString), &keyObj)
+	err = json.Unmarshal(jsonString, &keyObj)
 	if err != nil {
 	if err != nil {
 		return nil, ErrInvalidApiKey
 		return nil, ErrInvalidApiKey
 	}
 	}

pkg/components/imguploader/azureblobuploader.go

@@ -225,7 +225,7 @@ func (a *Auth) SignRequest(req *http.Request) {
 	)
 	)
 	decodedKey, _ := base64.StdEncoding.DecodeString(a.Key)
 	decodedKey, _ := base64.StdEncoding.DecodeString(a.Key)
 
 
-	sha256 := hmac.New(sha256.New, []byte(decodedKey))
+	sha256 := hmac.New(sha256.New, decodedKey)
 	sha256.Write([]byte(strToSign))
 	sha256.Write([]byte(strToSign))
 
 
 	signature := base64.StdEncoding.EncodeToString(sha256.Sum(nil))
 	signature := base64.StdEncoding.EncodeToString(sha256.Sum(nil))

pkg/components/null/float.go

@@ -50,7 +50,7 @@ func (f *Float) UnmarshalJSON(data []byte) error {
 	}
 	}
 	switch x := v.(type) {
 	switch x := v.(type) {
 	case float64:
 	case float64:
-		f.Float64 = float64(x)
+		f.Float64 = x
 	case map[string]interface{}:
 	case map[string]interface{}:
 		err = json.Unmarshal(data, &f.NullFloat64)
 		err = json.Unmarshal(data, &f.NullFloat64)
 	case nil:
 	case nil:

pkg/metrics/metrics.go

@@ -403,6 +403,6 @@ func sendUsageStats() {
 	out, _ := json.MarshalIndent(report, "", " ")
 	out, _ := json.MarshalIndent(report, "", " ")
 	data := bytes.NewBuffer(out)
 	data := bytes.NewBuffer(out)
 
 
-	client := http.Client{Timeout: time.Duration(5 * time.Second)}
+	client := http.Client{Timeout: 5 * time.Second}
 	go client.Post("https://stats.grafana.org/grafana-usage-report", "application/json", data)
 	go client.Post("https://stats.grafana.org/grafana-usage-report", "application/json", data)
 }
 }

pkg/models/datasource_cache.go

@@ -33,7 +33,7 @@ func (ds *DataSource) GetHttpClient() (*http.Client, error) {
 	}
 	}
 
 
 	return &http.Client{
 	return &http.Client{
-		Timeout:   time.Duration(30 * time.Second),
+		Timeout:   30 * time.Second,
 		Transport: transport,
 		Transport: transport,
 	}, nil
 	}, nil
 }
 }

pkg/plugins/models.go

@@ -69,7 +69,7 @@ func (pb *PluginBase) registerPlugin(pluginDir string) error {
 
 
 	for _, include := range pb.Includes {
 	for _, include := range pb.Includes {
 		if include.Role == "" {
 		if include.Role == "" {
-			include.Role = m.RoleType(m.ROLE_VIEWER)
+			include.Role = m.ROLE_VIEWER
 		}
 		}
 	}
 	}
 
 

pkg/plugins/update_checker.go

@@ -13,7 +13,7 @@ import (
 )
 )
 
 
 var (
 var (
-	httpClient http.Client = http.Client{Timeout: time.Duration(10 * time.Second)}
+	httpClient http.Client = http.Client{Timeout: 10 * time.Second}
 )
 )
 
 
 type GrafanaNetPlugin struct {
 type GrafanaNetPlugin struct {

pkg/services/alerting/notifiers/line.go

@@ -90,7 +90,7 @@ func (this *LineNotifier) createAlert(evalContext *alerting.EvalContext) error {
 	}
 	}
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to LINE", "error", err, "body", string(body))
+		this.log.Error("Failed to send notification to LINE", "error", err, "body", body)
 		return err
 		return err
 	}
 	}
 
 

pkg/tsdb/cloudwatch/annotation_query.go

@@ -72,7 +72,7 @@ func (e *CloudWatchExecutor) executeAnnotationQuery(ctx context.Context, queryCo
 				MetricName: aws.String(metricName),
 				MetricName: aws.String(metricName),
 				Dimensions: qd,
 				Dimensions: qd,
 				Statistic:  aws.String(s),
 				Statistic:  aws.String(s),
-				Period:     aws.Int64(int64(period)),
+				Period:     aws.Int64(period),
 			}
 			}
 			resp, err := svc.DescribeAlarmsForMetric(params)
 			resp, err := svc.DescribeAlarmsForMetric(params)
 			if err != nil {
 			if err != nil {
@@ -88,7 +88,7 @@ func (e *CloudWatchExecutor) executeAnnotationQuery(ctx context.Context, queryCo
 				MetricName:        aws.String(metricName),
 				MetricName:        aws.String(metricName),
 				Dimensions:        qd,
 				Dimensions:        qd,
 				ExtendedStatistic: aws.String(s),
 				ExtendedStatistic: aws.String(s),
-				Period:            aws.Int64(int64(period)),
+				Period:            aws.Int64(period),
 			}
 			}
 			resp, err := svc.DescribeAlarmsForMetric(params)
 			resp, err := svc.DescribeAlarmsForMetric(params)
 			if err != nil {
 			if err != nil {

pkg/tsdb/prometheus/prometheus.go

@@ -108,8 +108,8 @@ func (e *PrometheusExecutor) Query(ctx context.Context, dsInfo *models.DataSourc
 
 
 		span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.prometheus")
 		span, ctx := opentracing.StartSpanFromContext(ctx, "alerting.prometheus")
 		span.SetTag("expr", query.Expr)
 		span.SetTag("expr", query.Expr)
-		span.SetTag("start_unixnano", int64(query.Start.UnixNano()))
-		span.SetTag("stop_unixnano", int64(query.End.UnixNano()))
+		span.SetTag("start_unixnano", query.Start.UnixNano())
+		span.SetTag("stop_unixnano", query.End.UnixNano())
 		defer span.Finish()
 		defer span.Finish()
 
 
 		value, err := client.QueryRange(ctx, query.Expr, timeRange)
 		value, err := client.QueryRange(ctx, query.Expr, timeRange)