From 78c012df65e6915db91d7b1be4ef3ad16ed88d08 Mon Sep 17 00:00:00 2001
From: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
Date: Mon, 27 Jun 2022 11:52:41 -0400
Subject: [PATCH] move eval_conditions to API models package (#51447)

---
 pkg/services/ngalert/api/api_testing_test.go           |  8 ++++----
 .../tooling/definitions}/eval_condition.go             | 10 ++++++----
 .../ngalert/api/tooling/definitions/testing.go         |  2 +-
 .../ngalert/api/tooling/definitions/testing_test.go    |  7 ++++---
 4 files changed, 15 insertions(+), 12 deletions(-)
 rename pkg/services/ngalert/{models => api/tooling/definitions}/eval_condition.go (68%)

diff --git a/pkg/services/ngalert/api/api_testing_test.go b/pkg/services/ngalert/api/api_testing_test.go
index 32c8566074e..5baad22835b 100644
--- a/pkg/services/ngalert/api/api_testing_test.go
+++ b/pkg/services/ngalert/api/api_testing_test.go
@@ -43,7 +43,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 
 			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.TestRulePayload{
 				Expr: "",
-				GrafanaManagedCondition: &models.EvalAlertConditionCommand{
+				GrafanaManagedCondition: &definitions.EvalAlertConditionCommand{
 					Condition: data1.RefID,
 					Data:      []models.AlertQuery{data1, data2},
 					Now:       time.Time{},
@@ -75,7 +75,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 
 			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.TestRulePayload{
 				Expr: "",
-				GrafanaManagedCondition: &models.EvalAlertConditionCommand{
+				GrafanaManagedCondition: &definitions.EvalAlertConditionCommand{
 					Condition: data1.RefID,
 					Data:      []models.AlertQuery{data1, data2},
 					Now:       time.Time{},
@@ -115,7 +115,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 
 			response := srv.RouteTestGrafanaRuleConfig(rc, definitions.TestRulePayload{
 				Expr: "",
-				GrafanaManagedCondition: &models.EvalAlertConditionCommand{
+				GrafanaManagedCondition: &definitions.EvalAlertConditionCommand{
 					Condition: data1.RefID,
 					Data:      []models.AlertQuery{data1},
 					Now:       time.Time{},
@@ -129,7 +129,7 @@ func TestRouteTestGrafanaRuleConfig(t *testing.T) {
 
 			response = srv.RouteTestGrafanaRuleConfig(rc, definitions.TestRulePayload{
 				Expr: "",
-				GrafanaManagedCondition: &models.EvalAlertConditionCommand{
+				GrafanaManagedCondition: &definitions.EvalAlertConditionCommand{
 					Condition: data1.RefID,
 					Data:      []models.AlertQuery{data1},
 					Now:       time.Time{},
diff --git a/pkg/services/ngalert/models/eval_condition.go b/pkg/services/ngalert/api/tooling/definitions/eval_condition.go
similarity index 68%
rename from pkg/services/ngalert/models/eval_condition.go
rename to pkg/services/ngalert/api/tooling/definitions/eval_condition.go
index 05c29306c4b..af8d5b48f27 100644
--- a/pkg/services/ngalert/models/eval_condition.go
+++ b/pkg/services/ngalert/api/tooling/definitions/eval_condition.go
@@ -1,16 +1,18 @@
-package models
+package definitions
 
 import (
 	"encoding/json"
 	"fmt"
 	"time"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
 // EvalAlertConditionCommand is the command for evaluating a condition
 type EvalAlertConditionCommand struct {
-	Condition string       `json:"condition"`
-	Data      []AlertQuery `json:"data"`
-	Now       time.Time    `json:"now"`
+	Condition string              `json:"condition"`
+	Data      []models.AlertQuery `json:"data"` // TODO yuri. Create API model for AlertQuery
+	Now       time.Time           `json:"now"`
 }
 
 func (cmd *EvalAlertConditionCommand) UnmarshalJSON(b []byte) error {
diff --git a/pkg/services/ngalert/api/tooling/definitions/testing.go b/pkg/services/ngalert/api/tooling/definitions/testing.go
index 53d89047e3b..1514e455810 100644
--- a/pkg/services/ngalert/api/tooling/definitions/testing.go
+++ b/pkg/services/ngalert/api/tooling/definitions/testing.go
@@ -69,7 +69,7 @@ type TestRulePayload struct {
 	// Example: (node_filesystem_avail_bytes{fstype!="",job="integrations/node_exporter"} node_filesystem_size_bytes{fstype!="",job="integrations/node_exporter"} * 100 < 5 and node_filesystem_readonly{fstype!="",job="integrations/node_exporter"} == 0)
 	Expr string `json:"expr,omitempty"`
 	// GrafanaManagedCondition for grafana alerts
-	GrafanaManagedCondition *models.EvalAlertConditionCommand `json:"grafana_condition,omitempty"`
+	GrafanaManagedCondition *EvalAlertConditionCommand `json:"grafana_condition,omitempty"`
 }
 
 // swagger:parameters RouteEvalQueries
diff --git a/pkg/services/ngalert/api/tooling/definitions/testing_test.go b/pkg/services/ngalert/api/tooling/definitions/testing_test.go
index 7ae2dcb76e3..35febeef778 100644
--- a/pkg/services/ngalert/api/tooling/definitions/testing_test.go
+++ b/pkg/services/ngalert/api/tooling/definitions/testing_test.go
@@ -4,8 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
 func TestRulePayloadMarshaling(t *testing.T) {
@@ -30,7 +31,7 @@ func TestRulePayloadMarshaling(t *testing.T) {
 				data.Model = raw
 
 				return TestRulePayload{
-					GrafanaManagedCondition: &models.EvalAlertConditionCommand{
+					GrafanaManagedCondition: &EvalAlertConditionCommand{
 						Condition: "placeholder",
 						Data:      []models.AlertQuery{data},
 					},
@@ -41,7 +42,7 @@ func TestRulePayloadMarshaling(t *testing.T) {
 			desc: "failure mixed",
 			input: TestRulePayload{
 				Expr:                    "rate({cluster=\"us-central1\", job=\"loki-prod/loki-canary\"}[1m]) > 0",
-				GrafanaManagedCondition: &models.EvalAlertConditionCommand{},
+				GrafanaManagedCondition: &EvalAlertConditionCommand{},
 			},
 			err: true,
 		},