Merge pull request #405 from Hejwo/release-1.2.0

release 1.2.0
hyperledger-labs · Aug 16, 2023 · 6d8c9e6 · 6d8c9e6
2 parents f0b6d09 + 6944338
commit 6d8c9e6
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 133 deletions.
diff --git a/docs/sample.json b/docs/sample.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.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/1.2.0-unstable/schema.json"
+      "const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json"
     },
     "global": {
       "$id": "#/properties/global",
@@ -28,47 +28,6 @@
           "$id": "#/properties/global/properties/fabricVersion",
           "title": "Hyperledger Fabric version",
           "type": "string",
-          "enum": [
-            "1.3.0",
-            "1.4.0",
-            "1.4.1",
-            "1.4.2",
-            "1.4.3",
-            "1.4.4",
-            "1.4.5",
-            "1.4.6",
-            "1.4.7",
-            "1.4.8",
-            "1.4.9",
-            "1.4.10",
-            "1.4.11",
-            "1.4.12",
-            "2.0.1",
-            "2.1.0",
-            "2.1.1",
-            "2.2.0",
-            "2.2.1",
-            "2.2.2",
-            "2.2.3",
-            "2.2.4",
-            "2.2.5",
-            "2.2.6",
-            "2.2.7",
-            "2.2.8",
-            "2.2.9",
-            "2.3.0",
-            "2.3.1",
-            "2.3.2",
-            "2.3.3",
-            "2.4.0",
-            "2.4.1",
-            "2.4.2",
-            "2.4.3",
-            "2.4.4",
-            "2.4.5",
-            "2.4.6",
-            "2.4.7"
-          ],
           "default": "2.4.2"
         },
         "tls": {

diff --git a/e2e/__snapshots__/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.test.ts.snap
@@ -2081,7 +2081,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
-"FABLO_VERSION=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap
@@ -1492,7 +1492,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
-"FABLO_VERSION=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-1chaincode.json.test.ts.snap
@@ -2107,7 +2107,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf1.4-2orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-1chaincode.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-1chaincode.json 1`] = `
-"FABLO_VERSION=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.test.ts.snap
@@ -2088,7 +2088,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml 1`] = `
-"FABLO_VERSION=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

diff --git a/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap
@@ -2278,7 +2278,7 @@ fi
 `;
 
 exports[`samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json 1`] = `
-"FABLO_VERSION=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

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=1.2.0-unstable
+FABLO_VERSION=1.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
@@ -1519,7 +1519,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=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 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
@@ -1429,7 +1429,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=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 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
@@ -3016,7 +3016,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=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 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
@@ -3311,7 +3311,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=1.2.0-unstable
+"FABLO_VERSION=1.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.0
 HYPERLEDGER_EXPLORER_VERSION=1.1.8

diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap
@@ -2907,7 +2907,7 @@ Validation warnings count: 0
 
 exports[`init should init simple fablo config 1`] = `
 "{
-  \\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json\\",
+  \\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
   \\"global\\": {
     \\"fabricVersion\\": \\"2.4.7\\",
     \\"tls\\": false,
@@ -2961,7 +2961,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/1.2.0-unstable/schema.json\\",
+  \\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
   \\"global\\": {
     \\"fabricVersion\\": \\"2.4.7\\",
     \\"tls\\": false,
@@ -3023,7 +3023,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/1.2.0-unstable/schema.json\\",
+  \\"$schema\\": \\"https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json\\",
   \\"global\\": {
     \\"fabricVersion\\": \\"2.4.7\\",
     \\"tls\\": false,

diff --git a/e2e/__snapshots__/schema.test.ts.snap b/e2e/__snapshots__/schema.test.ts.snap
@@ -7,7 +7,7 @@ Object {
   "default": Object {},
   "properties": Object {
     "$schema": Object {
-      "const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+      "const": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
     },
     "chaincodes": Object {
       "$id": "#/properties/chaincodes",
@@ -252,47 +252,6 @@ Object {
         "fabricVersion": Object {
           "$id": "#/properties/global/properties/fabricVersion",
           "default": "2.4.2",
-          "enum": Array [
-            "1.3.0",
-            "1.4.0",
-            "1.4.1",
-            "1.4.2",
-            "1.4.3",
-            "1.4.4",
-            "1.4.5",
-            "1.4.6",
-            "1.4.7",
-            "1.4.8",
-            "1.4.9",
-            "1.4.10",
-            "1.4.11",
-            "1.4.12",
-            "2.0.1",
-            "2.1.0",
-            "2.1.1",
-            "2.2.0",
-            "2.2.1",
-            "2.2.2",
-            "2.2.3",
-            "2.2.4",
-            "2.2.5",
-            "2.2.6",
-            "2.2.7",
-            "2.2.8",
-            "2.2.9",
-            "2.3.0",
-            "2.3.1",
-            "2.3.2",
-            "2.3.3",
-            "2.4.0",
-            "2.4.1",
-            "2.4.2",
-            "2.4.3",
-            "2.4.4",
-            "2.4.5",
-            "2.4.6",
-            "2.4.7",
-          ],
           "title": "Hyperledger Fabric version",
           "type": "string",
         },

diff --git a/e2e/fabloCommands.test.ts b/e2e/fabloCommands.test.ts
@@ -177,7 +177,6 @@ describe("version", () => {
         build: expect.stringMatching(/.*/),
         supported: expect.objectContaining({
           fabloVersions: expect.stringMatching(/.*/),
-          hyperledgerFabricVersions: expect.anything(),
         }),
       }),
     );

diff --git a/e2e/schema.test.ts b/e2e/schema.test.ts
@@ -36,8 +36,8 @@ describe("schema", () => {
 
     expect(withFabricVersion("1.4.3")).toMatchSchema(schema);
     expect(withFabricVersion("1.4.4")).toMatchSchema(schema);
-    expect(withFabricVersion("1.3.1")).not.toMatchSchema(schema);
-    expect(withFabricVersion("2.0.0")).not.toMatchSchema(schema);
+    expect(withFabricVersion("1.3.1")).toMatchSchema(schema);
+    expect(withFabricVersion("2.0.0")).toMatchSchema(schema);
   });
 
   it("should validate first orderer org domain prefix", () => {

diff --git a/fablo.sh b/fablo.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-FABLO_VERSION="1.2.0-unstable"
+FABLO_VERSION="1.2.0"
 FABLO_IMAGE_NAME="softwaremill/fablo"
 FABLO_IMAGE="$FABLO_IMAGE_NAME:$FABLO_VERSION"
 
@@ -188,7 +188,7 @@ networkPrune() {
   if [ -f "$FABLO_TARGET/fabric-k8s.sh" ]; then
     "$FABLO_TARGET/fabric-k8s.sh" down
   fi
-  
+
   echo "Removing $FABLO_TARGET"
   rm -rf "$FABLO_TARGET"
 }

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": "1.2.0-unstable",
+  "version": "1.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 <[email protected]>, Jakub Dzikowski <[email protected]>",
   "repository": {

diff --git a/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json b/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
   "global": {
     "fabricVersion": "1.3.0",
     "tls": false

diff --git a/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json b/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
   "global": {
     "fabricVersion": "1.4.6",
     "tls": true,

diff --git a/samples/fablo-config-hlf1.4-2orgs-1chaincode.json b/samples/fablo-config-hlf1.4-2orgs-1chaincode.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
   "global": {
     "fabricVersion": "1.4.6",
     "tls": false

diff --git a/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml b/samples/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml
@@ -1,5 +1,5 @@
 ---
-"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json
+"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json
 global:
   fabricVersion: 1.4.11
   tls: false

diff --git a/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json b/samples/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
   "global": {
     "fabricVersion": "1.4.6",
     "tls": true

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/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.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/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.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/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.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/1.2.0-unstable/schema.json
+"$schema": https://github.com/hyperledger-labs/fablo/releases/download/1.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/1.2.0-unstable/schema.json",
+  "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.0/schema.json",
   "global": {
     "fabricVersion": "2.3.2",
     "tls": true,

diff --git a/src/config.ts b/src/config.ts
@@ -18,14 +18,11 @@ const getVersionFromSchemaUrl = (url?: string): string => {
 
 const isFabloVersionSupported = (versionName: string): boolean => versionName.startsWith(supportedVersionPrefix);
 
-const supportedFabricVersions = schemaJson.properties.global.properties.fabricVersion.enum as string[];
-
-const versionsSupportingRaft = supportedFabricVersions.filter((v) => version(v).isGreaterOrEqual("1.4.3"));
+const versionsSupportingRaft = (v: string): boolean => version(v).isGreaterOrEqual("1.4.3");
 
 export {
   schema,
   fabloVersion,
-  supportedFabricVersions,
   versionsSupportingRaft,
   getVersionFromSchemaUrl,
   isFabloVersionSupported,