X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=turbot_lambda%2Fturbot_lambda.py;h=1aa428fa95c0740d05c8aa3368877479a07f66ea;hb=c267061f2ba8826b35bb3f0a467b7585838fccf0;hp=59312c8b2e1e19e7b573b7e108cc2458384cb286;hpb=e23edacac246ac96418cdfe97469402341fe2ec0;p=turbot

diff --git a/turbot_lambda/turbot_lambda.py b/turbot_lambda/turbot_lambda.py
index 59312c8..1aa428f 100644
--- a/turbot_lambda/turbot_lambda.py
+++ b/turbot_lambda/turbot_lambda.py
@@ -4,33 +4,38 @@ import base64
 import boto3
 import requests
 import json
-import os
 import pickle
+import os
 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
 
-response = ssm.get_parameter(Name='SLACK_BOT_TOKEN', WithDecryption=True)
-slack_bot_token = response['Parameter']['Value']
+if 'SLACK_BOT_TOKEN' in os.environ:
+    slack_bot_token = os.environ['SLACK_BOT_TOKEN']
+else:
+    response = ssm.get_parameter(Name='SLACK_BOT_TOKEN', WithDecryption=True)
+    slack_bot_token = response['Parameter']['Value']
+    os.environ['SLACK_BOT_TOKEN'] = slack_bot_token
 slack_client = WebClient(slack_bot_token)
 
-response = ssm.get_parameter(Name='GSHEETS_PICKLE_BASE64', WithDecryption=True)
-gsheets_pickle_base64 = response['Parameter']['Value']
+if 'GSHEETS_PICKLE_BASE64' in os.environ:
+    gsheets_pick_base64 = os.environ['GSHEETS_PICKLE_BASE64']
+else:
+    response = ssm.get_parameter(Name='GSHEETS_PICKLE_BASE64',
+                                 WithDecryption=True)
+    gsheets_pickle_base64 = response['Parameter']['Value']
+    os.environ['GSHEETS_PICKLE_BASE64'] = gsheets_pickle_base64
 gsheets_pickle = base64.b64decode(gsheets_pickle_base64)
 gsheets_creds = pickle.loads(gsheets_pickle)
+
 if gsheets_creds:
     if gsheets_creds.valid:
         print("Loaded valid GSheets credentials from SSM")
@@ -40,6 +45,7 @@ if gsheets_creds:
         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")
+        os.environ['GSHEETS_PICKLE_BASE64'] = gsheets_pickle_base64
         ssm.put_parameter(Name='GSHEETS_PICKLE_BASE64',
                           Type='SecureString',
                           Value=gsheets_pickle_base64,
@@ -49,13 +55,22 @@ service = build('sheets',
                 credentials=gsheets_creds,
                 cache_discovery=False)
 sheets = service.spreadsheets()
+service = build('drive',
+                'v3',
+                credentials=gsheets_creds,
+                cache_discovery=False)
+files = service.files()
+permissions = service.permissions()
 
 db = boto3.resource('dynamodb')
 
 turb = SimpleNamespace()
 turb.slack_client = slack_client
 turb.db = db
+turb.table = db.Table("turbot")
 turb.sheets = sheets
+turb.files = files
+turb.permissions = permissions
 
 def error(message):
     """Generate an error response for a Slack request
@@ -130,17 +145,18 @@ 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):
     """Handler for Slack interactive things (buttons, shortcuts, etc.)
     as well as slash commands.
 
-    This function simply makes a quiuck determination of what we're looking
+    This function simply makes a quick determination of what we're looking
     at and then defers to either turbot_interactive or turbot_slash_command."""
 
     # Both interactives and slash commands have a urlencoded body
@@ -166,9 +182,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 turbot_shortcut(turb, payload)
     return error("Unrecognized interactive type: {}".format(type))
 
 def turbot_block_action(turb, payload):
@@ -185,13 +201,16 @@ def turbot_block_action(turb, payload):
     action = actions[0]
 
     atype = action['type']
-    avalue = action['value']
+    if 'value' in action:
+        avalue = action['value']
+    else:
+        avalue = '*'
 
     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):
@@ -216,7 +235,7 @@ def turbot_slash_command(turb, body):
     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))