Skip to content

chore: put default properties of capabilities outside items #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions schemas/constructs/v1alpha3/relationship_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@
"from": {
"items": {
"kind": "",
"match_strategy_matrix": {
"items": {}
},
"model": {
"id": "",
"schemaVersion": "",
Expand Down
2 changes: 2 additions & 0 deletions schemas/constructs/v1alpha3/relationship_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ selectors:
from:
items:
kind: ''
match_strategy_matrix:
items: {}
model:
id: ''
schemaVersion: ''
Expand Down
16 changes: 8 additions & 8 deletions schemas/constructs/v1beta1/component/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,14 @@
"x-go-type": "capability.Capability",
"x-go-type-import": {
"path": "github.com/meshery/schemas/models/v1alpha1/capability"
},
"default": [
}
},
"x-oapi-codegen-extra-tags": {
"gorm": "type:bytes;serializer:json",
"yaml": "capabilities",
"json": "capabilities"
},
"default": [
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
Expand Down Expand Up @@ -215,12 +221,6 @@
"metadata": null
}
]
},
"x-oapi-codegen-extra-tags": {
"gorm": "type:bytes;serializer:json",
"yaml": "capabilities",
"json": "capabilities"
}
},
"status": {
"x-order": 10,
Expand Down
132 changes: 121 additions & 11 deletions schemas/constructs/v1beta1/component/component_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,20 +114,130 @@
},
"animation": {},
"position": {},
"capabilities": {
"items": {
"schemaVersion": "",
"version": "v0.0.1",
"displayName": "",
"description": "",
"kind": {},
"type": "",
"capabilities": [
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Performance Test",
"description": "Initiate a performance test. Meshery will execute the load generation, collect metrics, and present the results.",
"kind": "action",
"type": "operator",
"subType": "perf-test",
"key": "",
"entityState": [
"instance"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Workload Configuration",
"description": "Configure the workload specific setting of a component",
"kind": "mutate",
"type": "configuration",
"subType": "config",
"key": "",
"entityState": [
"declaration"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Labels and Annotations Configuration",
"description": "Configure Labels And Annotations for the component ",
"kind": "mutate",
"type": "configuration",
"subType": "labels-and-annotations",
"key": "",
"entityState": [
"declaration"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Relationships",
"description": "View relationships for the component",
"kind": "view",
"type": "configuration",
"subType": "relationship",
"key": "",
"entityState": [
"declaration",
"instance"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Json Schema",
"description": "View Component Definition ",
"kind": "view",
"type": "configuration",
"subType": "definition",
"key": "",
"entityState": [
"declaration",
"instance"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Styling",
"description": "Configure the visual styles for the component",
"kind": "mutate",
"type": "style",
"subType": "",
"key": "",
"entityState": {},
"status": "enabled"
"entityState": [
"declaration"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Change Shape",
"description": "Change the shape of the component",
"kind": "mutate",
"type": "style",
"subType": "shape",
"key": "",
"entityState": [
"declaration"
],
"status": "enabled",
"metadata": null
},
{
"schemaVersion": "capability.meshery.io/v1alpha1",
"version": "0.7.0",
"displayName": "Compound Drag And Drop",
"description": "Drag and Drop a component into a parent component in graph view",
"kind": "interaction",
"type": "graph",
"subType": "compoundDnd",
"key": "",
"entityState": [
"declaration"
],
"status": "enabled",
"metadata": null
}
},
],
"status": "enabled",
"instanceDetails": {},
"configuration": {},
Expand Down
105 changes: 97 additions & 8 deletions schemas/constructs/v1beta1/component/component_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,106 @@ styles:
animation: {}
position: {}
capabilities:
items:
schemaVersion: ''
version: v0.0.1
displayName: ''
description: ''
kind: {}
type: ''
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Performance Test
description: >-
Initiate a performance test. Meshery will execute the load generation,
collect metrics, and present the results.
kind: action
type: operator
subType: perf-test
key: ''
entityState:
- instance
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Workload Configuration
description: Configure the workload specific setting of a component
kind: mutate
type: configuration
subType: config
key: ''
entityState:
- declaration
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Labels and Annotations Configuration
description: 'Configure Labels And Annotations for the component '
kind: mutate
type: configuration
subType: labels-and-annotations
key: ''
entityState:
- declaration
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Relationships
description: View relationships for the component
kind: view
type: configuration
subType: relationship
key: ''
entityState:
- declaration
- instance
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Json Schema
description: 'View Component Definition '
kind: view
type: configuration
subType: definition
key: ''
entityState:
- declaration
- instance
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Styling
description: Configure the visual styles for the component
kind: mutate
type: style
subType: ''
key: ''
entityState: {}
entityState:
- declaration
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Change Shape
description: Change the shape of the component
kind: mutate
type: style
subType: shape
key: ''
entityState:
- declaration
status: enabled
metadata: null
- schemaVersion: capability.meshery.io/v1alpha1
version: 0.7.0
displayName: Compound Drag And Drop
description: Drag and Drop a component into a parent component in graph view
kind: interaction
type: graph
subType: compoundDnd
key: ''
entityState:
- declaration
status: enabled
metadata: null
status: enabled
instanceDetails: {}
configuration: {}
Expand Down
Loading