From b7adf28501464c9fe5c933d70f0be0ad785846c5 Mon Sep 17 00:00:00 2001
From: Karsten Weiss <knweiss@gmail.com>
Date: Fri, 27 Apr 2018 22:14:36 +0200
Subject: [PATCH] Remove redundancy in variable declarations (golint)

This commit fixes the following golint warnings:
pkg/api/avatar/avatar.go:229:12: should omit type *http.Client from declaration of var client; it will be inferred from the right-hand side
pkg/login/brute_force_login_protection.go:13:26: should omit type time.Duration from declaration of var loginAttemptsWindow; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:58:26: should omit type []string from declaration of var metricCategoryPrefix; it will be inferred from the right-hand side
pkg/metrics/graphitebridge/graphite.go:69:22: should omit type []string from declaration of var trimMetricPrefix; it will be inferred from the right-hand side
pkg/models/alert.go:37:36: should omit type error from declaration of var ErrCannotChangeStateOnPausedAlert; it will be inferred from the right-hand side
pkg/models/alert.go:38:36: should omit type error from declaration of var ErrRequiresNewState; it will be inferred from the right-hand side
pkg/models/datasource.go:61:28: should omit type map[string]bool from declaration of var knownDatasourcePlugins; it will be inferred from the right-hand side
pkg/plugins/update_checker.go:16:13: should omit type http.Client from declaration of var httpClient; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:103:24: should omit type time.Duration from declaration of var unfinishedWorkTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:105:19: should omit type time.Duration from declaration of var alertTimeout; it will be inferred from the right-hand side
pkg/services/alerting/engine.go:106:19: should omit type int from declaration of var alertMaxAttempts; it will be inferred from the right-hand side
pkg/services/alerting/notifier.go:143:23: should omit type map[string]*NotifierPlugin from declaration of var notifierFactories; it will be inferred from the right-hand side
pkg/services/alerting/rule.go:136:24: should omit type map[string]ConditionFactory from declaration of var conditionFactories; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:12:15: should omit type []string from declaration of var defaultTypes; it will be inferred from the right-hand side
pkg/services/alerting/conditions/evaluator.go:13:15: should omit type []string from declaration of var rangedTypes; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/opsgenie.go:44:19: should omit type string from declaration of var opsgenieAlertURL; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/pagerduty.go:43:23: should omit type string from declaration of var pagerdutyEventApiUrl; it will be inferred from the right-hand side
pkg/services/alerting/notifiers/telegram.go:21:17: should omit type string from declaration of var telegramApiUrl; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:11:24: should omit type string from declaration of var simpleDashboardConfig; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:12:24: should omit type string from declaration of var oldVersion; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/config_reader_test.go:13:24: should omit type string from declaration of var brokenConfigs; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:22:30: should omit type time.Duration from declaration of var checkDiskForChangesInterval; it will be inferred from the right-hand side
pkg/services/provisioning/dashboards/file_reader.go:24:23: should omit type error from declaration of var ErrFolderNameMissing; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:15:34: should omit type string from declaration of var twoDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:16:34: should omit type string from declaration of var twoDatasourcesConfigPurgeOthers; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:17:34: should omit type string from declaration of var doubleDatasourcesConfig; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:18:34: should omit type string from declaration of var allProperties; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:19:34: should omit type string from declaration of var versionZero; it will be inferred from the right-hand side
pkg/services/provisioning/datasources/config_reader_test.go:20:34: should omit type string from declaration of var brokenYaml; it will be inferred from the right-hand side
pkg/services/sqlstore/stats.go:16:25: should omit type time.Duration from declaration of var activeUserTimeLimit; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:69:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/mysql_dialect.go:70:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:95:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side
pkg/services/sqlstore/migrator/postgres_dialect.go:96:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side
pkg/setting/setting.go:42:15: should omit type string from declaration of var Env; it will be inferred from the right-hand side
pkg/setting/setting.go:161:18: should omit type bool from declaration of var LdapAllowSignup; it will be inferred from the right-hand side
pkg/setting/setting.go:473:30: should omit type bool from declaration of var skipStaticRootValidation; it will be inferred from the right-hand side
pkg/tsdb/interval.go:14:21: should omit type time.Duration from declaration of var defaultMinInterval; it will be inferred from the right-hand side
pkg/tsdb/interval.go:15:21: should omit type time.Duration from declaration of var year; it will be inferred from the right-hand side
pkg/tsdb/interval.go:16:21: should omit type time.Duration from declaration of var day; it will be inferred from the right-hand side
pkg/tsdb/cloudwatch/credentials.go:26:24: should omit type map[string]cache from declaration of var awsCredentialCache; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:15:27: should omit type *regexp.Regexp from declaration of var regexpOperatorPattern; it will be inferred from the right-hand side
pkg/tsdb/influxdb/query.go:16:27: should omit type *regexp.Regexp from declaration of var regexpMeasurementPattern; it will be inferred from the right-hand side
pkg/tsdb/mssql/mssql_test.go:25:14: should omit type string from declaration of var serverIP; it will be inferred from the right-hand side
---
 pkg/api/avatar/avatar.go                          |  2 +-
 pkg/login/brute_force_login_protection.go         |  4 ++--
 pkg/metrics/graphitebridge/graphite.go            |  4 ++--
 pkg/models/alert.go                               |  4 ++--
 pkg/models/datasource.go                          |  2 +-
 pkg/plugins/update_checker.go                     |  2 +-
 pkg/services/alerting/conditions/evaluator.go     |  4 ++--
 pkg/services/alerting/engine.go                   |  6 +++---
 pkg/services/alerting/notifier.go                 |  2 +-
 pkg/services/alerting/notifiers/opsgenie.go       |  2 +-
 pkg/services/alerting/notifiers/pagerduty.go      |  2 +-
 pkg/services/alerting/notifiers/telegram.go       |  2 +-
 pkg/services/alerting/rule.go                     |  2 +-
 .../provisioning/dashboards/config_reader_test.go |  6 +++---
 .../provisioning/dashboards/file_reader.go        |  4 ++--
 .../datasources/config_reader_test.go             | 15 ++++++++-------
 pkg/services/sqlstore/migrator/mysql_dialect.go   |  4 ++--
 .../sqlstore/migrator/postgres_dialect.go         |  4 ++--
 pkg/services/sqlstore/stats.go                    |  2 +-
 pkg/setting/setting.go                            |  6 +++---
 pkg/tsdb/cloudwatch/credentials.go                |  2 +-
 pkg/tsdb/influxdb/query.go                        |  4 ++--
 pkg/tsdb/interval.go                              |  8 ++++----
 pkg/tsdb/mssql/mssql_test.go                      |  2 +-
 24 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go
