Merge pull request #426 from MUzairS15/MUzairS15/feat/policies

add rego query in relationship definitions
meshery · Dec 4, 2023 · 955b388 · 955b388
2 parents 36620b8 + f100fd1
commit 955b388
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/models/meshmodel/core/policies/rego_policy_relationship.go b/models/meshmodel/core/policies/rego_policy_relationship.go
@@ -3,6 +3,7 @@ package policies
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -69,7 +70,7 @@ func mapRelationshipsWithSubType(relationships *[]v1alpha1.RelationshipDefinitio
 }
 
 // RegoPolicyHandler takes the required inputs and run the query against all the policy files provided
-func (r *Rego) RegoPolicyHandler(regoQueryString string, designFile []byte) (map[string]interface{}, error) {
+func (r *Rego) RegoPolicyHandler(regoQueryString string, designFile []byte) (interface{}, error) {
 	regoEngine, err := rego.New(
 		rego.Query(regoQueryString),
 		rego.Load([]string{r.policyDir}, nil),
@@ -93,7 +94,13 @@ func (r *Rego) RegoPolicyHandler(regoQueryString string, designFile []byte) (map
 	}
 
 	if !eval_result.Allowed() {
-		return eval_result[0].Expressions[0].Value.(map[string]interface{}), nil
+		if len(eval_result) > 0 {
+			if len(eval_result[0].Expressions) > 0 {
+				return eval_result[0].Expressions[0].Value, nil
+			}
+			return nil, ErrEval(fmt.Errorf("evaluation results are empty"))
+		}
+		return nil, ErrEval(fmt.Errorf("evaluation results are empty"))
 	}
 
 	return nil, ErrEval(err)

diff --git a/models/meshmodel/core/v1alpha1/relationship.go b/models/meshmodel/core/v1alpha1/relationship.go
@@ -24,6 +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"`
 	Selectors       map[string]interface{} `json:"selectors" yaml:"selectors"`
 	CreatedAt       time.Time              `json:"-"`
 	UpdatedAt       time.Time              `json:"-"`
@@ -35,6 +36,7 @@ type RelationshipDefinitionDB struct {
 	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:"-"`
@@ -127,6 +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
 	return
 }
 
@@ -160,5 +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
 	return
 }
diff --git a/models/oam/core/v1alpha1/application_configuration.go b/models/oam/core/v1alpha1/application_configuration.go
@@ -44,4 +44,4 @@ type ConfigurationSpecComponentScope struct {
 type ConfigurationSpecComponentScopeRef struct {
 	metav1.TypeMeta `json:",inline"`
 	Name            string
-}
+}