Do not rely on default collection being called default

Looks up the default collection name from the vcap settings

backdrop/core/config/common.py

@@ -12,6 +12,7 @@ def load_paas_settings():
                 if service['name'] == 'gds-performance-platform-mongodb-service':
                     credentials = service['credentials']
                     paas['DATABASE_URL'] = credentials['uri']
+                    paas['DEFAULT_COLLECTION'] = credentials['name']
                     ca_cert = b64decode(credentials['ca_certificate_base64'])
                     paas['CA_CERTIFICATE'] = ca_cert
         if 'REDIS_DATABASE_NUMBER' in os.environ:

backdrop/read/api.py

@@ -203,7 +203,7 @@ def fetch(data_set_config):
         data_set = DataSet(storage, data_set_config)
 
         try:
-            query = parse_query_from_request(request)
+            query = parse_query_from_request(request, app.config)
             data = data_set.execute_query(query)
 
         except InvalidOperationError:

backdrop/read/config/development.py

@@ -4,6 +4,7 @@
 STAGECRAFT_URL = 'http://localhost:3103'
 
 SIGNON_API_USER_TOKEN = 'development-oauth-access-token'
+DEFAULT_COLLECTION = 'default'
 
 try:
     from .development_environment import *

backdrop/read/config/production.py

@@ -8,3 +8,4 @@
 SIGNON_API_USER_TOKEN = os.getenv('SIGNON_API_USER_TOKEN')
 LOG_LEVEL = "INFO"
 SESSION_COOKIE_SECURE = True
+DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')

backdrop/read/config/staging.py

@@ -8,3 +8,4 @@
 SIGNON_API_USER_TOKEN = os.getenv('SIGNON_API_USER_TOKEN')
 LOG_LEVEL = "INFO"
 SESSION_COOKIE_SECURE = True
+DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')

backdrop/read/config/test.py

@@ -2,5 +2,6 @@
 LOG_LEVEL = "ERROR"
 
 DATA_SET_RATE_LIMIT = '10000/second'
+DEFAULT_COLLECTION = 'default'
 
 from development import STAGECRAFT_URL, SIGNON_API_USER_TOKEN

backdrop/read/query.py

@@ -3,13 +3,12 @@
 from backdrop.core.query import Query
 import re
 
-
 __all__ = ['parse_query_from_request']
 
 
-def parse_query_from_request(request):
+def parse_query_from_request(request, config):
     """Parses a Query object from a flask request"""
-    return Query.create(**parse_request_args(request.args))
+    return Query.create(**parse_request_args(request.args, config.get('DEFAULT_COLLECTION', 'default')))
 
 
 def if_present(func, value):
@@ -18,7 +17,7 @@ def if_present(func, value):
         return func(value)
 
 
-def parse_request_args(request_args):
+def parse_request_args(request_args, default_collection='default'):
     args = dict()
 
     args['start_at'] = if_present(parse_time_as_utc,
@@ -67,7 +66,8 @@ def parse_filter_by(filter_by, is_regex):
         if ':' in collect_arg:
             args['collect'].append(tuple(collect_arg.split(':')))
         else:
-            args['collect'].append((collect_arg, 'default'))
+            args['collect'].append(
+                (collect_arg, default_collection))
 
     args['flatten'] = if_present(boolify, request_args.get('flatten'))
     args['inclusive'] = if_present(boolify, request_args.get('inclusive'))

backdrop/transformers/config/production.py

@@ -8,3 +8,4 @@
 STAGECRAFT_OAUTH_TOKEN = os.getenv('STAGECRAFT_OAUTH_TOKEN')
 BACKDROP_READ_URL = 'https://performance-platform-backdrop-read-production.cloudapps.digital/data'
 BACKDROP_WRITE_URL = 'https://performance-platform-backdrop-write-production.cloudapps.digital/data'
+DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')

backdrop/write/config/development.py

@@ -5,6 +5,7 @@
 }
 
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = 'dev-create-endpoint-token'
+DEFAULT_COLLECTION = 'default'
 
 try:
     from development_environment import *

backdrop/write/config/production.py

@@ -21,3 +21,4 @@
 SECRET_KEY = os.getenv('SECRET_KEY')
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = os.getenv(
     'STAGECRAFT_COLLECTION_ENDPOINT_TOKEN')
+DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')

backdrop/write/config/staging.py

@@ -13,3 +13,4 @@
 SECRET_KEY = os.getenv('SECRET_KEY')
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = os.getenv(
     'STAGECRAFT_COLLECTION_ENDPOINT_TOKEN')
+DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')

backdrop/write/config/test.py

@@ -8,6 +8,7 @@
     "evl_volumetrics": ["_timestamp", "service", "transaction"],
 }
 BROKER_URL = 'memory://'
+DEFAULT_COLLECTION = 'default'
 
 from development import (STAGECRAFT_COLLECTION_ENDPOINT_TOKEN, STAGECRAFT_URL,
                          SIGNON_API_USER_TOKEN)