meshery · devhindo · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024
diff --git a/.github/workflows/add-catalog.yml b/.github/workflows/add-catalog.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Set env
         run: |

diff --git a/assets/artifact-hub-pkg/go.mod b/assets/artifact-hub-pkg/go.mod
@@ -1,6 +1,6 @@
 module package.go
 
-go 1.21.0
+go 1.23
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1

diff --git a/assets/artifact-hub-pkg/package.go b/assets/artifact-hub-pkg/package.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -114,7 +114,7 @@ func fetchCatalogPatterns() ([]byte, error) {
 	}
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, ErrReadRespBody(err)
 	}
@@ -209,11 +209,11 @@ func decodeURIComponent(encodedURI string) (string, error) {
 
 func writePatternFile(pattern CatalogPattern, versionDir, patternType, patternInfo, patternCaveats, compatibility, patternImageURL string) error {
 	designFilePath := filepath.Join(versionDir, "design.yml")
-	if err := ioutil.WriteFile(designFilePath, []byte(pattern.PatternFile), 0644); err != nil {
+	if err := os.WriteFile(designFilePath, []byte(pattern.PatternFile), 0644); err != nil {
 		return utils.ErrWriteFile(err, designFilePath)
 	}
 
-	contenttemp, err := ioutil.ReadFile(designFilePath)
+	contenttemp, err := os.ReadFile(designFilePath)
 	if err != nil {
 		return utils.ErrReadFile(err, designFilePath)
 	}
@@ -299,7 +299,7 @@ URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/%s/%s/%s/desig
 downloadLink: %s/design.yml
 ---`, strings.TrimSpace(string(nameYAML)), version, pattern.UserID, userFullName, userInfo.AvatarURL, patternType, compatibility, pattern.ID, patternImageURL, patternInfo, patternCaveats, patternType, slugify(pattern.Name), pattern.ID, mesheryCatalogFilesDir, pattern.ID, version, pattern.ID)
 
-	if err := ioutil.WriteFile(fmt.Sprintf(filepath.Join("..", "..", "collections", "_catalog", patternType, pattern.ID+".md")), []byte(content), 0644); err != nil {
+	if err := os.WriteFile(fmt.Sprintf(filepath.Join("..", "..", "collections", "_catalog", patternType, pattern.ID+".md")), []byte(content), 0644); err != nil {
 		return utils.ErrWriteFile(err, filepath.Join("..", "..", "collections", "_catalog", patternType, pattern.ID+".md"))
 	}
 
@@ -314,7 +314,7 @@ func fetchUserInfo(userID string) (UserInfo, error) {
 	defer resp.Body.Close()
 
 	var userInfo UserInfo
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return UserInfo{}, ErrReadRespBody(err)
 	}

diff --git a/assets/scripts/go.mod b/assets/scripts/go.mod
@@ -1,5 +1,5 @@
 module hub.go
 
-go 1.22.1
+go 1.23
 
 require gopkg.in/yaml.v3 v3.0.1
diff --git a/catalog/0194ff83-0a43-4b83-9c75-b8f0f32da6b7/0.0.1/design.yml b/catalog/0194ff83-0a43-4b83-9c75-b8f0f32da6b7/0.0.1/design.yml
diff --git a/catalog/02413809-9fbf-4649-ae22-3d0947d264c6/0.0.1/design.yml b/catalog/02413809-9fbf-4649-ae22-3d0947d264c6/0.0.1/design.yml
diff --git a/catalog/04cf78e7-6041-45f7-bca5-999d5d7d6a19/0.0.5/design.yml b/catalog/04cf78e7-6041-45f7-bca5-999d5d7d6a19/0.0.5/design.yml
@@ -1 +1,9 @@
-{"id":"04cf78e7-6041-45f7-bca5-999d5d7d6a19","components":[],"name":"Dapr ","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.157"}
+<<<<<<< HEAD
+<<<<<<< HEAD
+{"id":"04cf78e7-6041-45f7-bca5-999d5d7d6a19","components":[],"name":"Dapr ","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.120"}
+=======
+{"id":"04cf78e7-6041-45f7-bca5-999d5d7d6a19","components":[],"name":"Dapr ","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.151"}
+>>>>>>> master
+=======
+{"id":"04cf78e7-6041-45f7-bca5-999d5d7d6a19","components":[],"name":"Dapr ","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.157"}
+>>>>>>> master
diff --git a/catalog/05ff8dbb-2552-4a23-a6a8-318fe412bf30/0.0.1/design.yml b/catalog/05ff8dbb-2552-4a23-a6a8-318fe412bf30/0.0.1/design.yml
diff --git a/catalog/067737d5-1c7e-4135-b879-44cb4ed07876/0.0.1/design.yml b/catalog/067737d5-1c7e-4135-b879-44cb4ed07876/0.0.1/design.yml
@@ -1 +1,5 @@
-{"id":"067737d5-1c7e-4135-b879-44cb4ed07876","components":[],"name":"","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.138"}
+<<<<<<< HEAD
+{"id":"067737d5-1c7e-4135-b879-44cb4ed07876","components":[],"name":"","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.102"}
+=======
+{"id":"067737d5-1c7e-4135-b879-44cb4ed07876","components":[],"name":"","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.138"}
+>>>>>>> master
diff --git a/catalog/06ef6097-8f21-4a76-b025-0c9271168814/0.0.1/design.yml b/catalog/06ef6097-8f21-4a76-b025-0c9271168814/0.0.1/design.yml
diff --git a/catalog/070b4569-2b26-4e13-93f7-9992fdf1e6fd/0.0.332/design.yml b/catalog/070b4569-2b26-4e13-93f7-9992fdf1e6fd/0.0.332/design.yml
diff --git a/catalog/081aa52c-7921-48dd-b81e-03f4ebfc70b5/0.0.1/design.yml b/catalog/081aa52c-7921-48dd-b81e-03f4ebfc70b5/0.0.1/design.yml
diff --git a/catalog/08379ae3-cd9e-4b55-a190-91a47a1ff638/0.0.1/design.yml b/catalog/08379ae3-cd9e-4b55-a190-91a47a1ff638/0.0.1/design.yml
diff --git a/catalog/0a2d8c39-df40-490b-94b7-75d0fb7fc207/0.0.1/design.yml b/catalog/0a2d8c39-df40-490b-94b7-75d0fb7fc207/0.0.1/design.yml
diff --git a/catalog/0aa86dd0-415c-4bf8-ae76-832560470b74/0.0.1/design.yml b/catalog/0aa86dd0-415c-4bf8-ae76-832560470b74/0.0.1/design.yml
diff --git a/catalog/0b6b1ff8-cb2e-41d4-baff-e0a053f7e4d9/0.0.1/design.yml b/catalog/0b6b1ff8-cb2e-41d4-baff-e0a053f7e4d9/0.0.1/design.yml
diff --git a/catalog/0d8d6d6d-362f-49e3-9a88-2d7e6aa20542/0.0.1/design.yml b/catalog/0d8d6d6d-362f-49e3-9a88-2d7e6aa20542/0.0.1/design.yml
diff --git a/catalog/0e426f91-14df-4f70-b6cc-ed3624d53ccd/0.0.1/design.yml b/catalog/0e426f91-14df-4f70-b6cc-ed3624d53ccd/0.0.1/design.yml
diff --git a/catalog/104be089-dae0-4d09-be70-c1d121673119/0.0.1/design.yml b/catalog/104be089-dae0-4d09-be70-c1d121673119/0.0.1/design.yml
diff --git a/catalog/107f4fc2-0655-4d00-be3d-164947159647/0.0.1/design.yml b/catalog/107f4fc2-0655-4d00-be3d-164947159647/0.0.1/design.yml
diff --git a/catalog/114c94c9-052b-46a2-86fe-4cdd2e88c746/0.0.1/design.yml b/catalog/114c94c9-052b-46a2-86fe-4cdd2e88c746/0.0.1/design.yml
diff --git a/catalog/129c524b-ead9-4170-b236-a1c9dd274ece/0.0.1/design.yml b/catalog/129c524b-ead9-4170-b236-a1c9dd274ece/0.0.1/design.yml
diff --git a/catalog/17c46515-50ef-436c-9383-451e13348ddd/0.0.1/design.yml b/catalog/17c46515-50ef-436c-9383-451e13348ddd/0.0.1/design.yml
diff --git a/catalog/189a3e71-8be9-4e64-9fed-150a9b1060de/0.0.1/design.yml b/catalog/189a3e71-8be9-4e64-9fed-150a9b1060de/0.0.1/design.yml
diff --git a/catalog/1abccf09-dcb8-46e4-8cac-f9e33c27516d/0.0.1/design.yml b/catalog/1abccf09-dcb8-46e4-8cac-f9e33c27516d/0.0.1/design.yml
diff --git a/catalog/1e2478e0-7611-4d4f-a44f-ea02cebf7b91/0.0.1/design.yml b/catalog/1e2478e0-7611-4d4f-a44f-ea02cebf7b91/0.0.1/design.yml
diff --git a/catalog/1f3c7dcd-e49a-4bf7-985a-661d6c64d8d7/0.0.1/design.yml b/catalog/1f3c7dcd-e49a-4bf7-985a-661d6c64d8d7/0.0.1/design.yml
diff --git a/catalog/1f79b0c6-2efe-4ee9-b08c-e1bd07a3926b/0.0.1/design.yml b/catalog/1f79b0c6-2efe-4ee9-b08c-e1bd07a3926b/0.0.1/design.yml
diff --git a/catalog/1fa80124-d38d-41d1-a768-0fcb7cdae31e/0.0.1/design.yml b/catalog/1fa80124-d38d-41d1-a768-0fcb7cdae31e/0.0.1/design.yml
diff --git a/catalog/205a4fe3-1daf-4150-9062-3e7c81dde143/0.0.1/design.yml b/catalog/205a4fe3-1daf-4150-9062-3e7c81dde143/0.0.1/design.yml
diff --git a/catalog/210422ee-a1c4-4844-9591-bab374608cba/0.0.1/design.yml b/catalog/210422ee-a1c4-4844-9591-bab374608cba/0.0.1/design.yml
diff --git a/catalog/22e28213-8c94-49d5-b104-3b7feee84b5e/0.0.1/design.yml b/catalog/22e28213-8c94-49d5-b104-3b7feee84b5e/0.0.1/design.yml
diff --git a/catalog/23d03e32-4232-40f1-b953-0416e47b9b5d/0.0.1/design.yml b/catalog/23d03e32-4232-40f1-b953-0416e47b9b5d/0.0.1/design.yml
diff --git a/catalog/2512c0cb-385d-40de-b1f5-bc4a67131538/0.0.1/design.yml b/catalog/2512c0cb-385d-40de-b1f5-bc4a67131538/0.0.1/design.yml
diff --git a/catalog/254aa1d3-d972-4894-813a-f58fdd24021c/0.0.8/design.yml b/catalog/254aa1d3-d972-4894-813a-f58fdd24021c/0.0.8/design.yml
diff --git a/catalog/2649785a-6cb1-4671-b625-a790ac375043/0.0.1/design.yml b/catalog/2649785a-6cb1-4671-b625-a790ac375043/0.0.1/design.yml
diff --git a/catalog/27454352-6b1b-426e-830e-683b8c34b94e/0.0.64/design.yml b/catalog/27454352-6b1b-426e-830e-683b8c34b94e/0.0.64/design.yml
diff --git a/catalog/28715e69-c6c1-4f96-bfa2-05113b00bae0/0.0.1/design.yml b/catalog/28715e69-c6c1-4f96-bfa2-05113b00bae0/0.0.1/design.yml
diff --git a/catalog/2a42de8b-3c58-4571-b092-2fda29ecfb1a/0.0.1/design.yml b/catalog/2a42de8b-3c58-4571-b092-2fda29ecfb1a/0.0.1/design.yml
diff --git a/catalog/2b8ca8e9-b964-4102-8ee7-dbb2f1fbed49/0.0.1/design.yml b/catalog/2b8ca8e9-b964-4102-8ee7-dbb2f1fbed49/0.0.1/design.yml
diff --git a/catalog/2d0a36b9-8170-4076-8aea-4fa6b28caf31/0.0.166/design.yml b/catalog/2d0a36b9-8170-4076-8aea-4fa6b28caf31/0.0.166/design.yml
diff --git a/catalog/2d54f372-10e5-4c4e-8d23-b9c35c68ce98/0.0.1/design.yml b/catalog/2d54f372-10e5-4c4e-8d23-b9c35c68ce98/0.0.1/design.yml
@@ -1 +1,9 @@
-{"id":"2d54f372-10e5-4c4e-8d23-b9c35c68ce98","components":[{"capabilities":[{"description":"Configure the visual styles for the component","displayName":"Styling","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"","type":"style","version":"0.7.0"},{"description":"Change the shape of the component","displayName":"Change Shape","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"shape","type":"style","version":"0.7.0"},{"description":"Drag and Drop a component into a parent component in graph view","displayName":"Compound Drag And Drop","entityState":["declaration"],"key":"","kind":"interaction","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"compoundDnd","type":"graph","version":"0.7.0"},{"description":"Add text to nodes body","displayName":"Body Text","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"body-text","type":"style","version":"0.7.0"}],"component":{"kind":"AlternateProcess","schema":"","version":"core.meshery.io/v1alpha1"},"configuration":{},"description":"","displayName":"","format":"JSON","id":"3809b0ce-08cc-459b-b53f-5aa7b25bcdff","metadata":{"genealogy":"","hasInvalidSchema":true,"isAnnotation":true,"isNamespaced":false,"published":false},"model":{"category":{"name":"Orchestration \u0026 Management"},"displayName":"Meshery Flowchart","id":"90970641-26f8-2ff0-d3cd-1cd73372e502","metadata":{"isAnnotation":true,"primaryColor":"#2196F3","secondaryColor":"#00D3A9","shape":"polygon","styleOverrides":"","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/meshery-flowchart-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/meshery-flowchart-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/meshery-flowchart-white.svg"},"model":{"version":"0.7.2"},"name":"meshery-flowchart","registrant":{"created_at":"2024-11-12T15:48:23.47713562Z","credential_id":"00000000-0000-0000-0000-000000000000","deleted_at":"0001-01-01T00:00:00Z","id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","kind":"meshery","name":"meshery","status":"registered","sub_type":"","type":"registry","updated_at":"2024-11-12T15:48:23.47713562Z","user_id":"00000000-0000-0000-0000-000000000000"},"connection_id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","schemaVersion":"models.meshery.io/v1beta1","status":"enabled","subCategory":"Flowchart","version":"v1.0.0","components":null,"relationships":null,"components_count":0,"relationships_count":0},"schemaVersion":"components.meshery.io/v1beta1","status":"enabled","styles":{"background-opacity":0,"body-text":"MESH MAP TUTORIAL","body-text-color":"#808080","body-text-font-size":12,"body-text-font-weight":"400","body-text-horizontal-align":"center","body-text-vertical-align":"center","border-width":1,"height":125.61182,"opacity":1,"padding":6,"position":{"x":376.8899731217291,"y":385.74284342372664},"primaryColor":"#00B39F","secondaryColor":"#00D3A9","shape":"rectangle","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/alternateprocess-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/alternateprocess-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/alternateprocess-white.svg","width":494.27155,"z-index":0},"version":"v1.0.0"}],"name":"Robot Shop Sample App","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.155"}
+<<<<<<< HEAD
+<<<<<<< HEAD
+{"id":"2d54f372-10e5-4c4e-8d23-b9c35c68ce98","components":[{"capabilities":[{"description":"Configure the visual styles for the component","displayName":"Styling","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"","type":"style","version":"0.7.0"},{"description":"Change the shape of the component","displayName":"Change Shape","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"shape","type":"style","version":"0.7.0"},{"description":"Drag and Drop a component into a parent component in graph view","displayName":"Compound Drag And Drop","entityState":["declaration"],"key":"","kind":"interaction","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"compoundDnd","type":"graph","version":"0.7.0"},{"description":"Add text to nodes body","displayName":"Body Text","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"body-text","type":"style","version":"0.7.0"}],"component":{"kind":"AlternateProcess","schema":"","version":"core.meshery.io/v1alpha1"},"configuration":{},"description":"","displayName":"","format":"JSON","id":"3809b0ce-08cc-459b-b53f-5aa7b25bcdff","metadata":{"genealogy":"","hasInvalidSchema":true,"isAnnotation":true,"isNamespaced":false,"published":false},"model":{"category":{"name":"Orchestration \u0026 Management"},"displayName":"Meshery Flowchart","id":"90970641-26f8-2ff0-d3cd-1cd73372e502","metadata":{"isAnnotation":true,"primaryColor":"#2196F3","secondaryColor":"#00D3A9","shape":"polygon","styleOverrides":"","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/meshery-flowchart-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/meshery-flowchart-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/meshery-flowchart-white.svg"},"model":{"version":"0.7.2"},"name":"meshery-flowchart","registrant":{"created_at":"2024-11-12T15:48:23.47713562Z","credential_id":"00000000-0000-0000-0000-000000000000","deleted_at":"0001-01-01T00:00:00Z","id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","kind":"meshery","name":"meshery","status":"registered","sub_type":"","type":"registry","updated_at":"2024-11-12T15:48:23.47713562Z","user_id":"00000000-0000-0000-0000-000000000000"},"connection_id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","schemaVersion":"models.meshery.io/v1beta1","status":"enabled","subCategory":"Flowchart","version":"v1.0.0","components":null,"relationships":null,"components_count":0,"relationships_count":0},"schemaVersion":"components.meshery.io/v1beta1","status":"enabled","styles":{"background-opacity":0,"body-text":"MESH MAP TUTORIAL","body-text-color":"#808080","body-text-font-size":12,"body-text-font-weight":"400","body-text-horizontal-align":"center","body-text-vertical-align":"center","border-width":1,"height":125.61182,"opacity":1,"padding":6,"position":{"x":376.8899731217291,"y":385.74284342372664},"primaryColor":"#00B39F","secondaryColor":"#00D3A9","shape":"rectangle","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/alternateprocess-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/alternateprocess-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/alternateprocess-white.svg","width":494.27155,"z-index":0},"version":"v1.0.0"}],"name":"Robot Shop Sample App","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.121"}
+=======
+{"id":"2d54f372-10e5-4c4e-8d23-b9c35c68ce98","components":[{"capabilities":[{"description":"Configure the visual styles for the component","displayName":"Styling","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"","type":"style","version":"0.7.0"},{"description":"Change the shape of the component","displayName":"Change Shape","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"shape","type":"style","version":"0.7.0"},{"description":"Drag and Drop a component into a parent component in graph view","displayName":"Compound Drag And Drop","entityState":["declaration"],"key":"","kind":"interaction","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"compoundDnd","type":"graph","version":"0.7.0"},{"description":"Add text to nodes body","displayName":"Body Text","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"body-text","type":"style","version":"0.7.0"}],"component":{"kind":"AlternateProcess","schema":"","version":"core.meshery.io/v1alpha1"},"configuration":{},"description":"","displayName":"","format":"JSON","id":"3809b0ce-08cc-459b-b53f-5aa7b25bcdff","metadata":{"genealogy":"","hasInvalidSchema":true,"isAnnotation":true,"isNamespaced":false,"published":false},"model":{"category":{"name":"Orchestration \u0026 Management"},"displayName":"Meshery Flowchart","id":"90970641-26f8-2ff0-d3cd-1cd73372e502","metadata":{"isAnnotation":true,"primaryColor":"#2196F3","secondaryColor":"#00D3A9","shape":"polygon","styleOverrides":"","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/meshery-flowchart-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/meshery-flowchart-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/meshery-flowchart-white.svg"},"model":{"version":"0.7.2"},"name":"meshery-flowchart","registrant":{"created_at":"2024-11-12T15:48:23.47713562Z","credential_id":"00000000-0000-0000-0000-000000000000","deleted_at":"0001-01-01T00:00:00Z","id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","kind":"meshery","name":"meshery","status":"registered","sub_type":"","type":"registry","updated_at":"2024-11-12T15:48:23.47713562Z","user_id":"00000000-0000-0000-0000-000000000000"},"connection_id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","schemaVersion":"models.meshery.io/v1beta1","status":"enabled","subCategory":"Flowchart","version":"v1.0.0","components":null,"relationships":null,"components_count":0,"relationships_count":0},"schemaVersion":"components.meshery.io/v1beta1","status":"enabled","styles":{"background-opacity":0,"body-text":"MESH MAP TUTORIAL","body-text-color":"#808080","body-text-font-size":12,"body-text-font-weight":"400","body-text-horizontal-align":"center","body-text-vertical-align":"center","border-width":1,"height":125.61182,"opacity":1,"padding":6,"position":{"x":376.8899731217291,"y":385.74284342372664},"primaryColor":"#00B39F","secondaryColor":"#00D3A9","shape":"rectangle","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/alternateprocess-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/alternateprocess-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/alternateprocess-white.svg","width":494.27155,"z-index":0},"version":"v1.0.0"}],"name":"Robot Shop Sample App","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.149"}
+>>>>>>> master
+=======
+{"id":"2d54f372-10e5-4c4e-8d23-b9c35c68ce98","components":[{"capabilities":[{"description":"Configure the visual styles for the component","displayName":"Styling","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"","type":"style","version":"0.7.0"},{"description":"Change the shape of the component","displayName":"Change Shape","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"shape","type":"style","version":"0.7.0"},{"description":"Drag and Drop a component into a parent component in graph view","displayName":"Compound Drag And Drop","entityState":["declaration"],"key":"","kind":"interaction","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"compoundDnd","type":"graph","version":"0.7.0"},{"description":"Add text to nodes body","displayName":"Body Text","entityState":["declaration"],"key":"","kind":"mutate","metadata":null,"schemaVersion":"capability.meshery.io/v1alpha1","status":"enabled","subType":"body-text","type":"style","version":"0.7.0"}],"component":{"kind":"AlternateProcess","schema":"","version":"core.meshery.io/v1alpha1"},"configuration":{},"description":"","displayName":"","format":"JSON","id":"3809b0ce-08cc-459b-b53f-5aa7b25bcdff","metadata":{"genealogy":"","hasInvalidSchema":true,"isAnnotation":true,"isNamespaced":false,"published":false},"model":{"category":{"name":"Orchestration \u0026 Management"},"displayName":"Meshery Flowchart","id":"90970641-26f8-2ff0-d3cd-1cd73372e502","metadata":{"isAnnotation":true,"primaryColor":"#2196F3","secondaryColor":"#00D3A9","shape":"polygon","styleOverrides":"","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/meshery-flowchart-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/meshery-flowchart-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/meshery-flowchart-white.svg"},"model":{"version":"0.7.2"},"name":"meshery-flowchart","registrant":{"created_at":"2024-11-12T15:48:23.47713562Z","credential_id":"00000000-0000-0000-0000-000000000000","deleted_at":"0001-01-01T00:00:00Z","id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","kind":"meshery","name":"meshery","status":"registered","sub_type":"","type":"registry","updated_at":"2024-11-12T15:48:23.47713562Z","user_id":"00000000-0000-0000-0000-000000000000"},"connection_id":"56fc1fd1-f0c1-21ab-983f-9efa8fec5b2f","schemaVersion":"models.meshery.io/v1beta1","status":"enabled","subCategory":"Flowchart","version":"v1.0.0","components":null,"relationships":null,"components_count":0,"relationships_count":0},"schemaVersion":"components.meshery.io/v1beta1","status":"enabled","styles":{"background-opacity":0,"body-text":"MESH MAP TUTORIAL","body-text-color":"#808080","body-text-font-size":12,"body-text-font-weight":"400","body-text-horizontal-align":"center","body-text-vertical-align":"center","border-width":1,"height":125.61182,"opacity":1,"padding":6,"position":{"x":376.8899731217291,"y":385.74284342372664},"primaryColor":"#00B39F","secondaryColor":"#00D3A9","shape":"rectangle","svgColor":"ui/public/static/img/meshmodels/meshery-flowchart/color/alternateprocess-color.svg","svgComplete":"ui/public/static/img/meshmodels/meshery-flowchart/complete/alternateprocess-complete.svg","svgWhite":"ui/public/static/img/meshmodels/meshery-flowchart/white/alternateprocess-white.svg","width":494.27155,"z-index":0},"version":"v1.0.0"}],"name":"Robot Shop Sample App","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.155"}
+>>>>>>> master
diff --git a/catalog/2df29b2b-7e5e-4d8b-a5b3-3dea569f4d25/0.0.1/design.yml b/catalog/2df29b2b-7e5e-4d8b-a5b3-3dea569f4d25/0.0.1/design.yml
diff --git a/catalog/307373c2-a096-4b52-841e-fc18c3a5d17f/0.0.21/design.yml b/catalog/307373c2-a096-4b52-841e-fc18c3a5d17f/0.0.21/design.yml
diff --git a/catalog/31ed2484-4aeb-4dcc-aa98-b61933d371cc/0.0.1/design.yml b/catalog/31ed2484-4aeb-4dcc-aa98-b61933d371cc/0.0.1/design.yml
diff --git a/catalog/3255f170-e2b1-48e8-bbed-40d4e0198a90/0.0.4/design.yml b/catalog/3255f170-e2b1-48e8-bbed-40d4e0198a90/0.0.4/design.yml
diff --git a/catalog/32f10b2a-82eb-4ab9-b1f7-4f8c7f888011/0.0.1/design.yml b/catalog/32f10b2a-82eb-4ab9-b1f7-4f8c7f888011/0.0.1/design.yml
diff --git a/catalog/3546d0d4-ba6e-4c7e-9661-853ade11847f/0.0.1/design.yml b/catalog/3546d0d4-ba6e-4c7e-9661-853ade11847f/0.0.1/design.yml
diff --git a/catalog/35ecff6c-41f5-400b-92c4-f959dd23ee15/0.0.1/design.yml b/catalog/35ecff6c-41f5-400b-92c4-f959dd23ee15/0.0.1/design.yml
diff --git a/catalog/37422db6-b585-4b1a-baaa-d307d33d5ebf/0.0.116/design.yml b/catalog/37422db6-b585-4b1a-baaa-d307d33d5ebf/0.0.116/design.yml
diff --git a/catalog/37792455-294f-481b-a7a8-13e79ca835ca/0.0.1/design.yml b/catalog/37792455-294f-481b-a7a8-13e79ca835ca/0.0.1/design.yml
diff --git a/catalog/378da4da-dc81-4b6f-9473-fc91b5ce88e1/0.0.1/design.yml b/catalog/378da4da-dc81-4b6f-9473-fc91b5ce88e1/0.0.1/design.yml
diff --git a/catalog/397e88c7-38d9-4499-85b2-73696f0b195a/0.0.54/design.yml b/catalog/397e88c7-38d9-4499-85b2-73696f0b195a/0.0.54/design.yml
diff --git a/catalog/3a38cc90-e998-4f2a-9747-17f2d7ddf313/0.0.1/design.yml b/catalog/3a38cc90-e998-4f2a-9747-17f2d7ddf313/0.0.1/design.yml
diff --git a/catalog/3b2a210d-77b4-4267-bc8e-bc32758edf76/0.0.1/design.yml b/catalog/3b2a210d-77b4-4267-bc8e-bc32758edf76/0.0.1/design.yml
diff --git a/catalog/3c3439a0-d215-4a71-aa47-13a5f2d007b7/0.0.1/design.yml b/catalog/3c3439a0-d215-4a71-aa47-13a5f2d007b7/0.0.1/design.yml
diff --git a/catalog/3d01bc39-8627-42b7-abe1-0cf9eb3a0a9d/0.0.1/design.yml b/catalog/3d01bc39-8627-42b7-abe1-0cf9eb3a0a9d/0.0.1/design.yml
diff --git a/catalog/3e3c169a-c252-4b71-8667-62dd6ed085be/0.0.1/design.yml b/catalog/3e3c169a-c252-4b71-8667-62dd6ed085be/0.0.1/design.yml
diff --git a/catalog/3ec30961-1aba-4db7-86c5-7556de5d90ca/0.0.1/design.yml b/catalog/3ec30961-1aba-4db7-86c5-7556de5d90ca/0.0.1/design.yml
diff --git a/catalog/3f3e545b-063b-4c0a-9cb5-0928d7bd9462/0.0.1/design.yml b/catalog/3f3e545b-063b-4c0a-9cb5-0928d7bd9462/0.0.1/design.yml
diff --git a/catalog/3fe52f86-0214-4813-9d23-727f2e57469b/0.0.1/design.yml b/catalog/3fe52f86-0214-4813-9d23-727f2e57469b/0.0.1/design.yml
diff --git a/catalog/4032a5c3-d081-429b-9087-2b9bdaa7396b/0.0.1/design.yml b/catalog/4032a5c3-d081-429b-9087-2b9bdaa7396b/0.0.1/design.yml
diff --git a/catalog/40e5c357-472a-43cd-be4a-8af002974ed5/0.0.187/design.yml b/catalog/40e5c357-472a-43cd-be4a-8af002974ed5/0.0.187/design.yml
diff --git a/catalog/454dff6a-d988-4a09-8206-963eaa816c8d/0.0.1/design.yml b/catalog/454dff6a-d988-4a09-8206-963eaa816c8d/0.0.1/design.yml
@@ -1 +1,9 @@
-{"id":"454dff6a-d988-4a09-8206-963eaa816c8d","components":[],"name":"Istio Control Plane","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.126"}
+<<<<<<< HEAD
+<<<<<<< HEAD
+{"id":"454dff6a-d988-4a09-8206-963eaa816c8d","components":[],"name":"Istio Control Plane","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.93"}
+=======
+{"id":"454dff6a-d988-4a09-8206-963eaa816c8d","components":[],"name":"Istio Control Plane","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.120"}
+>>>>>>> master
+=======
+{"id":"454dff6a-d988-4a09-8206-963eaa816c8d","components":[],"name":"Istio Control Plane","relationships":[],"schemaVersion":"designs.meshery.io/v1beta1","version":"0.0.126"}
+>>>>>>> master
diff --git a/catalog/464b4f2a-78d8-4034-915a-612475f757d2/0.0.1/design.yml b/catalog/464b4f2a-78d8-4034-915a-612475f757d2/0.0.1/design.yml
diff --git a/catalog/4690406b-60e7-4c82-87c3-20b22862f5b5/0.0.1/design.yml b/catalog/4690406b-60e7-4c82-87c3-20b22862f5b5/0.0.1/design.yml
diff --git a/catalog/4cc2bbfb-6bb9-4981-a21f-e52955d92a9d/0.0.1/design.yml b/catalog/4cc2bbfb-6bb9-4981-a21f-e52955d92a9d/0.0.1/design.yml
diff --git a/catalog/4efe3cb7-c901-48a9-9324-67d73d546aff/0.0.1/design.yml b/catalog/4efe3cb7-c901-48a9-9324-67d73d546aff/0.0.1/design.yml
diff --git a/catalog/4fe5b8f3-d8c7-487c-9860-bc7cb8674d48/0.0.1/design.yml b/catalog/4fe5b8f3-d8c7-487c-9860-bc7cb8674d48/0.0.1/design.yml
diff --git a/catalog/508efffb-d106-4593-af7b-0b85e1a59822/0.0.1490/design.yml b/catalog/508efffb-d106-4593-af7b-0b85e1a59822/0.0.1490/design.yml
diff --git a/catalog/5479aed9-669a-4bea-9693-56921b55d04d/0.0.1/design.yml b/catalog/5479aed9-669a-4bea-9693-56921b55d04d/0.0.1/design.yml
diff --git a/catalog/571a79c9-01c5-4c4b-b8c6-c3f0b2f2415f/0.0.1/design.yml b/catalog/571a79c9-01c5-4c4b-b8c6-c3f0b2f2415f/0.0.1/design.yml