IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11774 from knweiss/golint

Browse Source 
Fix golint warnings
This commit is contained in:
Carl Bergquist 2018-04-28 09:40:56 +02:00 committed by GitHub
commit c5419ba885
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 286 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/avatar/avatar.go
View File

@ -226,7 +226,7 @@ func (this *thunderTask) Fetch() {
this.Done()
}
var client *http.Client = &http.Client{
var client = &http.Client{
Timeout: time.Second * 2,
Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
}

6
pkg/bus/bus.go
View File

@ -61,9 +61,8 @@ func (b *InProcBus) DispatchCtx(ctx context.Context, msg Msg) error {
err := ret[0].Interface()
if err == nil {
return nil
} else {
return err.(error)
}
return err.(error)
}
func (b *InProcBus) Dispatch(msg Msg) error {
@ -81,9 +80,8 @@ func (b *InProcBus) Dispatch(msg Msg) error {
err := ret[0].Interface()
if err == nil {
return nil
} else {
return err.(error)
}
return err.(error)
}
func (b *InProcBus) Publish(msg Msg) error {

286
pkg/components/dynmap/dynmap.go
View File

@ -134,9 +134,8 @@ func (v *Value) get(key string) (*Value, error) {
child, ok := obj.Map()[key]
if ok {
return child, nil
} else {
return nil, KeyNotFoundError{key}
}
return nil, KeyNotFoundError{key}
}
return nil, err
@ -174,17 +173,13 @@ func (v *Object) GetObject(keys ...string) (*Object, error) {
if err != nil {
return nil, err
} else {
obj, err := child.Object()
if err != nil {
return nil, err
} else {
return obj, nil
}
}
obj, err := child.Object()
if err != nil {
return nil, err
}
return obj, nil
}
// Gets the value at key path and attempts to typecast the value into a string.
@ -196,18 +191,17 @@ func (v *Object) GetString(keys ...string) (string, error) {
if err != nil {
return "", err
} else {
return child.String()
}
return child.String()
}
func (v *Object) MustGetString(path string, def string) string {
keys := strings.Split(path, ".")
if str, err := v.GetString(keys...); err != nil {
str, err := v.GetString(keys...)
if err != nil {
return def
} else {
return str
}
return str
}
// Gets the value at key path and attempts to typecast the value into null.
@ -233,16 +227,13 @@ func (v *Object) GetNumber(keys ...string) (json.Number, error) {
if err != nil {
return "", err
} else {
n, err := child.Number()
if err != nil {
return "", err
} else {
return n, nil
}
}
n, err := child.Number()
if err != nil {
return "", err
}
return n, nil
}
// Gets the value at key path and attempts to typecast the value into a float64.
@ -254,16 +245,13 @@ func (v *Object) GetFloat64(keys ...string) (float64, error) {
if err != nil {
return 0, err
} else {
n, err := child.Float64()
if err != nil {
return 0, err
} else {
return n, nil
}
}
n, err := child.Float64()
if err != nil {
return 0, err
}
return n, nil
}
// Gets the value at key path and attempts to typecast the value into a float64.
@ -275,16 +263,13 @@ func (v *Object) GetInt64(keys ...string) (int64, error) {
if err != nil {
return 0, err
} else {
n, err := child.Int64()
if err != nil {
return 0, err
} else {
return n, nil
}
}
n, err := child.Int64()
if err != nil {
return 0, err
}
return n, nil
}
// Gets the value at key path and attempts to typecast the value into a float64.
@ -296,9 +281,8 @@ func (v *Object) GetInterface(keys ...string) (interface{}, error) {
if err != nil {
return nil, err
} else {
return child.Interface(), nil
}
return child.Interface(), nil
}
// Gets the value at key path and attempts to typecast the value into a bool.
@ -311,7 +295,6 @@ func (v *Object) GetBoolean(keys ...string) (bool, error) {
if err != nil {
return false, err
}
return child.Boolean()
}
@ -328,11 +311,8 @@ func (v *Object) GetValueArray(keys ...string) ([]*Value, error) {
if err != nil {
return nil, err
} else {
return child.Array()
}
return child.Array()
}
// Gets the value at key path and attempts to typecast the value into an array of objects.
@ -347,30 +327,24 @@ func (v *Object) GetObjectArray(keys ...string) ([]*Object, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]*Object, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.
Object()
if err != nil {
return nil, err
} else {
typedArray := make([]*Object, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.
Object()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of string.
@ -387,29 +361,23 @@ func (v *Object) GetStringArray(keys ...string) ([]string, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]string, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.String()
if err != nil {
return nil, err
} else {
typedArray := make([]string, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.String()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of numbers.
@ -424,29 +392,23 @@ func (v *Object) GetNumberArray(keys ...string) ([]json.Number, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]json.Number, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Number()
if err != nil {
return nil, err
} else {
typedArray := make([]json.Number, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Number()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of floats.
@ -456,29 +418,23 @@ func (v *Object) GetFloat64Array(keys ...string) ([]float64, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]float64, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Float64()
if err != nil {
return nil, err
} else {
typedArray := make([]float64, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Float64()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of ints.
@ -488,29 +444,23 @@ func (v *Object) GetInt64Array(keys ...string) ([]int64, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]int64, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Int64()
if err != nil {
return nil, err
} else {
typedArray := make([]int64, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Int64()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of bools.
@ -520,29 +470,23 @@ func (v *Object) GetBooleanArray(keys ...string) ([]bool, error) {
if err != nil {
return nil, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return nil, err
}
typedArray := make([]bool, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Boolean()
if err != nil {
return nil, err
} else {
typedArray := make([]bool, len(array))
for index, arrayItem := range array {
typedArrayItem, err := arrayItem.Boolean()
if err != nil {
return nil, err
} else {
typedArray[index] = typedArrayItem
}
}
return typedArray, nil
}
typedArray[index] = typedArrayItem
}
return typedArray, nil
}
// Gets the value at key path and attempts to typecast the value into an array of nulls.
@ -552,29 +496,23 @@ func (v *Object) GetNullArray(keys ...string) (int64, error) {
if err != nil {
return 0, err
} else {
}
array, err := child.Array()
array, err := child.Array()
if err != nil {
return 0, err
}
var length int64 = 0
for _, arrayItem := range array {
err := arrayItem.Null()
if err != nil {
return 0, err
} else {
var length int64 = 0
for _, arrayItem := range array {
err := arrayItem.Null()
if err != nil {
return 0, err
} else {
length++
}
}
return length, nil
}
length++
}
return length, nil
}
// Returns an error if the value is not actually null
@ -590,9 +528,7 @@ func (v *Value) Null() error {
if valid {
return nil
}
return ErrNotNull
}
// Attempts to typecast the current value into an array.
@ -612,17 +548,13 @@ func (v *Value) Array() ([]*Value, error) {
var slice []*Value
if valid {
for _, element := range v.data.([]interface{}) {
child := Value{element, true}
slice = append(slice, &child)
}
return slice, nil
}
return slice, ErrNotArray
}
// Attempts to typecast the current value into a number.

4
pkg/login/brute_force_login_protection.go
View File

@ -9,8 +9,8 @@ import (
)
var (
maxInvalidLoginAttempts int64 = 5
loginAttemptsWindow time.Duration = time.Minute * 5
maxInvalidLoginAttempts int64 = 5
loginAttemptsWindow = time.Minute * 5
)
var validateLoginAttempts = func(username string) error {

10
pkg/login/ldap.go
View File

@ -50,12 +50,12 @@ func (a *ldapAuther) Dial() error {
if a.server.RootCACert != "" {
certPool = x509.NewCertPool()
for _, caCertFile := range strings.Split(a.server.RootCACert, " ") {
if pem, err := ioutil.ReadFile(caCertFile); err != nil {
pem, err := ioutil.ReadFile(caCertFile)
if err != nil {
return err
} else {
if !certPool.AppendCertsFromPEM(pem) {
return errors.New("Failed to append CA certificate " + caCertFile)
}
}
if !certPool.AppendCertsFromPEM(pem) {
return errors.New("Failed to append CA certificate " + caCertFile)
}
}
}

5
pkg/login/ldap_test.go
View File

@ -369,10 +369,9 @@ func (sc *scenarioContext) userQueryReturns(user *m.User) {
bus.AddHandler("test", func(query *m.GetUserByAuthInfoQuery) error {
if user == nil {
return m.ErrUserNotFound
} else {
query.Result = user
return nil
}
query.Result = user
return nil
})
bus.AddHandler("test", func(query *m.SetAuthInfoCommand) error {
return nil

4
pkg/metrics/graphitebridge/graphite.go
View File

@ -55,7 +55,7 @@ const (
AbortOnError
)
var metricCategoryPrefix []string = []string{
var metricCategoryPrefix = []string{
"proxy_",
"api_",
"page_",
@ -66,7 +66,7 @@ var metricCategoryPrefix []string = []string{
"go_",
"process_"}
var trimMetricPrefix []string = []string{"grafana_"}
var trimMetricPrefix = []string{"grafana_"}
// Config defines the Graphite bridge config.
type Config struct {

3
pkg/middleware/middleware_test.go
View File

@ -210,9 +210,8 @@ func TestMiddlewareContext(t *testing.T) {
if query.UserId > 0 {
query.Result = &m.SignedInUser{OrgId: 4, UserId: 33}
return nil
} else {
return m.ErrUserNotFound
}
return m.ErrUserNotFound
})
bus.AddHandler("test", func(cmd *m.UpsertUserCommand) error {

4
pkg/models/alert.go
View File

@ -34,8 +34,8 @@ const (
)
var (
ErrCannotChangeStateOnPausedAlert error = fmt.Errorf("Cannot change state on pause alert")
ErrRequiresNewState error = fmt.Errorf("update alert state requires a new state.")
ErrCannotChangeStateOnPausedAlert = fmt.Errorf("Cannot change state on pause alert")
ErrRequiresNewState = fmt.Errorf("update alert state requires a new state.")
)
func (s AlertStateType) IsValid() bool {

2
pkg/models/datasource.go
View File

@ -58,7 +58,7 @@ type DataSource struct {
Updated time.Time
}
var knownDatasourcePlugins map[string]bool = map[string]bool{
var knownDatasourcePlugins = map[string]bool{
DS_ES: true,
DS_GRAPHITE: true,
DS_INFLUXDB: true,

6
pkg/plugins/dashboard_importer.go
View File

@ -148,11 +148,11 @@ func (this *DashTemplateEvaluator) evalValue(source *simplejson.Json) interface{
switch v := sourceValue.(type) {
case string:
interpolated := this.varRegex.ReplaceAllStringFunc(v, func(match string) string {
if replacement, exists := this.variables[match]; exists {
replacement, exists := this.variables[match]
if exists {
return replacement
} else {
return match
}
return match
})
return interpolated
case bool:

44
pkg/plugins/dashboards_updater.go
View File

@ -34,23 +34,24 @@ func (pm *PluginManager) updateAppDashboards() {
}
func autoUpdateAppDashboard(pluginDashInfo *PluginDashboardInfoDTO, orgId int64) error {
if dash, err := loadPluginDashboard(pluginDashInfo.PluginId, pluginDashInfo.Path); err != nil {
dash, err := loadPluginDashboard(pluginDashInfo.PluginId, pluginDashInfo.Path)
if err != nil {
return err
} else {
plog.Info("Auto updating App dashboard", "dashboard", dash.Title, "newRev", pluginDashInfo.Revision, "oldRev", pluginDashInfo.ImportedRevision)
updateCmd := ImportDashboardCommand{
OrgId: orgId,
PluginId: pluginDashInfo.PluginId,
Overwrite: true,
Dashboard: dash.Data,
User: &m.SignedInUser{UserId: 0, OrgRole: m.ROLE_ADMIN},
Path: pluginDashInfo.Path,
}
if err := bus.Dispatch(&updateCmd); err != nil {
return err
}
}
plog.Info("Auto updating App dashboard", "dashboard", dash.Title, "newRev", pluginDashInfo.Revision, "oldRev", pluginDashInfo.ImportedRevision)
updateCmd := ImportDashboardCommand{
OrgId: orgId,
PluginId: pluginDashInfo.PluginId,
Overwrite: true,
Dashboard: dash.Data,
User: &m.SignedInUser{UserId: 0, OrgRole: m.ROLE_ADMIN},
Path: pluginDashInfo.Path,
}
if err := bus.Dispatch(&updateCmd); err != nil {
return err
}
return nil
}
@ -118,15 +119,14 @@ func handlePluginStateChanged(event *m.PluginStateChangedEvent) error {
if err := bus.Dispatch(&query); err != nil {
return err
} else {
for _, dash := range query.Result {
deleteCmd := m.DeleteDashboardCommand{OrgId: dash.OrgId, Id: dash.Id}
}
for _, dash := range query.Result {
deleteCmd := m.DeleteDashboardCommand{OrgId: dash.OrgId, Id: dash.Id}
plog.Info("Deleting plugin dashboard", "pluginId", event.PluginId, "dashboard", dash.Slug)
plog.Info("Deleting plugin dashboard", "pluginId", event.PluginId, "dashboard", dash.Slug)
if err := bus.Dispatch(&deleteCmd); err != nil {
return err
}
if err := bus.Dispatch(&deleteCmd); err != nil {
return err
}
}
}

12
pkg/plugins/plugins.go
View File

@ -205,11 +205,11 @@ func (scanner *PluginScanner) loadPluginJson(pluginJsonFilePath string) error {
}
var loader PluginLoader
if pluginGoType, exists := PluginTypes[pluginCommon.Type]; !exists {
pluginGoType, exists := PluginTypes[pluginCommon.Type]
if !exists {
return errors.New("Unknown plugin type " + pluginCommon.Type)
} else {
loader = reflect.New(reflect.TypeOf(pluginGoType)).Interface().(PluginLoader)
}
loader = reflect.New(reflect.TypeOf(pluginGoType)).Interface().(PluginLoader)
reader.Seek(0, 0)
return loader.Load(jsonParser, currentDir)
@ -230,9 +230,9 @@ func GetPluginMarkdown(pluginId string, name string) ([]byte, error) {
return make([]byte, 0), nil
}
if data, err := ioutil.ReadFile(path); err != nil {
data, err := ioutil.ReadFile(path)
if err != nil {
return nil, err
} else {
return data, nil
}
return data, nil
}

2
pkg/plugins/update_checker.go
View File

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

4
pkg/services/alerting/conditions/evaluator.go
View File

@ -9,8 +9,8 @@ import (
)
var (
defaultTypes []string = []string{"gt", "lt"}
rangedTypes []string = []string{"within_range", "outside_range"}
defaultTypes = []string{"gt", "lt"}
rangedTypes = []string{"within_range", "outside_range"}
)
type AlertEvaluator interface {

6
pkg/services/alerting/engine.go
View File

@ -100,10 +100,10 @@ func (e *Engine) runJobDispatcher(grafanaCtx context.Context) error {
}
var (
unfinishedWorkTimeout time.Duration = time.Second * 5
unfinishedWorkTimeout = time.Second * 5
// TODO: Make alertTimeout and alertMaxAttempts configurable in the config file.
alertTimeout time.Duration = time.Second * 30
alertMaxAttempts int = 3
alertTimeout = time.Second * 30
alertMaxAttempts = 3
)
func (e *Engine) processJobWithRetry(grafanaCtx context.Context, job *Job) error {

6
pkg/services/alerting/eval_context.go
View File

@ -106,11 +106,11 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
return setting.AppUrl, nil
}
if ref, err := c.GetDashboardUID(); err != nil {
ref, err := c.GetDashboardUID()
if err != nil {
return "", err
} else {
return fmt.Sprintf(urlFormat, m.GetFullDashboardUrl(ref.Uid, ref.Slug), c.Rule.PanelId, c.Rule.OrgId), nil
}
return fmt.Sprintf(urlFormat, m.GetFullDashboardUrl(ref.Uid, ref.Slug), c.Rule.PanelId, c.Rule.OrgId), nil
}
func (c *EvalContext) GetNewState() m.AlertStateType {

24
pkg/services/alerting/notifier.go
View File

@ -87,17 +87,17 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
IsAlertContext: true,
}
if ref, err := context.GetDashboardUID(); err != nil {
ref, err := context.GetDashboardUID()
if err != nil {
return err
} else {
renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?panelId=%d", ref.Uid, ref.Slug, context.Rule.PanelId)
}
renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?panelId=%d", ref.Uid, ref.Slug, context.Rule.PanelId)
if imagePath, err := renderer.RenderToPng(renderOpts); err != nil {
imagePath, err := renderer.RenderToPng(renderOpts)
if err != nil {
return err
} else {
context.ImageOnDiskPath = imagePath
}
context.ImageOnDiskPath = imagePath
context.ImagePublicUrl, err = uploader.Upload(context.Ctx, context.ImageOnDiskPath)
if err != nil {
@ -117,12 +117,12 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
var result []Notifier
for _, notification := range query.Result {
if not, err := n.createNotifierFor(notification); err != nil {
not, err := n.createNotifierFor(notification)
if err != nil {
return nil, err
} else {
if not.ShouldNotify(context) {
result = append(result, not)
}
}
if not.ShouldNotify(context) {
result = append(result, not)
}
}
@ -140,7 +140,7 @@ func (n *notificationService) createNotifierFor(model *m.AlertNotification) (Not
type NotifierFactory func(notification *m.AlertNotification) (Notifier, error)
var notifierFactories map[string]*NotifierPlugin = make(map[string]*NotifierPlugin)
var notifierFactories = make(map[string]*NotifierPlugin)
func RegisterNotifier(plugin *NotifierPlugin) {
notifierFactories[plugin.Type] = plugin

2
pkg/services/alerting/notifiers/opsgenie.go
View File

@ -41,7 +41,7 @@ func init() {
}
var (
opsgenieAlertURL string = "https://api.opsgenie.com/v2/alerts"
opsgenieAlertURL = "https://api.opsgenie.com/v2/alerts"
)
func NewOpsGenieNotifier(model *m.AlertNotification) (alerting.Notifier, error) {

2
pkg/services/alerting/notifiers/pagerduty.go
View File

@ -40,7 +40,7 @@ func init() {
}
var (
pagerdutyEventApiUrl string = "https://events.pagerduty.com/v2/enqueue"
pagerdutyEventApiUrl = "https://events.pagerduty.com/v2/enqueue"
)
func NewPagerdutyNotifier(model *m.AlertNotification) (alerting.Notifier, error) {

5
pkg/services/alerting/notifiers/telegram.go
View File

@ -18,7 +18,7 @@ const (
)
var (
telegramApiUrl string = "https://api.telegram.org/bot%s/%s"
telegramApiUrl = "https://api.telegram.org/bot%s/%s"
)
func init() {
@ -91,9 +91,8 @@ func (this *TelegramNotifier) buildMessage(evalContext *alerting.EvalContext, se
cmd, err := this.buildMessageInlineImage(evalContext)
if err == nil {
return cmd
} else {
this.log.Error("Could not generate Telegram message with inline image.", "err", err)
}
this.log.Error("Could not generate Telegram message with inline image.", "err", err)
}
return this.buildMessageLinkedImage(evalContext)

22
pkg/services/alerting/rule.go
View File

@ -103,25 +103,25 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
for _, v := range ruleDef.Settings.Get("notifications").MustArray() {
jsonModel := simplejson.NewFromAny(v)
if id, err := jsonModel.Get("id").Int64(); err != nil {
id, err := jsonModel.Get("id").Int64()
if err != nil {
return nil, ValidationError{Reason: "Invalid notification schema", DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
} else {
model.Notifications = append(model.Notifications, id)
}
model.Notifications = append(model.Notifications, id)
}
for index, condition := range ruleDef.Settings.Get("conditions").MustArray() {
conditionModel := simplejson.NewFromAny(condition)
conditionType := conditionModel.Get("type").MustString()
if factory, exist := conditionFactories[conditionType]; !exist {
factory, exist := conditionFactories[conditionType]
if !exist {
return nil, ValidationError{Reason: "Unknown alert condition: " + conditionType, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
} else {
if queryCondition, err := factory(conditionModel, index); err != nil {
return nil, ValidationError{Err: err, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
} else {
model.Conditions = append(model.Conditions, queryCondition)
}
}
queryCondition, err := factory(conditionModel, index)
if err != nil {
return nil, ValidationError{Err: err, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
}
model.Conditions = append(model.Conditions, queryCondition)
}
if len(model.Conditions) == 0 {
@ -133,7 +133,7 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
type ConditionFactory func(model *simplejson.Json, index int) (Condition, error)
var conditionFactories map[string]ConditionFactory = make(map[string]ConditionFactory)
var conditionFactories = make(map[string]ConditionFactory)
func RegisterCondition(typeName string, factory ConditionFactory) {
conditionFactories[typeName] = factory

6
pkg/services/provisioning/dashboards/config_reader_test.go
View File

@ -8,9 +8,9 @@ import (
)
var (
simpleDashboardConfig string = "./test-configs/dashboards-from-disk"
oldVersion string = "./test-configs/version-0"
brokenConfigs string = "./test-configs/broken-configs"
simpleDashboardConfig = "./test-configs/dashboards-from-disk"
oldVersion = "./test-configs/version-0"
brokenConfigs = "./test-configs/broken-configs"
)
func TestDashboardsAsConfig(t *testing.T) {

4
pkg/services/provisioning/dashboards/file_reader.go
View File

@ -19,9 +19,9 @@ import (
)
var (
checkDiskForChangesInterval time.Duration = time.Second * 3
checkDiskForChangesInterval = time.Second * 3
ErrFolderNameMissing error = errors.New("Folder name missing")
ErrFolderNameMissing = errors.New("Folder name missing")
)
type fileReader struct {

15
pkg/services/provisioning/datasources/config_reader_test.go
View File

@ -11,13 +11,14 @@ import (
)
var (
logger log.Logger = log.New("fake.log")
twoDatasourcesConfig string = "./test-configs/two-datasources"
twoDatasourcesConfigPurgeOthers string = "./test-configs/insert-two-delete-two"
doubleDatasourcesConfig string = "./test-configs/double-default"
allProperties string = "./test-configs/all-properties"
versionZero string = "./test-configs/version-0"
brokenYaml string = "./test-configs/broken-yaml"
logger log.Logger = log.New("fake.log")
twoDatasourcesConfig = "./test-configs/two-datasources"
twoDatasourcesConfigPurgeOthers = "./test-configs/insert-two-delete-two"
doubleDatasourcesConfig = "./test-configs/double-default"
allProperties = "./test-configs/all-properties"
versionZero = "./test-configs/version-0"
brokenYaml = "./test-configs/broken-yaml"
fakeRepo *fakeRepository
)

28
pkg/services/sqlstore/annotation.go
View File

@ -29,13 +29,13 @@ func (r *SqlAnnotationRepo) Save(item *annotations.Item) error {
}
if item.Tags != nil {
if tags, err := r.ensureTagsExist(sess, tags); err != nil {
tags, err := r.ensureTagsExist(sess, tags)
if err != nil {
return err
} else {
for _, tag := range tags {
if _, err := sess.Exec("INSERT INTO annotation_tag (annotation_id, tag_id) VALUES(?,?)", item.Id, tag.Id); err != nil {
return err
}
}
for _, tag := range tags {
if _, err := sess.Exec("INSERT INTO annotation_tag (annotation_id, tag_id) VALUES(?,?)", item.Id, tag.Id); err != nil {
return err
}
}
}
@ -94,17 +94,17 @@ func (r *SqlAnnotationRepo) Update(item *annotations.Item) error {
}
if item.Tags != nil {
if tags, err := r.ensureTagsExist(sess, models.ParseTagPairs(item.Tags)); err != nil {
tags, err := r.ensureTagsExist(sess, models.ParseTagPairs(item.Tags))
if err != nil {
return err
} else {
if _, err := sess.Exec("DELETE FROM annotation_tag WHERE annotation_id = ?", existing.Id); err != nil {
}
if _, err := sess.Exec("DELETE FROM annotation_tag WHERE annotation_id = ?", existing.Id); err != nil {
return err
}
for _, tag := range tags {
if _, err := sess.Exec("INSERT INTO annotation_tag (annotation_id, tag_id) VALUES(?,?)", existing.Id, tag.Id); err != nil {
return err
}
for _, tag := range tags {
if _, err := sess.Exec("INSERT INTO annotation_tag (annotation_id, tag_id) VALUES(?,?)", existing.Id, tag.Id); err != nil {
return err
}
}
}
}

3
pkg/services/sqlstore/dashboard_test.go
View File

@ -104,9 +104,8 @@ func TestDashboardDataAccess(t *testing.T) {
timesCalled += 1
if timesCalled <= 2 {
return savedDash.Uid
} else {
return util.GenerateShortUid()
}
return util.GenerateShortUid()
}
cmd := m.SaveDashboardCommand{
OrgId: 1,

10
pkg/services/sqlstore/migrator/migrator.go
View File

@ -97,17 +97,15 @@ func (mg *Migrator) Start() error {
mg.Logger.Debug("Executing", "sql", sql)
err := mg.inTransaction(func(sess *xorm.Session) error {
if err := mg.exec(m, sess); err != nil {
err := mg.exec(m, sess)
if err != nil {
mg.Logger.Error("Exec failed", "error", err, "sql", sql)
record.Error = err.Error()
sess.Insert(&record)
return err
} else {
record.Success = true
sess.Insert(&record)
}
record.Success = true
sess.Insert(&record)
return nil
})

4
pkg/services/sqlstore/migrator/mysql_dialect.go
View File

@ -66,8 +66,8 @@ func (db *Mysql) SqlType(c *Column) string {
res = c.Type
}
var hasLen1 bool = (c.Length > 0)
var hasLen2 bool = (c.Length2 > 0)
var hasLen1 = (c.Length > 0)
var hasLen2 = (c.Length2 > 0)
if res == DB_BigInt && !hasLen1 && !hasLen2 {
c.Length = 20

7
pkg/services/sqlstore/migrator/postgres_dialect.go
View File

@ -45,9 +45,8 @@ func (b *Postgres) Default(col *Column) string {
if col.Type == DB_Bool {
if col.Default == "0" {
return "FALSE"
} else {
return "TRUE"
}
return "TRUE"
}
return col.Default
}
@ -92,8 +91,8 @@ func (db *Postgres) SqlType(c *Column) string {
res = t
}
var hasLen1 bool = (c.Length > 0)
var hasLen2 bool = (c.Length2 > 0)
var hasLen1 = (c.Length > 0)
var hasLen2 = (c.Length2 > 0)
if hasLen2 {
res += "(" + strconv.Itoa(c.Length) + "," + strconv.Itoa(c.Length2) + ")"
} else if hasLen1 {

53
pkg/services/sqlstore/plugin_setting.go
View File

@ -75,34 +75,33 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
_, err = sess.Insert(&pluginSetting)
return err
} else {
for key, data := range cmd.SecureJsonData {
encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey)
if err != nil {
return err
}
pluginSetting.SecureJsonData[key] = encryptedData
}
// add state change event on commit success
if pluginSetting.Enabled != cmd.Enabled {
sess.events = append(sess.events, &m.PluginStateChangedEvent{
PluginId: cmd.PluginId,
OrgId: cmd.OrgId,
Enabled: cmd.Enabled,
})
}
pluginSetting.Updated = time.Now()
pluginSetting.Enabled = cmd.Enabled
pluginSetting.JsonData = cmd.JsonData
pluginSetting.Pinned = cmd.Pinned
pluginSetting.PluginVersion = cmd.PluginVersion
_, err = sess.Id(pluginSetting.Id).Update(&pluginSetting)
return err
}
for key, data := range cmd.SecureJsonData {
encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey)
if err != nil {
return err
}
pluginSetting.SecureJsonData[key] = encryptedData
}
// add state change event on commit success
if pluginSetting.Enabled != cmd.Enabled {
sess.events = append(sess.events, &m.PluginStateChangedEvent{
PluginId: cmd.PluginId,
OrgId: cmd.OrgId,
Enabled: cmd.Enabled,
})
}
pluginSetting.Updated = time.Now()
pluginSetting.Enabled = cmd.Enabled
pluginSetting.JsonData = cmd.JsonData
pluginSetting.Pinned = cmd.Pinned
pluginSetting.PluginVersion = cmd.PluginVersion
_, err = sess.Id(pluginSetting.Id).Update(&pluginSetting)
return err
})
}

15
pkg/services/sqlstore/preferences.go
View File

@ -88,14 +88,13 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
}
_, err = sess.Insert(&prefs)
return err
} else {
prefs.HomeDashboardId = cmd.HomeDashboardId
prefs.Timezone = cmd.Timezone
prefs.Theme = cmd.Theme
prefs.Updated = time.Now()
prefs.Version += 1
_, err := sess.Id(prefs.Id).AllCols().Update(&prefs)
return err
}
prefs.HomeDashboardId = cmd.HomeDashboardId
prefs.Timezone = cmd.Timezone
prefs.Theme = cmd.Theme
prefs.Updated = time.Now()
prefs.Version += 1
_, err = sess.Id(prefs.Id).AllCols().Update(&prefs)
return err
})
}

2
pkg/services/sqlstore/stats.go
View File

@ -13,7 +13,7 @@ func init() {
bus.AddHandler("sql", GetAdminStats)
}
var activeUserTimeLimit time.Duration = time.Hour * 24 * 30
var activeUserTimeLimit = time.Hour * 24 * 30
func GetDataSourceStats(query *m.GetDataSourceStatsQuery) error {
var rawSql = `SELECT COUNT(*) as count, type FROM data_source GROUP BY type`

5
pkg/services/sqlstore/user.go
View File

@ -47,10 +47,9 @@ func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *DBSession) (int64, error
}
if has {
return org.Id, nil
} else {
org.Name = "Main Org."
org.Id = 1
}
org.Name = "Main Org."
org.Id = 1
} else {
org.Name = cmd.OrgName
if len(org.Name) == 0 {

6
pkg/setting/setting.go
View File

@ -39,7 +39,7 @@ const (
var (
// App settings.
Env string = DEV
Env = DEV
AppUrl string
AppSubUrl string
InstanceName string
@ -158,7 +158,7 @@ var (
// LDAP
LdapEnabled bool
LdapConfigFile string
LdapAllowSignup bool = true
LdapAllowSignup = true
// SMTP email settings
Smtp SmtpSettings
@ -470,7 +470,7 @@ func setHomePath(args *CommandLineArgs) {
}
}
var skipStaticRootValidation bool = false
var skipStaticRootValidation = false
func validateStaticRootPath() error {
if skipStaticRootValidation {

2
pkg/tsdb/cloudwatch/credentials.go
View File

@ -23,7 +23,7 @@ type cache struct {
expiration *time.Time
}
var awsCredentialCache map[string]cache = make(map[string]cache)
var awsCredentialCache = make(map[string]cache)
var credentialCacheLock sync.RWMutex
func GetCredentials(dsInfo *DatasourceInfo) (*credentials.Credentials, error) {

3
pkg/tsdb/cloudwatch/metric_find_query.go
View File

@ -222,9 +222,8 @@ func parseMultiSelectValue(input string) []string {
trimValues[i] = strings.TrimSpace(v)
}
return trimValues
} else {
return []string{trimmedInput}
}
return []string{trimmedInput}
}
// Whenever this list is updated, frontend list should also be updated.

4
pkg/tsdb/influxdb/query.go
View File

@ -12,8 +12,8 @@ import (
)
var (
regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
regexpMeasurementPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
regexpOperatorPattern = regexp.MustCompile(`^\/.*\/$`)
regexpMeasurementPattern = regexp.MustCompile(`^\/.*\/$`)
)
func (query *Query) Build(queryContext *tsdb.TsdbQuery) (string, error) {

8
pkg/tsdb/interval.go
View File

@ -10,10 +10,10 @@ import (
)
var (
defaultRes int64 = 1500
defaultMinInterval time.Duration = 1 * time.Millisecond
year time.Duration = time.Hour * 24 * 365
day time.Duration = time.Hour * 24
defaultRes int64 = 1500
defaultMinInterval = time.Millisecond * 1
year = time.Hour * 24 * 365
day = time.Hour * 24
)
type Interval struct {

2
pkg/tsdb/mssql/mssql_test.go
View File

@ -22,7 +22,7 @@ import (
// There is also a dashboard.json in same directory that you can import to Grafana
// once you've created a datasource for the test server/database.
// If needed, change the variable below to the IP address of the database.
var serverIP string = "localhost"
var serverIP = "localhost"
func TestMSSQL(t *testing.T) {
SkipConvey("MSSQL", t, func() {

12
pkg/tsdb/time_range.go
View File

@ -54,19 +54,19 @@ func (tr *TimeRange) GetToAsTimeUTC() time.Time {
}
func (tr *TimeRange) MustGetFrom() time.Time {
if res, err := tr.ParseFrom(); err != nil {
res, err := tr.ParseFrom()
if err != nil {
return time.Unix(0, 0)
} else {
return res
}
return res
}
func (tr *TimeRange) MustGetTo() time.Time {
if res, err := tr.ParseTo(); err != nil {
res, err := tr.ParseTo()
if err != nil {
return time.Unix(0, 0)
} else {
return res
}
return res
}
func tryParseUnixMsEpoch(val string) (time.Time, bool) {

3
pkg/util/filepath.go
View File

@ -65,9 +65,8 @@ func walk(path string, info os.FileInfo, resolvedPath string, symlinkPathsFollow
if _, ok := symlinkPathsFollowed[path2]; ok {
errMsg := "Potential SymLink Infinite Loop. Path: %v, Link To: %v"
return fmt.Errorf(errMsg, resolvedPath, path2)
} else {
symlinkPathsFollowed[path2] = true
}
symlinkPathsFollowed[path2] = true
}
info2, err := os.Lstat(path2)
if err != nil {