[FABCN-351] CORE_PEER_ADDRESS issue fixed (#252)

Signed-off-by: Kestutis Gudynas <44440041+kemi04@users.noreply.github.com>
hyperledger · Dec 15, 2020 · 845d689 · 845d689
1 parent 6b2b671
commit 845d689
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 5 deletions.
diff --git a/libraries/fabric-shim/lib/chaincode.js b/libraries/fabric-shim/lib/chaincode.js
@@ -104,6 +104,7 @@ class Shim {
         delete optsCpy['module-path'];
 
         const url = parsePeerUrl(opts['peer.address']);
+
         if (isTLS()) {
             logger.debug('TLS enabled');
             optsCpy.pem = fs.readFileSync(process.env.CORE_PEER_TLS_ROOTCERT_FILE).toString();

diff --git a/libraries/fabric-shim/lib/cmds/startCommand.js b/libraries/fabric-shim/lib/cmds/startCommand.js
@@ -76,8 +76,13 @@ exports.getArgs = function (yargs) {
         argv['chaincode-id-name'] = argv.chaincodeIdName;
         argv['module-path'] = argv.modulePath;
 
+        // eslint-disable-next-line eqeqeq
+        if (argv.CORE_PEER_ADDRESS != null) {
+            argv['peer.address'] = argv.CORE_PEER_ADDRESS;
+        }
+
         required.forEach((argName) => {
-            if (!argv.hasOwnProperty(argName)) {  // eslint-disable-line no-prototype-builtins
+            if (!argv.hasOwnProperty(argName) || typeof(argv[argName]) === 'undefined') {  // eslint-disable-line no-prototype-builtins
                 throw new Error('Missing required argument ' + argName);
             }
         });

diff --git a/libraries/fabric-shim/test/unit/cmds/chaincode.js b/libraries/fabric-shim/test/unit/cmds/chaincode.js
@@ -139,21 +139,21 @@ describe('chaincode cmd', () => {
             };
 
             const mockYargsParser = sinon.stub().returns({
-                chaincodeIdName: 'Jeremy',
+                'CORE_PEER_ADDRESS': 'address',
                 modulePath: '/home/andy/my/super/contract'
             });
 
             const yp = chaincodeStartCommand.__get__('YargsParser');
             chaincodeStartCommand.__set__('YargsParser', mockYargsParser);
 
-            process.argv = ['node', 'test.js', '--chaincode-id-name', 'mycc'];
+            process.argv = ['node', 'test.js', '--CORE_PEER_ADDRESS', 'address'];
 
             expect(() => {
                 chaincodeStartCommand.getArgs(myYargs);
-            }).to.throw(/Missing required argument peer.address/);
+            }).to.throw(/Missing required argument chaincode-id-name/);
 
             sinon.assert.calledOnce(mockYargsParser);
-            sinon.assert.calledWith(mockYargsParser, ['--chaincode-id-name', 'mycc'], {
+            sinon.assert.calledWith(mockYargsParser, ['--CORE_PEER_ADDRESS', 'address'], {
                 default: {
                     'grpc.max_send_message_length': -1,
                     'grpc.max_receive_message_length': -1,
@@ -172,5 +172,53 @@ describe('chaincode cmd', () => {
 
             chaincodeStartCommand.__set__('YargsParser', yp);
         });
+
+        it ('should use yargs parser on process.argv, CORE_PEER_ADDRESS should override peer.address', () => {
+            const myYargs = {
+                argv: {
+                    $0: 'index.js',
+                    someArg: 'hello world'
+                },
+            };
+
+            const mockYargsParser = sinon.stub().returns({
+                chaincodeIdName: 'Jeremy',
+                modulePath: '/home/andy/my/super/contract',
+                'peer.address': 'some addr',
+                'CORE_PEER_ADDRESS': 'localhost:7052'
+            });
+
+            const yp = chaincodeStartCommand.__get__('YargsParser');
+            chaincodeStartCommand.__set__('YargsParser', mockYargsParser);
+
+            process.argv = ['node', 'test.js', '--peer.address', 'localhost:7051', '--chaincode-id-name', 'mycc',
+                '--CORE_PEER_ADDRESS', 'localhost:7052'];
+
+            const args = chaincodeStartCommand.getArgs(myYargs);
+
+            sinon.assert.calledOnce(mockYargsParser);
+            sinon.assert.calledWith(mockYargsParser, ['--peer.address', 'localhost:7051', '--chaincode-id-name', 'mycc',
+                '--CORE_PEER_ADDRESS', 'localhost:7052'], {
+                default: {
+                    'grpc.max_send_message_length': -1,
+                    'grpc.max_receive_message_length': -1,
+                    'grpc.keepalive_time_ms': 110000,
+                    'grpc.http2.min_time_between_pings_ms': 110000,
+                    'grpc.keepalive_timeout_ms': 20000,
+                    'grpc.http2.max_pings_without_data': 0,
+                    'grpc.keepalive_permit_without_calls': 1,
+                    'module-path': process.cwd()
+                },
+                configuration: {
+                    'dot-notation': false
+                },
+                envPrefix: 'CORE'
+            });
+            expect(args['chaincode-id-name']).to.deep.equal('Jeremy');
+            expect(args['peer.address']).to.deep.equal('localhost:7052');
+            expect(args['module-path']).to.deep.equal('/home/andy/my/super/contract');
+
+            chaincodeStartCommand.__set__('YargsParser', yp);
+        });
     });
 });