fix and update

Author: OsamaRab3

e2e/__snapshots__/fabloCommands.test.ts.snap

@@ -4,7 +4,6 @@ exports[`extend config should extend custom config 1`] = `
 "Validation errors count: 0
 Validation warnings count: 0
 ===========================================================
-Could not check for updates. Url: 'https://api.github.com/repos/hyperledger-labs/fablo/releases' not available
 {
   "global": {
     "fabricVersion": "2.4.3",

src/init/index.ts

@@ -1,6 +1,6 @@
 import * as Generator from "yeoman-generator";
 import * as chalk from "chalk";
-import { GlobalJson, FabloConfigJson } from "../types/FabloConfigJson";
+import { FabloConfigJson } from "../types/FabloConfigJson";
 
 const DEFAULT_FABLO_CONFIG: FabloConfigJson = {
   $schema: "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
@@ -58,17 +58,7 @@ const DEFAULT_FABLO_CONFIG: FabloConfigJson = {
       ],
     },
   ],
-  chaincodes: [
-    {
-      name: "chaincode1",
-      version: "0.0.1",
-      lang: "node",
-      channel: "my-channel1",
-      directory: "./chaincodes/chaincode-kv-node",
-      endorsement: "AND ('Org1MSP.member')",
-      privateData: [],
-    },
-  ],
+  chaincodes: [],
   hooks: {},
 };
 
@@ -77,42 +67,52 @@ export default class InitGenerator extends Generator {
     super(args, opts);
   }
 
-  async copySampleConfig(): Promise<void> {
-    let fabloConfigJson = { ...DEFAULT_FABLO_CONFIG };
+  async generateConfig(): Promise<void> {
+    const fabloConfigJson = { ...DEFAULT_FABLO_CONFIG };
 
-    const shouldInitWithNodeChaincode = this.args.length && this.args.find((v) => v === "node");
+    // Add Node.js chaincode if requested
+    const shouldInitWithNodeChaincode = this.args.includes("node");
     if (shouldInitWithNodeChaincode) {
-      console.log("Creating sample Node.js chaincode");
-      this.fs.copy(this.templatePath("chaincodes"), this.destinationPath("chaincodes"));
-      // force build on Node 12, since dev deps (@theledger/fabric-mock-stub) may not work on 16
+      console.log("Adding Node.js chaincode configuration");
+      fabloConfigJson.chaincodes = [
+        {
+          name: "chaincode1",
+          version: "0.0.1",
+          lang: "node",
+          channel: "my-channel1",
+          directory: "./chaincodes/chaincode-kv-node",
+          privateData: [],
+        },
+      ];
+
+      // Create chaincode directory and .nvmrc
       this.fs.write(this.destinationPath("chaincodes/chaincode-kv-node/.nvmrc"), "12");
-    } else {
-      fabloConfigJson = { ...fabloConfigJson, chaincodes: [] };
     }
 
-    const shouldAddFabloRest = this.args.length && this.args.find((v) => v === "rest");
+    // Add Fablo REST if requested
+    const shouldAddFabloRest = this.args.includes("rest");
     if (shouldAddFabloRest) {
-      const orgs = fabloConfigJson.orgs.map((org) => ({ ...org, tools: { fabloRest: true } }));
-      fabloConfigJson = { ...fabloConfigJson, orgs };
-    } else {
-      const orgs = fabloConfigJson.orgs.map((org) => ({ ...org, tools: {} }));
-      fabloConfigJson = { ...fabloConfigJson, orgs };
+      fabloConfigJson.orgs = fabloConfigJson.orgs.map((org) => ({
+        ...org,
+        tools: { fabloRest: true },
+      }));
     }
 
-    const shouldUseKubernetes = this.args.length && this.args.find((v) => v === "kubernetes" || v === "k8s");
-    const shouldRunInDevMode = this.args.length && this.args.find((v) => v === "dev");
-    const global: GlobalJson = {
+    // Configure engine and dev mode
+    const shouldUseKubernetes = this.args.some((arg) => ["kubernetes", "k8s"].includes(arg));
+    const shouldRunInDevMode = this.args.includes("dev");
+    fabloConfigJson.global = {
       ...fabloConfigJson.global,
       engine: shouldUseKubernetes ? "kubernetes" : "docker",
-      peerDevMode: !!shouldRunInDevMode,
+      peerDevMode: shouldRunInDevMode,
     };
-    fabloConfigJson = { ...fabloConfigJson, global };
 
+    // Write the final config
     this.fs.write(this.destinationPath("fablo-config.json"), JSON.stringify(fabloConfigJson, undefined, 2));
 
     this.on("end", () => {
       console.log("===========================================================");
-      console.log(chalk.bold("Sample config file created! :)"));
+      console.log(chalk.bold("Fablo config file created! :)"));
       console.log("You can start your network with 'fablo up' command");
       console.log("===========================================================");
     });