index 9f282794076..5becf90ca35 100644
--- a/pkg/api/avatar/avatar.go
+++ b/pkg/api/avatar/avatar.go
@@ -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},
 }
diff --git a/pkg/login/brute_force_login_protection.go b/pkg/login/brute_force_login_protection.go
index ca5e0a667ff..d524c420540 100644
--- a/pkg/login/brute_force_login_protection.go
+++ b/pkg/login/brute_force_login_protection.go
@@ -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 {
diff --git a/pkg/metrics/graphitebridge/graphite.go b/pkg/metrics/graphitebridge/graphite.go
index 670636cedce..5b61f078e6c 100644
--- a/pkg/metrics/graphitebridge/graphite.go
+++ b/pkg/metrics/graphitebridge/graphite.go
@@ -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 {
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index 88b49350b97..b72d87e94b2 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -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 {
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index f2236ad8477..b7e3e3eaa17 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -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,
diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go
index 57f6d2ca651..e61f4cf1df7 100644
--- a/pkg/plugins/update_checker.go
+++ b/pkg/plugins/update_checker.go
@@ -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 {
diff --git a/pkg/services/alerting/conditions/evaluator.go b/pkg/services/alerting/conditions/evaluator.go
index dfc058940cf..8d7ca57f010 100644
--- a/pkg/services/alerting/conditions/evaluator.go
+++ b/pkg/services/alerting/conditions/evaluator.go
@@ -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 {
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index bdd8ff2cfe2..ddc91c0eb10 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -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 {
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index af9ba52a52a..a30ca18b41d 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -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
diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
index 5d8b15160c4..f0f5142cf05 100644
--- a/pkg/services/alerting/notifiers/opsgenie.go
+++ b/pkg/services/alerting/notifiers/opsgenie.go
@@ -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) {
diff --git a/pkg/services/alerting/notifiers/pagerduty.go b/pkg/services/alerting/notifiers/pagerduty.go
index 58484051432..02219b2203d 100644
--- a/pkg/services/alerting/notifiers/pagerduty.go
+++ b/pkg/services/alerting/notifiers/pagerduty.go
@@ -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) {
diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
index 1e62c68d7eb..1b259298eae 100644
--- a/pkg/services/alerting/notifiers/telegram.go
+++ b/pkg/services/alerting/notifiers/telegram.go
@@ -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() {
diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go
index 027ff96d6c0..0326b25de32 100644
--- a/pkg/services/alerting/rule.go
+++ b/pkg/services/alerting/rule.go
@@ -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
diff --git a/pkg/services/provisioning/dashboards/config_reader_test.go b/pkg/services/provisioning/dashboards/config_reader_test.go
index ecbf6435c36..72664c37990 100644
--- a/pkg/services/provisioning/dashboards/config_reader_test.go
+++ b/pkg/services/provisioning/dashboards/config_reader_test.go
@@ -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) {
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index 7d4231deeae..e5186e12f06 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -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 {
diff --git a/pkg/services/provisioning/datasources/config_reader_test.go b/pkg/services/provisioning/datasources/config_reader_test.go
index 7d621ffe70f..89ecc5a0b68 100644
--- a/pkg/services/provisioning/datasources/config_reader_test.go
+++ b/pkg/services/provisioning/datasources/config_reader_test.go
@@ -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
 )
diff --git a/pkg/services/sqlstore/migrator/mysql_dialect.go b/pkg/services/sqlstore/migrator/mysql_dialect.go
index 1968558dbb8..300224135f0 100644
--- a/pkg/services/sqlstore/migrator/mysql_dialect.go
+++ b/pkg/services/sqlstore/migrator/mysql_dialect.go
@@ -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
diff --git a/pkg/services/sqlstore/migrator/postgres_dialect.go b/pkg/services/sqlstore/migrator/postgres_dialect.go
index 8de26194411..e2da562c14e 100644
--- a/pkg/services/sqlstore/migrator/postgres_dialect.go
+++ b/pkg/services/sqlstore/migrator/postgres_dialect.go
@@ -92,8 +92,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 {
diff --git a/pkg/services/sqlstore/stats.go b/pkg/services/sqlstore/stats.go
index 47020d1a6f7..173a1e56634 100644
--- a/pkg/services/sqlstore/stats.go
+++ b/pkg/services/sqlstore/stats.go
@@ -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`
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 3aeb9eddaf0..922eea607d1 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -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 {
diff --git a/pkg/tsdb/cloudwatch/credentials.go b/pkg/tsdb/cloudwatch/credentials.go
index 06848323fbb..8b32c76daa3 100644
--- a/pkg/tsdb/cloudwatch/credentials.go
+++ b/pkg/tsdb/cloudwatch/credentials.go
@@ -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) {
diff --git a/pkg/tsdb/influxdb/query.go b/pkg/tsdb/influxdb/query.go
index 9fbe133c055..0637a5bbb44 100644
--- a/pkg/tsdb/influxdb/query.go
+++ b/pkg/tsdb/influxdb/query.go
@@ -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) {
diff --git a/pkg/tsdb/interval.go b/pkg/tsdb/interval.go
index e26d39f3986..49904f27a37 100644
--- a/pkg/tsdb/interval.go
+++ b/pkg/tsdb/interval.go
@@ -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 {
diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go
index 167d02a1e07..e62d30a6325 100644
--- a/pkg/tsdb/mssql/mssql_test.go
+++ b/pkg/tsdb/mssql/mssql_test.go
@@ -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() {