Merge pull request #564 from ayushthe1/change-servicemesh-comp

update category and normalise enums

build/config.go

@@ -27,7 +27,7 @@ const Component = "Istio"
 var Meshmodelmetadata = make(map[string]interface{})
 
 var MeshModelConfig = adapter.MeshModelConfig{ //Move to build/config.go
-	Category: "Orchestration & Management",
+	Category: "Cloud Native Network",
 	Metadata: Meshmodelmetadata,
 }
 

templates/meshmodel/components/1.10.0-alpha.0/gateway.Istio.meshery.layer5.io_meshmodel.json

@@ -1 +1 @@
-{"kind":"Gateway","apiVersion":"networking.istio.io/v1alpha3","displayName":"Gateway","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","category": {"name":"Orchestration \u0026 Management","metadata":null},"subCategory":"Service Mesh"},"schema":"{\n \"description\": \"Configuration affecting edge load balancer. See more details at: https://istio.io/docs/reference/config/networking/gateway.html\",\n \"properties\": {\n  \"selector\": {\n   \"additionalProperties\": {\n    \"format\": \"string\",\n    \"type\": \"string\"\n   },\n   \"type\": \"object\"\n  },\n  \"servers\": {\n   \"description\": \"A list of server specifications.\",\n   \"items\": {\n    \"properties\": {\n     \"bind\": {\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"defaultEndpoint\": {\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"hosts\": {\n      \"description\": \"One or more hosts exposed by this gateway.\",\n      \"items\": {\n       \"format\": \"string\",\n       \"type\": \"string\"\n      },\n      \"type\": \"array\"\n     },\n     \"name\": {\n      \"description\": \"An optional name of the server, when set must be unique across all servers.\",\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"port\": {\n      \"properties\": {\n       \"name\": {\n        \"description\": \"Label assigned to the port.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"number\": {\n        \"description\": \"A valid non-negative integer port number.\",\n        \"type\": \"integer\"\n       },\n       \"protocol\": {\n        \"description\": \"The protocol exposed on the port.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"targetPort\": {\n        \"type\": \"integer\"\n       }\n      },\n      \"type\": \"object\"\n     },\n     \"tls\": {\n      \"description\": \"Set of TLS related options that govern the server's behavior.\",\n      \"properties\": {\n       \"caCertificates\": {\n        \"description\": \"REQUIRED if mode is `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"cipherSuites\": {\n        \"description\": \"Optional: If specified, only support the specified cipher list.\",\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"credentialName\": {\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"httpsRedirect\": {\n        \"type\": \"boolean\"\n       },\n       \"maxProtocolVersion\": {\n        \"description\": \"Optional: Maximum TLS protocol version.\",\n        \"enum\": [\n         \"TLS_AUTO\",\n         \"TLSV1_0\",\n         \"TLSV1_1\",\n         \"TLSV1_2\",\n         \"TLSV1_3\"\n        ],\n        \"type\": \"string\"\n       },\n       \"minProtocolVersion\": {\n        \"description\": \"Optional: Minimum TLS protocol version.\",\n        \"enum\": [\n         \"TLS_AUTO\",\n         \"TLSV1_0\",\n         \"TLSV1_1\",\n         \"TLSV1_2\",\n         \"TLSV1_3\"\n        ],\n        \"type\": \"string\"\n       },\n       \"mode\": {\n        \"enum\": [\n         \"PASSTHROUGH\",\n         \"SIMPLE\",\n         \"MUTUAL\",\n         \"AUTO_PASSTHROUGH\",\n         \"ISTIO_MUTUAL\"\n        ],\n        \"type\": \"string\"\n       },\n       \"privateKey\": {\n        \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"serverCertificate\": {\n        \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"subjectAltNames\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"verifyCertificateHash\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"verifyCertificateSpki\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       }\n      },\n      \"type\": \"object\"\n     }\n    },\n    \"type\": \"object\"\n   },\n   \"type\": \"array\"\n  }\n },\n \"title\": \"Gateway\",\n \"type\": \"object\"\n}"}
+{"kind":"Gateway","apiVersion":"networking.istio.io/v1alpha3","displayName":"Gateway","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"ISTIO","version":"1.10.0-alpha.0","displayName":"Istio","category": {"name":"Cloud Native Network","metadata":null},"subCategory":"Service Mesh"},"schema":"{\n \"description\": \"Configuration affecting edge load balancer. See more details at: https://istio.io/docs/reference/config/networking/gateway.html\",\n \"properties\": {\n  \"selector\": {\n   \"additionalProperties\": {\n    \"format\": \"string\",\n    \"type\": \"string\"\n   },\n   \"type\": \"object\"\n  },\n  \"servers\": {\n   \"description\": \"A list of server specifications.\",\n   \"items\": {\n    \"properties\": {\n     \"bind\": {\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"defaultEndpoint\": {\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"hosts\": {\n      \"description\": \"One or more hosts exposed by this gateway.\",\n      \"items\": {\n       \"format\": \"string\",\n       \"type\": \"string\"\n      },\n      \"type\": \"array\"\n     },\n     \"name\": {\n      \"description\": \"An optional name of the server, when set must be unique across all servers.\",\n      \"format\": \"string\",\n      \"type\": \"string\"\n     },\n     \"port\": {\n      \"properties\": {\n       \"name\": {\n        \"description\": \"Label assigned to the port.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"number\": {\n        \"description\": \"A valid non-negative integer port number.\",\n        \"type\": \"integer\"\n       },\n       \"protocol\": {\n        \"description\": \"The protocol exposed on the port.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"targetPort\": {\n        \"type\": \"integer\"\n       }\n      },\n      \"type\": \"object\"\n     },\n     \"tls\": {\n      \"description\": \"Set of TLS related options that govern the server's behavior.\",\n      \"properties\": {\n       \"caCertificates\": {\n        \"description\": \"REQUIRED if mode is `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"cipherSuites\": {\n        \"description\": \"Optional: If specified, only support the specified cipher list.\",\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"credentialName\": {\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"httpsRedirect\": {\n        \"type\": \"boolean\"\n       },\n       \"maxProtocolVersion\": {\n        \"description\": \"Optional: Maximum TLS protocol version.\",\n        \"enum\": [\n         \"TLS_AUTO\",\n         \"TLSV1_0\",\n         \"TLSV1_1\",\n         \"TLSV1_2\",\n         \"TLSV1_3\"\n        ],\n        \"type\": \"string\"\n       },\n       \"minProtocolVersion\": {\n        \"description\": \"Optional: Minimum TLS protocol version.\",\n        \"enum\": [\n         \"TLS_AUTO\",\n         \"TLSV1_0\",\n         \"TLSV1_1\",\n         \"TLSV1_2\",\n         \"TLSV1_3\"\n        ],\n        \"type\": \"string\"\n       },\n       \"mode\": {\n        \"enum\": [\n         \"PASSTHROUGH\",\n         \"SIMPLE\",\n         \"MUTUAL\",\n         \"AUTO_PASSTHROUGH\",\n         \"ISTIO_MUTUAL\"\n        ],\n        \"type\": \"string\"\n       },\n       \"privateKey\": {\n        \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"serverCertificate\": {\n        \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n        \"format\": \"string\",\n        \"type\": \"string\"\n       },\n       \"subjectAltNames\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"verifyCertificateHash\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       },\n       \"verifyCertificateSpki\": {\n        \"items\": {\n         \"format\": \"string\",\n         \"type\": \"string\"\n        },\n        \"type\": \"array\"\n       }\n      },\n      \"type\": \"object\"\n     }\n    },\n    \"type\": \"object\"\n   },\n   \"type\": \"array\"\n  }\n },\n \"title\": \"Gateway\",\n \"type\": \"object\"\n}"}

