chore: avoid aliasing imports in services (#22499)

pkg/services/sqlstore/datasource.go

@@ -4,13 +4,13 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
 
 	"github.com/go-xorm/xorm"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/securejsondata"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	m "github.com/grafana/grafana/pkg/models"
 )
 
 func init() {
@@ -24,10 +24,10 @@ func init() {
 	bus.AddHandler("sql", GetDataSourceByName)
 }
 
-func GetDataSourceById(query *m.GetDataSourceByIdQuery) error {
+func GetDataSourceById(query *models.GetDataSourceByIdQuery) error {
 	metrics.MDBDataSourceQueryByID.Inc()
 
-	datasource := m.DataSource{OrgId: query.OrgId, Id: query.Id}
+	datasource := models.DataSource{OrgId: query.OrgId, Id: query.Id}
 	has, err := x.Get(&datasource)
 
 	if err != nil {
@@ -35,40 +35,40 @@ func GetDataSourceById(query *m.GetDataSourceByIdQuery) error {
 	}
 
 	if !has {
-		return m.ErrDataSourceNotFound
+		return models.ErrDataSourceNotFound
 	}
 
 	query.Result = &datasource
 	return err
 }
 
-func GetDataSourceByName(query *m.GetDataSourceByNameQuery) error {
-	datasource := m.DataSource{OrgId: query.OrgId, Name: query.Name}
+func GetDataSourceByName(query *models.GetDataSourceByNameQuery) error {
+	datasource := models.DataSource{OrgId: query.OrgId, Name: query.Name}
 	has, err := x.Get(&datasource)
 
 	if !has {
-		return m.ErrDataSourceNotFound
+		return models.ErrDataSourceNotFound
 	}
 
 	query.Result = &datasource
 	return err
 }
 
-func GetDataSources(query *m.GetDataSourcesQuery) error {
+func GetDataSources(query *models.GetDataSourcesQuery) error {
 	sess := x.Limit(5000, 0).Where("org_id=?", query.OrgId).Asc("name")
 
-	query.Result = make([]*m.DataSource, 0)
+	query.Result = make([]*models.DataSource, 0)
 	return sess.Find(&query.Result)
 }
 
-func GetAllDataSources(query *m.GetAllDataSourcesQuery) error {
+func GetAllDataSources(query *models.GetAllDataSourcesQuery) error {
 	sess := x.Limit(5000, 0).Asc("name")
 
-	query.Result = make([]*m.DataSource, 0)
+	query.Result = make([]*models.DataSource, 0)
 	return sess.Find(&query.Result)
 }
 
-func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error {
+func DeleteDataSourceById(cmd *models.DeleteDataSourceByIdCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		var rawSql = "DELETE FROM data_source WHERE id=? and org_id=?"
 		result, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId)
@@ -78,7 +78,7 @@ func DeleteDataSourceById(cmd *m.DeleteDataSourceByIdCommand) error {
 	})
 }
 
-func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error {
+func DeleteDataSourceByName(cmd *models.DeleteDataSourceByNameCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		var rawSql = "DELETE FROM data_source WHERE name=? and org_id=?"
 		result, err := sess.Exec(rawSql, cmd.Name, cmd.OrgId)
@@ -88,20 +88,20 @@ func DeleteDataSourceByName(cmd *m.DeleteDataSourceByNameCommand) error {
 	})
 }
 
-func AddDataSource(cmd *m.AddDataSourceCommand) error {
+func AddDataSource(cmd *models.AddDataSourceCommand) error {
 	return inTransaction(func(sess *DBSession) error {
-		existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
+		existing := models.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
 		has, _ := sess.Get(&existing)
 
 		if has {
-			return m.ErrDataSourceNameExists
+			return models.ErrDataSourceNameExists
 		}
 
 		if cmd.JsonData == nil {
 			cmd.JsonData = simplejson.New()
 		}
 
-		ds := &m.DataSource{
+		ds := &models.DataSource{
 			OrgId:             cmd.OrgId,
 			Name:              cmd.Name,
 			Type:              cmd.Type,
@@ -135,7 +135,7 @@ func AddDataSource(cmd *m.AddDataSourceCommand) error {
 	})
 }
 
-func updateIsDefaultFlag(ds *m.DataSource, sess *DBSession) error {
+func updateIsDefaultFlag(ds *models.DataSource, sess *DBSession) error {
 	// Handle is default flag
 	if ds.IsDefault {
 		rawSql := "UPDATE data_source SET is_default=? WHERE org_id=? AND id <> ?"
@@ -146,13 +146,13 @@ func updateIsDefaultFlag(ds *m.DataSource, sess *DBSession) error {
 	return nil
 }
 
-func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
+func UpdateDataSource(cmd *models.UpdateDataSourceCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		if cmd.JsonData == nil {
 			cmd.JsonData = simplejson.New()
 		}
 
-		ds := &m.DataSource{
+		ds := &models.DataSource{
 			Id:                cmd.Id,
 			OrgId:             cmd.OrgId,
 			Name:              cmd.Name,
@@ -200,7 +200,7 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
 		}
 
 		if affected == 0 {
-			return m.ErrDataSourceUpdatingOldVersion
+			return models.ErrDataSourceUpdatingOldVersion
 		}
 
 		err = updateIsDefaultFlag(ds, sess)