add support to filter models based on annotation property

Signed-off-by: MUzairS15 <muzair.shaikh810@gmail.com>
meshery · Dec 2, 2023 · 803ac87 · 803ac87
1 parent 327c100
commit 803ac87
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/models/meshmodel/registry/registry.go b/models/meshmodel/registry/registry.go
@@ -334,6 +334,11 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) ([]v1
 				finder = finder.Where("model_dbs.display_name = ?", mf.DisplayName)
 			}
 		}
+		if mf.Annotations == "true" {
+			finder = finder.Where("model_dbs.metadata->>'isAnnotation' = true")
+		} else if mf.Annotations == "false" {
+			finder = finder.Where("model_dbs.metadata->>'isAnnotation' = false")
+		}
 		if mf.Version != "" {
 			finder = finder.Where("model_dbs.version = ?", mf.Version)
 		}

diff --git a/utils/manifests/getComponents.go b/utils/manifests/getComponents.go
@@ -12,7 +12,6 @@ import (
 	k8s "github.com/layer5io/meshkit/utils/kubernetes"
 )
 
-
 func GetFromManifest(ctx context.Context, url string, resource int, cfg Config) (*Component, error) {
 	manifest, err := utils.ReadFileSource(url)
 	if err != nil {

diff --git a/utils/utils.go b/utils/utils.go
@@ -247,7 +247,6 @@ func Contains[G []K, K comparable](slice G, ele K) bool {
 	return false
 }
 
-
 func Cast[K any](val interface{}) (K, error) {
 	assertedValue, ok := val.(K)
 	if !ok {
@@ -256,7 +255,7 @@ func Cast[K any](val interface{}) (K, error) {
 	return assertedValue, nil
 }
 
-func MarshalAndUnmarshal[fromType any, toType any](val fromType) (unmarshalledvalue toType, err error){
+func MarshalAndUnmarshal[fromType any, toType any](val fromType) (unmarshalledvalue toType, err error) {
 	data, err := Marshal(val)
 	if err != nil {
 		return