Repository navigation
feat (fabric-x): Simplify the Fabric-X configuration schema #874
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
base: main
Are you sure you want to change the base?
Changes from all commits
97860f3
5fd027b
95c0d23
940a725
3d95f97
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,7 @@ | |
| "required": [ | ||
| "global", | ||
| "orgs", | ||
| "channels", | ||
| "chaincodes" | ||
| "channels" | ||
| ], | ||
| "properties": { | ||
| "$schema": { | ||
|
|
@@ -19,10 +18,7 @@ | |
| "title": "Global network settings", | ||
| "description": "Basic settings of the Hyperledger Fabric network", | ||
| "type": "object", | ||
| "required": [ | ||
| "fabricVersion", | ||
| "tls" | ||
| ], | ||
| "required": [], | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. jsyk this makes these fields optional for classic Fabric too I tested the schema after removing The issue asks for provider-specific rules, so please keep the shared schema but use draft-07 if/ cli only checks are not enough because editors and other tools consume schema.json directly |
||
| "properties": { | ||
| "fabricVersion": { | ||
| "$id": "#/properties/global/properties/fabricVersion", | ||
|
|
@@ -415,8 +411,7 @@ | |
| "title": "Channel", | ||
| "type": "object", | ||
| "required": [ | ||
| "name", | ||
| "orgs" | ||
| "name" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
|
|
@@ -440,8 +435,7 @@ | |
| "title": "Organization", | ||
| "type": "object", | ||
| "required": [ | ||
| "name", | ||
| "peers" | ||
| "name" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
|
|
@@ -692,71 +686,18 @@ | |
| "type": "object", | ||
| "title": "Fabric-X settings (EXPERIMENTAL)", | ||
| "description": "Settings of the 'fabric-x' provider. Ignored for the 'fabric' provider.", | ||
| "required": [ | ||
| "orderer" | ||
| ], | ||
| "properties": { | ||
| "orderer": { | ||
| "$id": "#/properties/fabricX/properties/orderer", | ||
| "type": "object", | ||
| "title": "Orderer", | ||
| "required": [ | ||
| "parties" | ||
| ], | ||
| "properties": { | ||
| "parties": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties", | ||
| "type": "array", | ||
| "title": "Orderer parties", | ||
| "description": "A party is an organization of the orderer with its own router, batcher, consenter and assembler. Fablo currently supports 1 party (the quick default) or 4 parties (a local profile for BFT testing).", | ||
| "default": [ | ||
| { | ||
| "organization": { | ||
| "name": "Orderer", | ||
| "domain": "orderer.example.com", | ||
| "mspName": "OrdererOrdererMSP" | ||
| } | ||
| } | ||
| ], | ||
| "items": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties/items", | ||
| "title": "Orderer party", | ||
| "type": "object", | ||
| "required": [ | ||
| "organization" | ||
| ], | ||
| "properties": { | ||
| "organization": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties/items/properties/organization", | ||
| "title": "Organization of the party", | ||
| "type": "object", | ||
| "required": [ | ||
| "name", | ||
| "domain" | ||
| ], | ||
| "properties": { | ||
| "name": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties/items/properties/organization/properties/name", | ||
| "title": "Name", | ||
| "type": "string", | ||
| "pattern": "^[a-zA-Z0-9]+$" | ||
| }, | ||
| "mspName": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties/items/properties/organization/properties/mspName", | ||
| "title": "MSP Name", | ||
| "type": "string", | ||
| "pattern": "^[a-zA-Z0-9]+$" | ||
| }, | ||
| "domain": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/parties/items/properties/organization/properties/domain", | ||
| "title": "Domain", | ||
| "type": "string", | ||
| "pattern": "^[a-z0-9\\.\\-]+$" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| "partyCount": { | ||
| "$id": "#/properties/fabricX/properties/orderer/properties/partyCount", | ||
| "type": "integer", | ||
| "title": "Number of orderer parties", | ||
| "description": "A party is an organization of the orderer with its own router, batcher, consenter and assembler. Fablo derives the organizations of the parties. Fablo currently supports 1 party (the quick default) or 4 parties (a local profile for BFT testing).", | ||
| "default": 1 | ||
| } | ||
| } | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
“Compact” only makes sense relative to the old unreleased format
Just update the documentation with the new schema instead of this new section, not sure why users need to understand the simplification history when fabric-x on fablo hasn't released yet