Merge pull request #315 from dzikowski/node16-dco

Node16 dco + merges
hyperledger-labs · May 12, 2022 · ba760de · ba760de
2 parents dfa1ae9 + 9645a3d
commit ba760de
Show file tree

Hide file tree

Showing 42 changed files with 15,370 additions and 434 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12
+18
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.1.0-unstable
+
+### Features
+* Support Fabric Gateway since Fabric 2.4 [#305](https://github.com/hyperledger-labs/fablo/issues/305)
+* Introduce pre-restore hook
+* Add 2.4.2 to supported Hyperledger Fabric versions
+* Update Node.js runtime compatibility ([details](https://github.com/hyperledger-labs/fablo/issues/274))
+* Add `fabricNodeenvVersion` global configuration
+
+### Fixes
+
+### Chore & Maintenance
+
 ## 1.0.2
 
 ### Features

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.16-alpine3.12
+FROM node:18-alpine3.14
 
 RUN apk add --no-cache sudo shfmt
 RUN npm install --global --silent yo

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -7,7 +7,7 @@ executeYeomanCommand() {
 
   # cleanup yeoman files after execution
   # shellcheck disable=SC2064
-  trap "rm -rf \"$yeoman_target_dir/.cache\" \"$yeoman_target_dir/.config\"" EXIT
+  trap "rm -rf \"$yeoman_target_dir/.cache\" \"$yeoman_target_dir/.config\" \"$yeoman_target_dir/.npm\"" EXIT
 
   if [ "$(id -u)" = 0 ]; then
     # root user detected, running as yeoman user

diff --git a/docs/sample.json b/docs/sample.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://github.com/softwaremill/fablo/releases/download/1.0.2/schema.json",
+  "$schema": "https://github.com/softwaremill/fablo/releases/download/1.0.3-unstable/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/softwaremill/fablo/releases/download/1.0.2/schema.json"
+      "const": "https://github.com/softwaremill/fablo/releases/download/1.0.3-unstable/schema.json"
     },
     "global": {
       "$id": "#/properties/global",
@@ -56,9 +56,11 @@
             "2.3.2",
             "2.3.3",
             "2.4.0",
-            "2.4.1"
+            "2.4.1",
+            "2.4.2",
+            "2.4.3"
           ],
-          "default": "2.4.1"
+          "default": "2.4.2"
         },
         "tls": {
           "$id": "#/properties/global/properties/tls",

diff --git a/e2e-network/TEST_CASES.md b/e2e-network/TEST_CASES.md
@@ -2,7 +2,7 @@
 
 | Test case                 | 01-simple | 02-raft   | 03-private| 04-snapshot |
 | ------------------------- |:---------:|:---------:|:---------:|:-----------:|
-| Fabric versions           | 2.4.0     | 2.3.2     | 1.4.11    | 2.3.3       |
+| Fabric versions           | 2.4.0     | 2.3.2     | 1.4.11    | 2.3.3/2.4.2 |
 | TLS                       | no        | yes       | no        | yes         |
 | Channel capabilities      | v2        | v2        | v1_4_3    | v2          |
 | Consensus                 | solo      | RAFT      | solo      | RAFT        |

diff --git a/e2e-network/test-04-snapshot.sh b/e2e-network/test-04-snapshot.sh
@@ -101,10 +101,13 @@ expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
   "KVContract:getPrivateMessage" '["_implicit_org_Org1MSP"]' \
   '{"success":"RHIgUGFtZWxhIElzbGV5"}'
 
+# restore hook to update fabric version
+hook_command="perl -i -pe 's/FABRIC_VERSION=2\.3\.3/FABRIC_VERSION=2\.4\.2/g' ./fablo-target/fabric-docker/.env"
+
 # prune the network and restore from snapshot
 (cd "$TEST_TMP" &&
   "$FABLO_HOME/fablo.sh" prune &&
-  "$FABLO_HOME/fablo.sh" restore "$snapshot_name" &&
+  "$FABLO_HOME/fablo.sh" restore "$snapshot_name" "$hook_command" &&
   "$FABLO_HOME/fablo.sh" start
 )
 waitForChaincode "cli.org1.example.com" "peer0.org1.example.com:7041" "my-channel1" "chaincode1" "0.0.1"