Merge pull request #515 from hyperledger-labs/bump-version-2.2.0

dzikowski · web-flow · commit 8e7f3ffabb07 · 2025-03-24T13:29:35.000+01:00
diff --git a/README.md b/README.md
@@ -23,13 +23,13 @@ You may keep the script in the root directory of your project or install it glob
 To install it globally:
 
 ```bash
-sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
+sudo curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/fablo.sh -o /usr/local/bin/fablo && sudo chmod +x /usr/local/bin/fablo
 ```
 
 To get a copy of Fablo for a single project, execute in the project root:
 
 ```bash
-curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/fablo.sh -o ./fablo && chmod +x ./fablo
+curl -Lf https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/fablo.sh -o ./fablo && chmod +x ./fablo
 ```
 
 ## Getting started
@@ -344,7 +344,7 @@ The basic structure of Fablo config file is as follows:
 
 ```json
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": { ... },
   "orgs": [ ... ],
   "channels": [ ... ],
@@ -507,7 +507,7 @@ Genrated Hooks are saved in `fablo-target/hooks`.
 
 ```yaml
 ---
-"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
+"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json
 global:
   fabricVersion: 2.4.2
   tls: false
diff --git a/docs/sample.json b/docs/sample.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.3.2",
     "tls": false,
diff --git a/docs/schema.json b/docs/schema.json
@@ -12,7 +12,7 @@
   ],
   "properties": {
     "$schema": {
-      "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json"
+      "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json"
     },
     "global": {
       "$id": "#/properties/global",
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap
@@ -86,7 +86,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
 REPOSITORY="https://kfsoftware.github.io/hlf-helm-charts"
 STORAGE_CLASS=$(kubectl describe sc | grep Name | tr -s ' ' | cut -d ':' -f 2 | cut -d ' ' -f 2)
 
-FABLO_VERSION=2.1.0
+FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_CONFIG=<absolute path>
 ORDERER_IMAGE=hyperledger/fabric-orderer
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap
@@ -1524,7 +1524,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
@@ -1435,7 +1435,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap
@@ -2096,7 +2096,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
@@ -3019,7 +3019,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
@@ -3314,7 +3314,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap
@@ -1511,7 +1511,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap
@@ -1536,7 +1536,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] = `
-"FABLO_VERSION=2.1.0
+"FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
 HYPERLEDGER_EXPLORER_VERSION=1.1.8
diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap
@@ -2965,7 +2965,7 @@ Validation warnings count: 0
 
 exports[`init should init simple fablo config 1`] = `
 "{
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.5.9",
     "tls": false,
@@ -3019,7 +3019,7 @@ exports[`init should init simple fablo config 1`] = `
 
 exports[`init should init simple fablo config with node chaincode 1`] = `
 "{
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.5.9",
     "tls": false,
@@ -3081,7 +3081,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `
 
 exports[`init should init simple fablo config with node chaincode and rest api 1`] = `
 "{
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.5.9",
     "tls": false,
diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap
@@ -7,7 +7,7 @@ exports[`schema should match snapshot 1`] = `
   "default": {},
   "properties": {
     "$schema": {
-      "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+      "const": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
     },
     "chaincodes": {
       "$id": "#/properties/chaincodes",
diff --git a/fablo.sh b/fablo.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-FABLO_VERSION=2.1.0
+FABLO_VERSION=2.2.0
 FABLO_IMAGE_NAME="ghcr.io/fablo-io/fablo"
 FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fablo",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Fablo is a simple tool to generate the Hyperledger Fabric blockchain network and run it on Docker. It supports RAFT and solo consensus protocols, multiple organizations and channels, chaincode installation and upgrade.",
   "author": "Piotr Hejwowski <piotr.hejwowski@gmail.com>, Jakub Dzikowski <jakub@dzikowski.online>",
   "repository": {
diff --git a/samples/fablo-config-hlf2-1org-1chaincode-k8s.json b/samples/fablo-config-hlf2-1org-1chaincode-k8s.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.4.7",
     "tls": false,
diff --git a/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json b/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.3.3",
     "tls": true,
diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.5.9",
     "tls": false
diff --git a/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml b/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml
@@ -1,5 +1,5 @@
 ---
-"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
+"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json
 global:
   fabricVersion: 2.4.7
   tls: false
diff --git a/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml b/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml
@@ -1,5 +1,5 @@
 ---
-"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json
+"$schema": https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json
 global:
   fabricVersion: 2.4.3
   tls: true
diff --git a/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json b/samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
   "global": {
     "fabricVersion": "2.3.2",
     "tls": true,
diff --git a/samples/fablo-config-hlf3-1orgs-1chaincode.json b/samples/fablo-config-hlf3-1orgs-1chaincode.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+    "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
     "global": {
       "fabricVersion": "3.0.0",
       "tls": true,
diff --git a/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json b/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
+    "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
     "global": {
       "fabricVersion": "3.0.0-beta",
       "tls": true,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",`
	`2`	`+ "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",`
`3`	`3`	`"global": {`
`4`	`4`	`"fabricVersion": "2.3.2",`
`5`	`5`	`"tls": false,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "generator-fablo",`
`3`		`- "version": "2.1.0",`
	`3`	`+ "version": "2.2.0",`
`4`	`4`	`"description": "Fablo is a simple tool to generate the Hyperledger Fabric blockchain network and run it on Docker. It supports RAFT and solo consensus protocols, multiple organizations and channels, chaincode installation and upgrade.",`
`5`	`5`	`"author": "Piotr Hejwowski <[email protected]>, Jakub Dzikowski <[email protected]>",`
`6`	`6`	`"repository": {`