templates/meshmodel/components/1.10.0-alpha.0/grafanaistioaddon_meshmodel.json

@@ -12,10 +12,10 @@
 		"shape": "circle"
 	},
 	"model": {
-		"name": "istio",
+		"name": "ISTIO",
 		"version": "1.10.0-alpha.0",
-		"displayName": "istio",
-		"category": {"name":"Service Mesh","metadata":null},
+		"displayName": "Istio",
+		"category": {"name":"Cloud Native Network","metadata":null},
 		"subCategory": ""
 	},
 	"schema": "{\n\t\"$id\": \"http://meshery.layer5.io/definition/Workload/PrometheusIstioAddon\",\n\t\"$schema\": \"http://json-schema.org/draft-07/schema\",\n\t\"properties\": {},\n\t\"title\": \"GrafanaIstioAddon\",\n\t\"type\": \"object\"\n}"

templates/meshmodel/components/1.10.0-alpha.0/istioMesh_meshmodel.json

@@ -12,10 +12,10 @@
 		"shape": "circle"
 	},
 	"model": {
-		"name": "istio",
+		"name": "ISTIO",
 		"version": "1.10.0-alpha.0",
-		"displayName": "ISTIO",
-		"category": {"name":"Service Mesh","metadata":null},
+		"displayName": "Istio",
+		"category": {"name":"Cloud Native Network","metadata":null},
 		"subCategory": ""
 	},
 	"schema": "{\"properties\":{},\"profile\":{\"description\":\"name of the profile\",\"enum\":[\"default\",\"minimal\",\"demo\"],\"type\":\"string\"},\"required\":[\"profile\"],\"title\":\"IstioMesh\",\"type\":\"object\"}"

templates/meshmodel/components/1.10.0-alpha.0/jaegeristioaddon_meshmodel.json

@@ -1 +1 @@
-{"kind":"JaegerIstioAddon","apiVersion":"core.meshmodel.dev/v1alpha1","displayName":"Jaeger Istio Addon","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","category":{"name":"Service Mesh","metadata":null},"subCategory":""},"schema":"{\"properties\":{},\"title\":\"JaegerIstioAddon\",\"type\":\"object\"}"}
+{"kind":"JaegerIstioAddon","apiVersion":"core.meshmodel.dev/v1alpha1","displayName":"Jaeger Istio Addon","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"ISTIO","version":"1.10.0-alpha.0","displayName":"Istio","category":{"name":"Cloud Native Network","metadata":null},"subCategory":""},"schema":"{\"properties\":{},\"title\":\"JaegerIstioAddon\",\"type\":\"object\"}"}