Defer all sheet creation until after the channel is created

[turbot] / turbot_lambda / turbot_lambda.py

diff --git a/turbot_lambda/turbot_lambda.py b/turbot_lambda/turbot_lambda.py
index ab670d34c74c60476c90036fd0629834beb96703..e19e96d801ab0b0ea7d7f502e2c66fa341883b1b 100644 (file)
--- a/turbot_lambda/turbot_lambda.py
+++ b/turbot_lambda/turbot_lambda.py
@@ -4,22 +4,16 @@ import base64
 import boto3
 import requests
 import json
-import os
 import pickle
 from types import SimpleNamespace
 from google.auth.transport.requests import Request
 from googleapiclient.discovery import build
 
-import turbot.actions
-import turbot.commands
+import turbot.interaction
 import turbot.events
 
 ssm = boto3.client('ssm')
 
-response = ssm.get_parameter(Name='SLACK_SIGNING_SECRET', WithDecryption=True)
-slack_signing_secret = response['Parameter']['Value']
-os.environ['SLACK_SIGNING_SECRET'] = slack_signing_secret
-
 # Note: Late import here to have the environment variable above available
 from turbot.slack import slack_is_valid_request # noqa
 
@@ -37,7 +31,8 @@ if gsheets_creds:
     else:
         gsheets_creds.refresh(Request())
         gsheets_pickle = pickle.dumps(gsheets_creds)
-        gsheets_pickle_base64 = base64.b64encode(gsheets_pickle)
+        gsheets_pickle_base64_bytes = base64.b64encode(gsheets_pickle)
+        gsheets_pickle_base64 = gsheets_pickle_base64_bytes.decode('us-ascii')
         print("Storing refreshed GSheets credentials into SSM")
         ssm.put_parameter(Name='GSHEETS_PICKLE_BASE64',
                           Type='SecureString',
@@ -129,10 +124,11 @@ def url_verification_handler(turb, body):
     }
 
 def event_callback_handler(turb, body):
-    type = body['event']['type']
+    event = body['event']
+    type = event['type']
 
     if type in turbot.events.events:
-        return turbot.events.events[type](turb, body)
+        return turbot.events.events[type](turb, event)
     return error("Unknown event type: {}".format(type))
 
 def turbot_interactive_or_slash_command(turb, event, context):
@@ -165,7 +161,9 @@ def turbot_interactive(turb, payload):
     if type == 'block_actions':
         return turbot_block_action(turb, payload)
     if type == 'view_submission':
-        return turbot.actions.view_submission(turb, payload)
+        return turbot.interaction.view_submission(turb, payload)
+    if type == 'shortcut':
+        return turbot_shortcut(turb, payload)
     return error("Unrecognized interactive type: {}".format(type))
 
 def turbot_block_action(turb, payload):
@@ -185,12 +183,21 @@ def turbot_block_action(turb, payload):
     avalue = action['value']
 
     if (
-            atype in turbot.actions.actions
-            and avalue in turbot.actions.actions[atype]
+            atype in turbot.interaction.actions
+            and avalue in turbot.interaction.actions[atype]
     ):
-        return turbot.actions.actions[atype][avalue](turb, payload)
+        return turbot.interaction.actions[atype][avalue](turb, payload)
     return error("Unknown action of type/value: {}/{}".format(atype, avalue))
 
+def turbot_shortcut(turb, payload):
+    """Handler for Slack shortcuts
+
+    These are invoked as either global or message shortcuts by a user."""
+
+    print("In turbot_shortcut, payload is: {}".format(str(payload)))
+
+    return error("Shortcut interactions not yet implemented")
+
 def turbot_slash_command(turb, body):
     """Implementation for Slack slash commands.
 
@@ -199,9 +206,12 @@ def turbot_slash_command(turb, body):
     """
 
     command = body['command'][0]
-    args = body['text'][0]
+    if 'text' in body:
+        args = body['text'][0]
+    else:
+        args = ''
 
-    if command in turbot.commands.commands:
-        return turbot.commands.commands[command](turb, body, args)
+    if command in turbot.interaction.commands:
+        return turbot.interaction.commands[command](turb, body, args)
 
     return error("Command {} not implemented".format(command))