Add support for SSL-wrapped connections

Author: jeffreylovitz

README.md

@@ -17,8 +17,9 @@ bulk_insert.py GRAPHNAME [OPTIONS]
 |---------|-----------------------|----------------------------------------------|
 |  -h     | --host TEXT           |    Redis server host (default: 127.0.0.1)    |
 |  -p     | --port INTEGER        |    Redis server port   (default: 6379)       |
-|  -P     | --password TEXT       |    Redis server password                     |
-|  -s     | --ssl TEXT            |    Server is SSL-enabled                     |
+|  -a     | --password TEXT       |    Redis server password                     |
+|  -c     | --ssl_certfile TEXT   |    path to certfile for SSL connection       |
+|  -k     | --ssl_keyfile TEXT    |    path to keyfile for SSL connection        |
 |  -n     | --nodes TEXT          |    path to node csv file  [required]         |
 |  -r     | --relationships TEXT  |    path to relationship csv file             |
 
@@ -41,6 +42,7 @@ The label (for nodes) or relationship type (for relationships) is derived from t
 ### Relationship files
 - Relationship inputs have no headers.
 - Each row should specify a source and destination node ID.
+- All specified node IDs must exist in the database, as described in [Determining Node IDs](#determining-node-ids).
 - Described relationships are always considered to be directed (source->destination).
 - The bulk insert script does not yet support adding properties to relationships (though this can be done after the fact with RedisGraph queries).
 - _NOTE_ Relationship processing does not yet include node lookups. The entries in a relationship file should all be integers corresponding to node IDs.

bulk_insert.py

@@ -237,20 +237,24 @@ def help():
 # Redis server connection settings
 @click.option('--host', '-h', default='127.0.0.1', help='Redis server host')
 @click.option('--port', '-p', default=6379, help='Redis server port')
-@click.option('--password', '-P', default=None, help='Redis server password')
-@click.option('--ssl', '-s', default=False, help='Server is SSL-enabled')
+@click.option('--password', '-a', default=None, help='Redis server password')
+@click.option('--ssl_certfile', '-c', default=None, help='Path to SSL certfile')
+@click.option('--ssl_keyfile', '-k', default=None, help='Path to SSL keyfile')
 # CSV file paths
 @click.option('--nodes', '-n', required=True, multiple=True, help='path to node csv file')
 @click.option('--relationships', '-r', multiple=True, help='path to relation csv file')
 # Debug options
 @click.option('--max_buffer_size', '-m', default=1024*1024, help='(DEBUG ONLY) - max token count per Redis query')
 
-def bulk_insert(graph, host, port, password, ssl, nodes, relationships, max_buffer_size):
+def bulk_insert(graph, host, port, password, ssl_certfile, ssl_keyfile, nodes, relationships, max_buffer_size):
     global graphname
     global redis_client
     global max_tokens
     graphname = graph
-    redis_client = redis.StrictRedis(host=host, port=port, password=password, ssl=ssl)
+    ssl = False
+    if ssl_certfile or ssl_keyfile:
+        ssl = True
+    redis_client = redis.StrictRedis(host=host, port=port, password=password, ssl=ssl, ssl_certfile=ssl_certfile, ssl_keyfile=ssl_keyfile)
     if max_buffer_size > max_tokens:
         print("Requested buffer size too large, capping queries at %d." % max_tokens)
     else: