Validation changes to make explicit Fablo supports Fabric up to 3.0.0-beta

dzikowski · dzikowski · commit 357d0d7ef6ea · 2024-12-07T11:01:35.000+01:00
Signed-off-by: Jakub Dzikowski &lt;jakub.t.dzikowski@gmail.com&gt;
diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap
@@ -9806,14 +9806,14 @@ exports[`extend config samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
       "orderer": "V2_0",
     },
     "engine": "docker",
-    "fabricBaseosVersion": "3.0.0",
+    "fabricBaseosVersion": "3.0.0-beta",
     "fabricCaVersion": "1.5.5",
-    "fabricCcenvVersion": "3.0.0",
+    "fabricCcenvVersion": "3.0.0-beta",
     "fabricJavaenvVersion": "2.5",
     "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
     "fabricToolsVersion": "3.0.0-beta",
-    "fabricVersion": "3.0.0",
+    "fabricVersion": "3.0.0-beta",
     "monitoring": {
       "loglevel": "debug",
     },
@@ -10764,14 +10764,14 @@ exports[`extend config samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] =
       "orderer": "V2_0",
     },
     "engine": "docker",
-    "fabricBaseosVersion": "3.0.0",
+    "fabricBaseosVersion": "3.0.0-beta",
     "fabricCaVersion": "1.5.5",
-    "fabricCcenvVersion": "3.0.0",
+    "fabricCcenvVersion": "3.0.0-beta",
     "fabricJavaenvVersion": "2.5",
     "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
     "fabricToolsVersion": "3.0.0-beta",
