consolidate more env vars

Author: wimo7083

pybot/__main__.py

@@ -11,21 +11,12 @@
 
 from . import endpoints
 from .plugins import AirtablePlugin
+from pybot.endpoints.slack.utils import PORT, HOST
+from pybot.endpoints.slack.utils import slack_configs
 
-PORT = os.environ.get("SIRBOT_PORT", 5000)
-HOST = os.environ.get("SIRBOT_ADDR", "0.0.0.0")
-ACCESS_TOKEN = os.environ.get("OAUTH_ACCESS_TOKEN", "access token")
-VERIFICATION_TOKEN = os.environ.get("VERIFICATION_TOKEN ", "verification token")
 VERSION = "0.1.0"
 logger = logging.getLogger(__name__)
 
-slack_configs = {
-    'token': os.environ.get('BOT_OATH_TOKEN'),
-    'verify': os.environ.get('VERIFICATION_TOKEN'),
-    'bot_id': os.environ.get('SLACK_BOT_ID'),
-    'bot_user_id': os.environ.get('SLACK_BOT_ID'),
-}
-
 
 def make_sentry_logger():
     client = raven.Client(

pybot/endpoints/slack/utils/__init__.py

@@ -4,6 +4,7 @@
 
 load_dotenv()
 
+VERIFICATION_TOKEN = os.environ.get("VERIFICATION_TOKEN ", "verification token")
 MENTOR_CHANNEL = os.environ.get("MENTOR_CHANNEL") or "G1DRT62UC"
 COMMUNITY_CHANNEL = os.environ.get("COMMUNITY_CHANNEL") or "G12343"
 MODERATOR_CHANNEL = os.environ.get('REPORT_CHANNEL') or 'G8NDRJJF9'
@@ -12,4 +13,13 @@
 YELP_TOKEN = os.environ.get('YELP_TOKEN') or 'token'
 PYBACK_HOST = os.environ.get('PYBACK_HOST') or 'pyback'
 PYBACK_PORT = os.environ.get('PYBACK_PORT') or 8000
-PYBACK_TOKEN = os.environ.get('PYBACK_TOKEN') or 'token'
+PYBACK_TOKEN = os.environ.get('PYBACK_TOKEN') or 'token'
+PORT = os.environ.get("SIRBOT_PORT", 5000)
+HOST = os.environ.get("SIRBOT_ADDR", "0.0.0.0")
+
+slack_configs = {
+    'token': os.environ.get('BOT_OATH_TOKEN'),
+    'verify': os.environ.get('VERIFICATION_TOKEN'),
+    'bot_id': os.environ.get('SLACK_BOT_ID'),
+    'bot_user_id': os.environ.get('SLACK_BOT_ID'),
+}