Merge pull request #59 from splunk/volodyad-connect-gateway-fix

Set tlsOptions only when defined
splunk · Oct 7, 2020 · 955c2a3 · 955c2a3
2 parents 283e207 + 5f9ba6d
commit 955c2a3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Running the Fabric Logger in Docker is recommended. A sample docker-compose entr
     services:
         fabric-logger.example.com:
             container_name: fabric-logger.example.com
-            image: splunkdlt/fabric-logger:release-3.0.0
+            image: splunkdlt/fabric-logger:release-3.0.1
             environment:
                 - FABRIC_KEYFILE=<path to private key file>
                 - FABRIC_CERTFILE=<path to signed certificate>
@@ -107,8 +107,8 @@ We also include a helm chart for Kubernetes deployments. First set your `values.
 
 Alternatively, if you are using `cryptogen` to generate identities, the helm chart can auto-populate secrets for you. You will need to download the helm file and untar it locally so you can copy your `crypto-config` into the director.
 
-    wget https://github.com/splunk/fabric-logger/releases/download/3.0.0/fabric-logger-helm-v3.0.0.tgz
-    tar -xf fabric-logger-helm-v3.0.0.tgz
+    wget https://github.com/splunk/fabric-logger/releases/download/3.0.1/fabric-logger-helm-v3.0.1.tgz
+    tar -xf fabric-logger-helm-v3.0.1.tgz
     cp -R crypto-config fabric-logger/crypto-config
 
 Set the secrets section of `values.yaml` to:
@@ -139,7 +139,7 @@ A `network.yaml` configmap will automatically be generated using the secrets and
 
     helm install -n fabric-logger-${PEER_NAME}-${NS} --namespace ${NS} \
                  -f values.yaml -f network.yaml \
-                 https://github.com/splunk/fabric-logger/releases/download/v3.0.0/fabric-logger-helm-v3.0.0.tgz
+                 https://github.com/splunk/fabric-logger/releases/download/v3.0.1/fabric-logger-helm-v3.0.1.tgz
 
 ### Kubernetes: Deleting Helm Chart
 

diff --git a/helm-chart/fabric-logger/Chart.yaml b/helm-chart/fabric-logger/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "v3.0.0"
+appVersion: "v3.0.1"
 description: A Helm chart for Splunk Connect for Hyperledger Fabric
 name: fabric-logger
-version: v3.0.0
+version: v3.0.1
 keywords:
   - blockchain
   - hyperledger

diff --git a/helm-chart/fabric-logger/values.yaml b/helm-chart/fabric-logger/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: splunkdlt/fabric-logger
-  tag: release-3.0.0
+  tag: release-3.0.1
   pullPolicy: IfNotPresent
 
 nameOverride: ""

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-logger",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Hyperledger Fabric Splunk integration",
   "author": "splunk <blockchain@splunk.com>",
   "main": "lib/index.js",

diff --git a/src/fabric.ts b/src/fabric.ts
@@ -61,33 +61,37 @@ export class FabricListener implements ManagedResource {
         const connectionProfileYaml = await readFile(this.config.networkConfig, { encoding: 'utf-8' });
         const connectionProfile = safeLoad(connectionProfileYaml);
         const wallet = await Wallets.newInMemoryWallet();
+
+        const cert = await readFile(this.config.certFile, { encoding: 'utf-8' });
+        const key = await readFile(this.config.keyFile, { encoding: 'utf-8' });
+        const identity: X509Identity = {
+            credentials: {
+                certificate: cert,
+                privateKey: key,
+            },
+            mspId: this.config.msp,
+            type: 'X.509',
+        };
+
+        wallet.put(this.config.user, identity);
+
+        const gatewayOptions: GatewayOptions = {
+            identity: identity,
+            wallet,
+            discovery: { enabled: this.config.discovery, asLocalhost: this.config.asLocalHost },
+        };
+
         if (this.config.clientCertFile && this.config.clientKeyFile) {
             const clientKey = await readFile(this.config.clientKeyFile, { encoding: 'utf-8' });
             const clientCert = await readFile(this.config.clientCertFile, { encoding: 'utf-8' });
-            const cert = await readFile(this.config.certFile, { encoding: 'utf-8' });
-            const key = await readFile(this.config.keyFile, { encoding: 'utf-8' });
-            const identity: X509Identity = {
-                credentials: {
-                    certificate: cert,
-                    privateKey: key,
-                },
-                mspId: this.config.msp,
-                type: 'X.509',
-            };
-
-            wallet.put(this.config.user, identity);
-            const gatewayOptions: GatewayOptions = {
-                identity: identity,
-                wallet,
-                discovery: { enabled: this.config.discovery, asLocalhost: this.config.asLocalHost },
-                tlsInfo: {
-                    certificate: clientCert,
-                    key: clientKey,
-                },
+            gatewayOptions.tlsInfo = {
+                certificate: clientCert,
+                key: clientKey,
             };
-            await this.gateway.connect(connectionProfile, gatewayOptions);
-            info('Finished Connecting to gateway');
         }
+
+        await this.gateway.connect(connectionProfile, gatewayOptions);
+        info('Finished Connecting to gateway');
     }
 
     public async listen(): Promise<void> {