Chore: Add CloudWatch HTTP API tests (#29691)

* CloudWatch: Add HTTP API tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/services/sqlstore/migrator/migrator.go

@@ -1,7 +1,6 @@
 package migrator
 
 import (
-	"errors"
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"
@@ -115,7 +114,8 @@ func (mg *Migrator) Start() error {
 		}
 	}
 
-	return nil
+	// Make sure migrations are synced
+	return mg.x.Sync2()
 }
 
 func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {
@@ -126,7 +126,7 @@ func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {
 		sql, args := condition.SQL(mg.Dialect)
 
 		if sql != "" {
-			mg.Logger.Debug("Executing migration condition sql", "id", m.Id(), "sql", sql, "args", args)
+			mg.Logger.Debug("Executing migration condition SQL", "id", m.Id(), "sql", sql, "args", args)
 			results, err := sess.SQL(sql, args...).Query()
 			if err != nil {
 				mg.Logger.Error("Executing migration condition failed", "id", m.Id(), "error", err)
@@ -169,8 +169,8 @@ func (mg *Migrator) inTransaction(callback dbTransactionFunc) error {
 	}
 
 	if err := callback(sess); err != nil {
-		if rollErr := sess.Rollback(); !errors.Is(err, rollErr) {
-			return errutil.Wrapf(err, "failed to roll back transaction due to error: %s; initial err: %s", rollErr, err)
+		if rollErr := sess.Rollback(); rollErr != nil {
+			return errutil.Wrapf(err, "failed to roll back transaction due to error: %s", rollErr)
 		}
 
 		return err

pkg/services/sqlstore/migrator/mysql_dialect.go

@@ -125,14 +125,18 @@ func (db *MySQLDialect) CleanDB() error {
 	defer sess.Close()
 
 	for _, table := range tables {
-		if _, err := sess.Exec("set foreign_key_checks = 0"); err != nil {
-			return errutil.Wrap("failed to disable foreign key checks", err)
-		}
-		if _, err := sess.Exec("drop table " + table.Name + " ;"); err != nil {
-			return errutil.Wrapf(err, "failed to delete table %q", table.Name)
-		}
-		if _, err := sess.Exec("set foreign_key_checks = 1"); err != nil {
-			return errutil.Wrap("failed to disable foreign key checks", err)
+		switch table.Name {
+		case "migration_log":
+		default:
+			if _, err := sess.Exec("set foreign_key_checks = 0"); err != nil {
+				return errutil.Wrap("failed to disable foreign key checks", err)
+			}
+			if _, err := sess.Exec("drop table " + table.Name + " ;"); err != nil {
+				return errutil.Wrapf(err, "failed to delete table %q", table.Name)
+			}
+			if _, err := sess.Exec("set foreign_key_checks = 1"); err != nil {
+				return errutil.Wrap("failed to disable foreign key checks", err)
+			}
 		}
 	}
 

pkg/services/sqlstore/migrator/postgres_dialect.go

@@ -151,6 +151,7 @@ func (db *PostgresDialect) TruncateDBTables() error {
 		switch table.Name {
 		case "":
 			continue
+		case "migration_log":
 		case "dashboard_acl":
 			// keep default dashboard permissions
 			if _, err := sess.Exec(fmt.Sprintf("DELETE FROM %v WHERE dashboard_id != -1 AND org_id != -1;", db.Quote(table.Name))); err != nil {

pkg/services/sqlstore/migrator/sqlite_dialect.go

@@ -100,6 +100,7 @@ func (db *SQLite3) TruncateDBTables() error {
 
 	for _, table := range tables {
 		switch table.Name {
+		case "migration_log":
 		case "dashboard_acl":
 			// keep default dashboard permissions
 			if _, err := sess.Exec(fmt.Sprintf("DELETE FROM %q WHERE dashboard_id != -1 AND org_id != -1;", table.Name)); err != nil {