Merge pull request #273 from hyperledger-labs/additional-props-in-config

Jakub Dzikowski · web-flow · commit 31f59fa5b43d · 2022-01-05T11:37:30.000+01:00
Allow additional properties in Fablo config
diff --git a/docs/schema.json b/docs/schema.json
@@ -84,8 +84,7 @@
               ],
               "default": "info"
             }
-          },
-          "additionalProperties": false
+          }
         },
         "tools": {
           "$id": "#/properties/global/properties/tools",
@@ -100,8 +99,7 @@
             }
           }
         }
-      },
-      "additionalProperties": false
+      }
     },
     "orgs": {
       "$id": "#/properties/orgs",
@@ -174,8 +172,7 @@
                 "type": "string",
                 "pattern": "^[a-z0-9\\.\\-]+$"
               }
-            },
-            "additionalProperties": false
+            }
           },
           "ca": {
             "$id": "#/properties/orgs/items/properties/ca",
@@ -198,8 +195,7 @@
                   "postgres"
                 ]
               }
-            },
-            "additionalProperties": false
+            }
           },
           "orderers": {
             "$id": "#/properties/orgs/items/properties/orderers",
@@ -252,8 +248,7 @@
                   "minimum": 1,
                   "maximum": 9
                 }
-              },
-              "additionalProperties": false
+              }
             }
           },
           "peer": {
@@ -293,8 +288,7 @@
                   "CouchDb"
                 ]
               }
-            },
-            "additionalProperties": false
+            }
           },
           "tools": {
             "$id": "#/properties/orgs/items/properties/tools",
@@ -312,11 +306,9 @@
                 "title": "Blockchain Explorer enabled",
                 "type": "boolean"
               }
-            },
-            "additionalProperties": false
+            }
           }
-        },
-        "additionalProperties": false
+        }
       }
     },
     "channels": {
@@ -408,12 +400,10 @@
                     "pattern": "^[a-z0-9]+$"
                   }
                 }
-              },
-              "additionalProperties": false
+              }
             }
           }
-        },
-        "additionalProperties": false
+        }
       }
     },
     "chaincodes": {
@@ -541,12 +531,10 @@
                     ]
                   }
                 }
-              },
-              "additionalProperties": false
+              }
             }
           }
-        },
-        "additionalProperties": false
+        }
       }
     },
     "hooks": {
@@ -561,9 +549,7 @@
           "description": "Operation to run run after a network config is generated",
           "type": "string"
         }
-      },
-      "additionalProperties": false
+      }
     }
-  },
-  "additionalProperties": false
+  }
 }
diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap
@@ -4,7 +4,6 @@ exports[`schema should match snapshot 1`] = `
 Object {
   "$id": "http://example.com/example.json",
   "$schema": "http://json-schema.org/draft-07/schema",
-  "additionalProperties": false,
   "default": Object {},
   "properties": Object {
     "$schema": Object {
@@ -25,7 +24,6 @@ Object {
       ],
       "items": Object {
         "$id": "#/properties/chaincodes/items",
-        "additionalProperties": false,
         "properties": Object {
           "channel": Object {
             "$id": "#/properties/chaincodes/items/properties/channel",
@@ -83,7 +81,6 @@ Object {
             "$id": "#/properties/chaincodes/items/properties/privateData",
             "items": Object {
               "$id": "#/properties/chaincodes/items/properties/privateData/items",
-              "additionalProperties": false,
               "properties": Object {
                 "name": Object {
                   "$id": "#/properties/chaincodes/items/properties/privateData/items/properties/name",
@@ -171,7 +168,6 @@ Object {
       ],
       "items": Object {
         "$id": "#/properties/channels/items",
-        "additionalProperties": false,
         "properties": Object {
           "name": Object {
             "$id": "#/properties/channels/items/properties/name",
@@ -189,7 +185,6 @@ Object {
             "$id": "#/properties/channels/items/properties/orgs",
             "items": Object {
               "$id": "#/properties/channels/items/properties/orgs/items",
-              "additionalProperties": false,
               "properties": Object {
                 "name": Object {
                   "$id": "#/properties/channels/items/properties/orgs/items/properties/name",
@@ -242,7 +237,6 @@ Object {
     },
     "global": Object {
       "$id": "#/properties/global",
-      "additionalProperties": false,
       "description": "Basic settings of the Hyperledger Fabric network",
       "properties": Object {
         "fabricVersion": Object {
@@ -283,7 +277,6 @@ Object {
         },
         "monitoring": Object {
           "$id": "#/properties/monitoring",
-          "additionalProperties": false,
           "description": "Optional settings for monitoring purposes",
           "properties": Object {
             "loglevel": Object {
@@ -331,7 +324,6 @@ Object {
     },
     "hooks": Object {
       "$id": "#/properties/hooks",
-      "additionalProperties": false,
       "description": "Operations (bash scripts or commands) that should be executed after specific events. The PWD for the Hooks is set to 'fablo-target' directory",
       "properties": Object {
         "postGenerate": Object {
@@ -380,11 +372,9 @@ Object {
       ],
       "items": Object {
         "$id": "#/properties/orgs/items",
-        "additionalProperties": false,
         "properties": Object {
           "ca": Object {
             "$id": "#/properties/orgs/items/properties/ca",
-            "additionalProperties": false,
             "properties": Object {
               "db": Object {
                 "$id": "#/properties/orgs/items/properties/ca/properties/db",
@@ -418,7 +408,6 @@ Object {
             ],
             "items": Object {
               "$id": "#/properties/orgs/items/properties/orderers/items",
-              "additionalProperties": false,
               "properties": Object {
                 "groupName": Object {
                   "$id": "#/properties/orgs/items/properties/orderers/items/properties/groupName",
@@ -463,7 +452,6 @@ Object {
           },
           "organization": Object {
             "$id": "#/properties/orgs/items/properties/organization",
-            "additionalProperties": false,
             "properties": Object {
               "domain": Object {
                 "$id": "#/properties/orgs/items/properties/organization/properties/domain",
@@ -493,7 +481,6 @@ Object {
           },
           "peer": Object {
             "$id": "#/properties/orgs/items/properties/peer",
-            "additionalProperties": false,
             "properties": Object {
               "anchorPeerInstances": Object {
                 "$id": "#/properties/orgs/items/properties/peer/properties/anchorPeerInstances",
@@ -533,7 +520,6 @@ Object {
           },
           "tools": Object {
             "$id": "#/properties/orgs/items/properties/tools",
-            "additionalProperties": false,
             "properties": Object {
               "explorer": Object {
                 "$id": "#/properties/orgs/items/properties/tools/properties/explorer",
diff --git a/e2e/schema.test.ts b/e2e/schema.test.ts
@@ -186,7 +186,6 @@ describe("schema", () => {
     expect(withTools({ fabloRest: true })).toMatchSchema(schema);
     expect(withTools({ fabloRest: false })).toMatchSchema(schema);
     expect(withTools({})).toMatchSchema(schema);
-    expect(withTools({ unknown: true })).not.toMatchSchema(schema);
   });
 
   it("should validate channel name - no spaces and capital letters", () => {

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@`
`84`	`84`	`],`
`85`	`85`	`"default": "info"`
`86`	`86`	`}`
`87`		`- },`
`88`		`- "additionalProperties": false`
	`87`	`+ }`
