Create and use find_pem_file() #595

src/server/api/API_ingest/salesforce_contacts.py

@@ -7,6 +7,8 @@
 from config import engine
 from models import SalesForceContacts
 
+from api import pem
+
 logger = structlog.get_logger()
 
 TEST_MODE = os.getenv("TEST_MODE")  # if not present, has value None
@@ -24,14 +26,13 @@ def store_contacts_all():
 
         logger.debug("retrieving the latest salesforce contacts data")
 
-        if os.path.exists('server/bin/connected-app-secrets.pem'):
-            pem_file = 'server/bin/connected-app-secrets.pem'
-        elif os.path.exists('bin/connected-app-secrets.pem'):
-            pem_file = 'bin/connected-app-secrets.pem'
-        else:
+        pem_file = pem.find_pem_file()
+
+        if pem_file == '':
             logger.error("Missing salesforce jwt private key pem file, skipping data pull")
             return
 
+
         sf = Salesforce(username=USERNAME, consumer_key=CONSUMER_KEY,
                         privatekey_file=pem_file, domain=DOMAIN)
         results = sf.query("SELECT Contact_ID_18__c, FirstName, LastName, Contact.Account.Name, MailingCountry, MailingStreet, MailingCity, MailingState, MailingPostalCode, Phone, MobilePhone, Email FROM Contact")

src/server/api/pem.py

@@ -0,0 +1,25 @@
+from os import path
+
+import structlog
+
+logger = structlog.get_logger()
+
+
+def find_pem_file():
+    """
+    Search likely places for the .pem file needed for SalesForce operations, 
+    returning filename if found or empty string if not.
+    """
+
+    locations = ['server/bin', 'bin', 'server/pem']
+    file_name = 'connected-app-secrets.pem'
+
+    pem_file = ''
+
+    for file_path in locations:
+         if path.exists(path.join(file_path, file_name)):
+            pem_file = path.normpath(path.join(file_path, file_name))
+            logger.info("Found pem file at   %s   ", pem_file)
+            break
+
+    return pem_file

src/server/pub_sub/salesforce_message_publisher.py

@@ -12,6 +12,8 @@
 import structlog
 from datetime import datetime
 
+from api import pem
+
 logger = structlog.get_logger()
 
 ISSUER = os.getenv("SALESFORCE_CONSUMER_KEY")
@@ -25,7 +27,7 @@
 UPDATE_TOPIC = "/event/updated_contacts_batched__e"
 
 def send_pipeline_update_messages(contacts_list):
-    pem_file = 'bin/connected-app-secrets.pem'
+    pem_file = pem.find_pem_file()  #TODO: Could we get here (and get errors) if we didn't have a pem file?
     with open(pem_file) as fd:
         private_key = fd.read()
     logger.info('Loaded PEM certificate')