Merge pull request #444 from MUzairS15/MUzairS15/relationships/rename…

…-attribute

[Models] Rename reqoquery to evaluationquery

models/meshmodel/core/v1alpha1/relationship.go

@@ -24,7 +24,7 @@ type RelationshipDefinition struct {
 	DisplayHostName string                 `json:"displayhostname"`
 	Metadata        map[string]interface{} `json:"metadata" yaml:"metadata"`
 	SubType         string                 `json:"subType" yaml:"subType" gorm:"subType"`
-	RegoQuery       string                 `json:"rego_query" yaml:"rego_query" gorm:"rego_query"`
+	EvaluationQuery string                 `json:"evaluationQuery" yaml:"evaluationQuery" gorm:"evaluationQuery"`
 	Selectors       map[string]interface{} `json:"selectors" yaml:"selectors"`
 	CreatedAt       time.Time              `json:"-"`
 	UpdatedAt       time.Time              `json:"-"`
@@ -34,12 +34,12 @@ type RelationshipDefinitionDB struct {
 	ID      uuid.UUID `json:"-"`
 	ModelID uuid.UUID `json:"-" gorm:"index:idx_relationship_definition_dbs_model_id,column:modelID"`
 	TypeMeta
-	Metadata  []byte    `json:"metadata" yaml:"metadata"`
-	SubType   string    `json:"subType" yaml:"subType"`
-	RegoQuery string    `json:"rego_query" yaml:"rego_query" gorm:"rego_query"`
-	Selectors []byte    `json:"selectors" yaml:"selectors"`
-	CreatedAt time.Time `json:"-"`
-	UpdatedAt time.Time `json:"-"`
+	Metadata        []byte    `json:"metadata" yaml:"metadata"`
+	SubType         string    `json:"subType" yaml:"subType"`
+	EvaluationQuery string    `json:"evaluationQuery" yaml:"evaluationQuery" gorm:"evaluationQuery"`
+	Selectors       []byte    `json:"selectors" yaml:"selectors"`
+	CreatedAt       time.Time `json:"-"`
+	UpdatedAt       time.Time `json:"-"`
 }
 
 // For now, only filtering by Kind and SubType are allowed.
@@ -129,7 +129,7 @@ func (rdb *RelationshipDefinitionDB) GetRelationshipDefinition(m Model) (r Relat
 	r.SubType = rdb.SubType
 	r.Kind = rdb.Kind
 	r.Model = m
-	r.RegoQuery = rdb.RegoQuery
+	r.EvaluationQuery = rdb.EvaluationQuery
 	return
 }
 
@@ -163,6 +163,6 @@ func (r *RelationshipDefinition) GetRelationshipDefinitionDB() (rdb Relationship
 	rdb.Kind = r.Kind
 	rdb.SubType = r.SubType
 	rdb.ModelID = r.Model.ID
-	rdb.RegoQuery = r.RegoQuery
+	rdb.EvaluationQuery = r.EvaluationQuery
 	return
 }