`89`	`88`	`},`
`90`	`89`	`"tools": {`
`91`	`90`	`"$id": "#/properties/global/properties/tools",`
`@@ -100,8 +99,7 @@`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`	`}`
`103`		`- },`
`104`		`- "additionalProperties": false`
	`102`	`+ }`
`105`	`103`	`},`
`106`	`104`	`"orgs": {`
`107`	`105`	`"$id": "#/properties/orgs",`
`@@ -174,8 +172,7 @@`
`174`	`172`	`"type": "string",`
`175`	`173`	`"pattern": "^[a-z0-9\\.\\-]+$"`
`176`	`174`	`}`
`177`		`- },`
`178`		`- "additionalProperties": false`
	`175`	`+ }`
`179`	`176`	`},`
`180`	`177`	`"ca": {`
`181`	`178`	`"$id": "#/properties/orgs/items/properties/ca",`
`@@ -198,8 +195,7 @@`
`198`	`195`	`"postgres"`
`199`	`196`	`]`
`200`	`197`	`}`
`201`		`- },`
`202`		`- "additionalProperties": false`
	`198`	`+ }`
`203`	`199`	`},`
`204`	`200`	`"orderers": {`
`205`	`201`	`"$id": "#/properties/orgs/items/properties/orderers",`
`@@ -252,8 +248,7 @@`
`252`	`248`	`"minimum": 1,`
`253`	`249`	`"maximum": 9`
`254`	`250`	`}`
`255`		`- },`
`256`		`- "additionalProperties": false`
	`251`	`+ }`
`257`	`252`	`}`
`258`	`253`	`},`
`259`	`254`	`"peer": {`
`@@ -293,8 +288,7 @@`
`293`	`288`	`"CouchDb"`
`294`	`289`	`]`
`295`	`290`	`}`
`296`		`- },`
`297`		`- "additionalProperties": false`
	`291`	`+ }`
`298`	`292`	`},`
`299`	`293`	`"tools": {`
`300`	`294`	`"$id": "#/properties/orgs/items/properties/tools",`
`@@ -312,11 +306,9 @@`
`312`	`306`	`"title": "Blockchain Explorer enabled",`
`313`	`307`	`"type": "boolean"`
`314`	`308`	`}`
`315`		`- },`
`316`		`- "additionalProperties": false`
	`309`	`+ }`
`317`	`310`	`}`
`318`		`- },`
`319`		`- "additionalProperties": false`
	`311`	`+ }`
`320`	`312`	`}`
`321`	`313`	`},`
`322`	`314`	`"channels": {`
`@@ -408,12 +400,10 @@`
`408`	`400`	`"pattern": "^[a-z0-9]+$"`
`409`	`401`	`}`
`410`	`402`	`}`
`411`		`- },`
`412`		`- "additionalProperties": false`
	`403`	`+ }`
`413`	`404`	`}`
`414`	`405`	`}`
`415`		`- },`
`416`		`- "additionalProperties": false`
	`406`	`+ }`
`417`	`407`	`}`
`418`	`408`	`},`
`419`	`409`	`"chaincodes": {`
`@@ -541,12 +531,10 @@`
`541`	`531`	`]`
`542`	`532`	`}`
`543`	`533`	`}`
`544`		`- },`
`545`		`- "additionalProperties": false`
	`534`	`+ }`
`546`	`535`	`}`
`547`	`536`	`}`
`548`		`- },`
`549`		`- "additionalProperties": false`
	`537`	`+ }`
`550`	`538`	`}`
`551`	`539`	`},`
`552`	`540`	`"hooks": {`
`@@ -561,9 +549,7 @@`
`561`	`549`	`"description": "Operation to run run after a network config is generated",`
`562`	`550`	`"type": "string"`
`563`	`551`	`}`
`564`		`- },`
`565`		`- "additionalProperties": false`
	`552`	`+ }`
`566`	`553`	`}`
`567`		`- },`
`568`		`- "additionalProperties": false`
	`554`	`+ }`
`569`	`555`	`}`