Merge pull request #77 from utkarsh-pro/utkarsh-pro/feature/patterns-…

…meshsync-interrelation Add pattern resource ID to meshsync object
meshery · Jul 7, 2021 · bd05fc2 · bd05fc2
2 parents a477d64 + 3495c7b
commit bd05fc2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/internal/config/types.go b/internal/config/types.go
@@ -1,13 +1,14 @@
 package config
 
 const (
-	ServerKey         = "server-config"
-	PipelineNameKey   = "meshsync-pipeline"
-	ResourcesKey      = "resources"
-	GlobalResourceKey = "global"
-	LocalResourceKey  = "local"
-	ListenersKey      = "listeners"
-	LogStreamsKey     = "log-streams"
+	ServerKey                 = "server-config"
+	PipelineNameKey           = "meshsync-pipeline"
+	ResourcesKey              = "resources"
+	GlobalResourceKey         = "global"
+	LocalResourceKey          = "local"
+	ListenersKey              = "listeners"
+	LogStreamsKey             = "log-streams"
+	PatternResourceIDLabelKey = "resource.pattern.meshery.io/id"
 
 	BrokerURL     = "broker-url"
 	RequestStream = "request-stream"

diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -1,6 +1,7 @@
 package model
 
 import (
+	"github.com/google/uuid"
 	"gorm.io/gorm"
 )
 
@@ -10,12 +11,13 @@ const (
 )
 
 type Object struct {
-	ID         string              `json:"id" gorm:"primarykey"`
-	APIVersion string              `json:"apiVersion" gorm:"index"`
-	Kind       string              `json:"kind" gorm:"index"`
-	ObjectMeta *ResourceObjectMeta `json:"metadata" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
-	Spec       *ResourceSpec       `json:"spec,omitempty" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
-	Status     *ResourceStatus     `json:"status,omitempty" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
+	ID              string              `json:"id" gorm:"primarykey"`
+	APIVersion      string              `json:"apiVersion" gorm:"index"`
+	Kind            string              `json:"kind" gorm:"index"`
+	ObjectMeta      *ResourceObjectMeta `json:"metadata" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
+	Spec            *ResourceSpec       `json:"spec,omitempty" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
+	Status          *ResourceStatus     `json:"status,omitempty" gorm:"foreignkey:ID;references:id;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
+	PatternResource *uuid.UUID          `json:"pattern_resource"`
 
 	// Secondary fields for configsmaps and secrets
 	Immutable  string `json:"immutable,omitempty"`

diff --git a/pkg/model/model_converter.go b/pkg/model/model_converter.go
@@ -7,6 +7,7 @@ import (
 	"github.com/buger/jsonparser"
 	"github.com/google/uuid"
 	"github.com/layer5io/meshkit/utils"
+	"github.com/layer5io/meshsync/internal/config"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -24,6 +25,12 @@ func ParseList(object unstructured.Unstructured) Object {
 			Key:   string(key),
 			Value: string(value),
 		})
+
+		if string(key) == config.PatternResourceIDLabelKey {
+			id, _ := uuid.FromBytes(value)
+			result.PatternResource = &id
+		}
+
 		return nil
 	}, "metadata", "labels")
 	result.ObjectMeta.Labels = labels