Chore: Add CloudWatch HTTP API tests (#29691)

* CloudWatch: Add HTTP API tests

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

pkg/services/sqlstore/org.go

@@ -1,6 +1,7 @@
 package sqlstore
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -8,9 +9,11 @@ import (
 	"github.com/grafana/grafana/pkg/events"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
+	"xorm.io/xorm"
 )
 
-const mainOrgName = "Main Org."
+// MainOrgName is the name of the main organization.
+const MainOrgName = "Main Org."
 
 func init() {
 	bus.AddHandler("sql", GetOrgById)
@@ -72,6 +75,20 @@ func GetOrgByName(query *models.GetOrgByNameQuery) error {
 	return nil
 }
 
+// GetOrgByName gets an organization by name.
+func (ss *SQLStore) GetOrgByName(name string) (*models.Org, error) {
+	var org models.Org
+	exists, err := ss.engine.Where("name=?", name).Get(&org)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, models.ErrOrgNotFound
+	}
+
+	return &org, nil
+}
+
 func isOrgNameTaken(name string, existingId int64, sess *DBSession) (bool, error) {
 	// check if org name is taken
 	var org models.Org
@@ -88,34 +105,32 @@ func isOrgNameTaken(name string, existingId int64, sess *DBSession) (bool, error
 	return false, nil
 }
 
-func CreateOrg(cmd *models.CreateOrgCommand) error {
-	return inTransaction(func(sess *DBSession) error {
-		if isNameTaken, err := isOrgNameTaken(cmd.Name, 0, sess); err != nil {
+func createOrg(name string, userID int64, engine *xorm.Engine) (models.Org, error) {
+	org := models.Org{
+		Name:    name,
+		Created: time.Now(),
+		Updated: time.Now(),
+	}
+	if err := inTransactionWithRetryCtx(context.Background(), engine, func(sess *DBSession) error {
+		if isNameTaken, err := isOrgNameTaken(name, 0, sess); err != nil {
 			return err
 		} else if isNameTaken {
 			return models.ErrOrgNameTaken
 		}
 
-		org := models.Org{
-			Name:    cmd.Name,
-			Created: time.Now(),
-			Updated: time.Now(),
-		}
-
 		if _, err := sess.Insert(&org); err != nil {
 			return err
 		}
 
 		user := models.OrgUser{
 			OrgId:   org.Id,
-			UserId:  cmd.UserId,
+			UserId:  userID,
 			Role:    models.ROLE_ADMIN,
 			Created: time.Now(),
 			Updated: time.Now(),
 		}
 
 		_, err := sess.Insert(&user)
-		cmd.Result = org
 
 		sess.publishAfterCommit(&events.OrgCreated{
 			Timestamp: org.Created,
@@ -124,7 +139,26 @@ func CreateOrg(cmd *models.CreateOrgCommand) error {
 		})
 
 		return err
-	})
+	}, 0); err != nil {
+		return org, err
+	}
+
+	return org, nil
+}
+
+// CreateOrgWithMember creates an organization with a certain name and a certain user as member.
+func (ss *SQLStore) CreateOrgWithMember(name string, userID int64) (models.Org, error) {
+	return createOrg(name, userID, ss.engine)
+}
+
+func CreateOrg(cmd *models.CreateOrgCommand) error {
+	org, err := createOrg(cmd.Name, cmd.UserId, x)
+	if err != nil {
+		return err
+	}
+
+	cmd.Result = org
+	return nil
 }
 
 func UpdateOrg(cmd *models.UpdateOrgCommand) error {
@@ -229,6 +263,52 @@ func verifyExistingOrg(sess *DBSession, orgId int64) error {
 	return nil
 }
 
+func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, error) {
+	var org models.Org
+	if ss.Cfg.AutoAssignOrg {
+		has, err := sess.Where("id=?", ss.Cfg.AutoAssignOrgId).Get(&org)
+		if err != nil {
+			return 0, err
+		}
+		if has {
+			return org.Id, nil
+		}
+
+		if ss.Cfg.AutoAssignOrgId != 1 {
+			ss.log.Error("Could not create user: organization ID does not exist", "orgID",
+				ss.Cfg.AutoAssignOrgId)
+			return 0, fmt.Errorf("could not create user: organization ID %d does not exist",
+				ss.Cfg.AutoAssignOrgId)
+		}
+
+		org.Name = MainOrgName
+		org.Id = int64(ss.Cfg.AutoAssignOrgId)
+	} else {
+		org.Name = orgName
+	}
+
+	org.Created = time.Now()
+	org.Updated = time.Now()
+
+	if org.Id != 0 {
+		if _, err := sess.InsertId(&org); err != nil {
+			return 0, err
+		}
+	} else {
+		if _, err := sess.InsertOne(&org); err != nil {
+			return 0, err
+		}
+	}
+
+	sess.publishAfterCommit(&events.OrgCreated{
+		Timestamp: org.Created,
+		Id:        org.Id,
+		Name:      org.Name,
+	})
+
+	return org.Id, nil
+}
+
 func getOrCreateOrg(sess *DBSession, orgName string) (int64, error) {
 	var org models.Org
 	if setting.AutoAssignOrg {
@@ -247,7 +327,7 @@ func getOrCreateOrg(sess *DBSession, orgName string) (int64, error) {
 				setting.AutoAssignOrgId)
 		}
 
-		org.Name = mainOrgName
+		org.Name = MainOrgName
 		org.Id = int64(setting.AutoAssignOrgId)
 	} else {
 		org.Name = orgName