Merge pull request #451 from MUzairS15/MUzairS15/feat/relationships/s…

…elector-sets [Relationships] Add support for selector sets.
meshery · Jan 16, 2024 · 85162ea · 85162ea
2 parents b15a4e1 + e121195
commit 85162ea
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/models/meshmodel/core/v1alpha1/relationship.go b/models/meshmodel/core/v1alpha1/relationship.go
@@ -18,16 +18,16 @@ import (
 type RelationshipDefinition struct {
 	ID uuid.UUID `json:"id"`
 	TypeMeta
-	Model           Model                  `json:"model"`
-	HostName        string                 `json:"hostname"`
-	HostID          uuid.UUID              `json:"hostID"`
-	DisplayHostName string                 `json:"displayhostname"`
-	Metadata        map[string]interface{} `json:"metadata" yaml:"metadata"`
-	SubType         string                 `json:"subType" yaml:"subType" gorm:"subType"`
-	EvaluationQuery string                 `json:"evaluationQuery" yaml:"evaluationQuery" gorm:"evaluationQuery"`
-	Selectors       map[string]interface{} `json:"selectors" yaml:"selectors"`
-	CreatedAt       time.Time              `json:"-"`
-	UpdatedAt       time.Time              `json:"-"`
+	Model           Model                    `json:"model"`
+	HostName        string                   `json:"hostname"`
+	HostID          uuid.UUID                `json:"hostID"`
+	DisplayHostName string                   `json:"displayhostname"`
+	Metadata        map[string]interface{}   `json:"metadata" yaml:"metadata"`
+	SubType         string                   `json:"subType" yaml:"subType" gorm:"subType"`
+	EvaluationQuery string                   `json:"evaluationQuery" yaml:"evaluationQuery" gorm:"evaluationQuery"`
+	Selectors       []map[string]interface{} `json:"selectors" yaml:"selectors"`
+	CreatedAt       time.Time                `json:"-"`
+	UpdatedAt       time.Time                `json:"-"`
 }
 
 type RelationshipDefinitionDB struct {
@@ -123,7 +123,7 @@ func (rdb *RelationshipDefinitionDB) GetRelationshipDefinition(m Model) (r Relat
 	}
 	_ = json.Unmarshal(rdb.Metadata, &r.Metadata)
 	if r.Selectors == nil {
-		r.Selectors = make(map[string]interface{})
+		r.Selectors = []map[string]interface{}{}
 	}
 	_ = json.Unmarshal(rdb.Selectors, &r.Selectors)
 	r.SubType = rdb.SubType