-    "fabricVersion": "3.0.0",
+    "fabricVersion": "3.0.0-beta",
     "monitoring": {
       "loglevel": "debug",
     },
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
@@ -1,5 +1,43 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/.npm/_logs/2024-12-07T09_57_41_821Z-debug-0.log from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
+"0 verbose cli /usr/local/bin/node /usr/local/bin/npm
+1 info using npm@9.5.1
+2 info using node@v18.16.0
+3 timing npm:load:whichnode Completed in 6ms
+4 timing config:load:defaults Completed in 1ms
+5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 1ms
+6 timing config:load:builtin Completed in 1ms
+7 timing config:load:cli Completed in 2ms
+8 timing config:load:env Completed in 0ms
+9 timing config:load:project Completed in 7ms
+10 timing config:load:file:/network/workspace/.npmrc Completed in 2ms
+11 timing config:load:user Completed in 2ms
+12 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
+13 timing config:load:global Completed in 0ms
+14 timing config:load:setEnvs Completed in 0ms
+15 timing config:load Completed in 15ms
+16 timing npm:load:configload Completed in 15ms
+17 timing npm:load:mkdirpcache Completed in 8ms
+18 timing npm:load:mkdirplogs Completed in 12ms
+19 verbose title npm root
+20 verbose argv "root" "--global"
+21 timing npm:load:setTitle Completed in 2ms
+22 timing config:load:flatten Completed in 2ms
+23 timing npm:load:display Completed in 3ms
+24 verbose logfile logs-max:10 dir:/network/workspace/.npm/_logs/2024-12-07T09_57_41_821Z-
+25 verbose logfile /network/workspace/.npm/_logs/2024-12-07T09_57_41_821Z-debug-0.log
+26 timing npm:load:logFile Completed in 68ms
+27 timing npm:load:timers Completed in 0ms
+28 timing npm:load:configScope Completed in 0ms
+29 timing npm:load Completed in 118ms
+30 timing command:root Completed in 5ms
+31 verbose exit 0
+32 timing npm Completed in 140ms
+33 info ok
+"
+`;
+
 exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/.gitignore from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
 "/config
 /crypto-config
@@ -1521,12 +1559,12 @@ CHAINCODES_BASE_DIR=<absolute path>
 COMPOSE_PROJECT_NAME=<name with timestamp>
 LOGGING_LEVEL=debug
 
-FABRIC_VERSION=3.0.0
+FABRIC_VERSION=3.0.0-beta
 FABRIC_TOOLS_VERSION=3.0.0-beta
 FABRIC_CA_VERSION=1.5.5
 FABRIC_CA_POSTGRES_VERSION=14
-FABRIC_CCENV_VERSION=3.0.0
-FABRIC_BASEOS_VERSION=3.0.0
+FABRIC_CCENV_VERSION=3.0.0-beta
+FABRIC_BASEOS_VERSION=3.0.0-beta
 FABRIC_JAVAENV_VERSION=2.5
 FABRIC_NODEENV_VERSION=2.5
 RECOMMENDED_NODE_VERSION=16
@@ -3406,6 +3444,7 @@ echo "Executing post-generate hook"
 
 exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper files from samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
 [
+  "e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/.npm/_logs/2024-12-07T09_57_41_821Z-debug-0.log",
   "e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/.gitignore",
   "e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/configtx.yaml",
   "e2e/__tmp__/samples/fablo-config-hlf3-1orgs-1chaincode.json.tmpdir/fablo-target/fabric-config/connection-profiles/connection-profile-orderer.json",
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
@@ -1547,12 +1547,12 @@ CHAINCODES_BASE_DIR=<absolute path>
 COMPOSE_PROJECT_NAME=<name with timestamp>
 LOGGING_LEVEL=debug
 
-FABRIC_VERSION=3.0.0
+FABRIC_VERSION=3.0.0-beta
 FABRIC_TOOLS_VERSION=3.0.0-beta
 FABRIC_CA_VERSION=1.5.5
 FABRIC_CA_POSTGRES_VERSION=14
-FABRIC_CCENV_VERSION=3.0.0
-FABRIC_BASEOS_VERSION=3.0.0
+FABRIC_CCENV_VERSION=3.0.0-beta
+FABRIC_BASEOS_VERSION=3.0.0-beta
 FABRIC_JAVAENV_VERSION=2.5
 FABRIC_NODEENV_VERSION=2.5
 RECOMMENDED_NODE_VERSION=16
diff --git a/samples/fablo-config-hlf3-1orgs-1chaincode.json b/samples/fablo-config-hlf3-1orgs-1chaincode.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
     "global": {
-      "fabricVersion": "3.0.0",
+      "fabricVersion": "3.0.0-beta",
       "tls": true,
       "monitoring": {
         "loglevel": "debug"
diff --git a/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json b/samples/fablo-config-hlf3-bft-1orgs-1chaincode.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",
     "global": {
-      "fabricVersion": "3.0.0",
+      "fabricVersion": "3.0.0-beta",
       "tls": true,
       "monitoring": {
         "loglevel": "debug"
diff --git a/src/repositoryUtils.test.ts b/src/repositoryUtils.test.ts
@@ -19,5 +19,9 @@ describe("repositoryUtils", () => {
     expect(version("1.4.0").isGreaterOrEqual("1.4.1")).toBe(false);
     expect(version("1.4.0").isGreaterOrEqual("1.3.0")).toBe(true);
     expect(version("1.4.0").isGreaterOrEqual("2.1.0")).toBe(false);
+    expect(version("3.0.0").isGreaterOrEqual("3.0.0-beta")).toBe(true);
+    expect(version("3.0.0-beta").isGreaterOrEqual("3.0.0")).toBe(true);
+    expect(version("3.0.0").isGreaterOrEqual("3.0.0")).toBe(true);
+    expect(version("3.0.0").isGreaterOrEqual("3.0.1")).toBe(false);
   });
 });
diff --git a/src/validate/index.ts b/src/validate/index.ts
@@ -90,6 +90,7 @@ class ValidateGenerator extends Generator {
     this._validateIfConfigFileExists(this.options.fabloConfig);
 
     const networkConfig = parseFabloConfig(this.fs.read(this.options.fabloConfigPath));
+    this._validateFabricVersion(networkConfig.global);
     this._validateJsonSchema(networkConfig);
     this._validateSupportedFabloVersion(networkConfig.$schema);
     this._validateOrgs(networkConfig.orgs);
@@ -122,6 +123,26 @@ class ValidateGenerator extends Generator {
     this._verifyFabricVersion(networkConfig.global);
   }
 
+  private _validateFabricVersion(global: GlobalJson) {
+    // 1. we support fabric up to 3.0.0-beta
+    if (version(global.fabricVersion).isGreaterOrEqual("3.0.0") && global.fabricVersion !== "3.0.0-beta") {
+      const objectToEmit = {
+        category: validationCategories.CRITICAL,
+        message: `Fabric ${global.fabricVersion} is not supported. Fablo supports only Fabric up to 3.0.0-beta.`,
+      };
+      this.emit(validationErrorType.CRITICAL, objectToEmit);
+    }
+
+    // 2. we support Fabric starting from 2.0.0
+    if (!version(global.fabricVersion).isGreaterOrEqual("2.0.0")) {
+      const objectToEmit = {
+        category: validationCategories.CRITICAL,
+        message: `Fabric ${global.fabricVersion} is not supported. Fablo supports only Fabric starting from 2.0.0.`,
+      };
+      this.emit(validationErrorType.CRITICAL, objectToEmit);
+    }
+  }
+
   async shortSummary() {
     console.log(`Validation errors count: ${this.errors.count()}`);
     console.log(`Validation warnings count: ${this.warnings.count()}`);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.0.0/schema.json",`
`3`	`3`	`"global": {`
`4`		`- "fabricVersion": "3.0.0",`
	`4`	`+ "fabricVersion": "3.0.0-beta",`
`5`	`5`	`"tls": true,`
`6`	`6`	`"monitoring": {`
`7`	`7`	`"loglevel": "debug"`