Merge branch 'master' into staging

alphagov · Mar 12, 2018 · 15808b4 · 15808b4
2 parents ccd46e2 + 1d5580a
commit 15808b4
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 15 deletions.
diff --git a/backdrop/core/config/common.py b/backdrop/core/config/common.py
@@ -12,7 +12,6 @@ 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:

diff --git a/backdrop/read/api.py b/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, app.config)
+            query = parse_query_from_request(request)
             data = data_set.execute_query(query)
 
         except InvalidOperationError:

diff --git a/backdrop/read/config/development.py b/backdrop/read/config/development.py
@@ -4,7 +4,6 @@
 STAGECRAFT_URL = 'http://localhost:3103'
 
 SIGNON_API_USER_TOKEN = 'development-oauth-access-token'
-DEFAULT_COLLECTION = 'default'
 
 try:
     from .development_environment import *

diff --git a/backdrop/read/config/production.py b/backdrop/read/config/production.py
@@ -8,4 +8,3 @@
 SIGNON_API_USER_TOKEN = os.getenv('SIGNON_API_USER_TOKEN')
 LOG_LEVEL = "INFO"
 SESSION_COOKIE_SECURE = True
-DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')
diff --git a/backdrop/read/config/staging.py b/backdrop/read/config/staging.py
@@ -8,4 +8,3 @@
 SIGNON_API_USER_TOKEN = os.getenv('SIGNON_API_USER_TOKEN')
 LOG_LEVEL = "INFO"
 SESSION_COOKIE_SECURE = True
-DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')
diff --git a/backdrop/read/config/test.py b/backdrop/read/config/test.py
@@ -2,6 +2,5 @@
 LOG_LEVEL = "ERROR"
 
 DATA_SET_RATE_LIMIT = '10000/second'
-DEFAULT_COLLECTION = 'default'
 
 from development import STAGECRAFT_URL, SIGNON_API_USER_TOKEN
diff --git a/backdrop/read/query.py b/backdrop/read/query.py
@@ -6,9 +6,9 @@
 __all__ = ['parse_query_from_request']
 
 
-def parse_query_from_request(request, config):
+def parse_query_from_request(request):
     """Parses a Query object from a flask request"""
-    return Query.create(**parse_request_args(request.args, config.get('DEFAULT_COLLECTION', 'default')))
+    return Query.create(**parse_request_args(request.args))
 
 
 def if_present(func, value):
@@ -17,7 +17,7 @@ def if_present(func, value):
         return func(value)
 
 
-def parse_request_args(request_args, default_collection='default'):
+def parse_request_args(request_args):
     args = dict()
 
     args['start_at'] = if_present(parse_time_as_utc,
@@ -67,7 +67,7 @@ def parse_filter_by(filter_by, is_regex):
             args['collect'].append(tuple(collect_arg.split(':')))
         else:
             args['collect'].append(
-                (collect_arg, default_collection))
+                (collect_arg, 'default'))
 
     args['flatten'] = if_present(boolify, request_args.get('flatten'))
     args['inclusive'] = if_present(boolify, request_args.get('inclusive'))

diff --git a/backdrop/transformers/config/production.py b/backdrop/transformers/config/production.py
@@ -8,4 +8,3 @@
 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')
diff --git a/backdrop/write/config/development.py b/backdrop/write/config/development.py
@@ -5,7 +5,6 @@
 }
 
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = 'dev-create-endpoint-token'
-DEFAULT_COLLECTION = 'default'
 
 try:
     from development_environment import *

diff --git a/backdrop/write/config/production.py b/backdrop/write/config/production.py
@@ -21,4 +21,3 @@
 SECRET_KEY = os.getenv('SECRET_KEY')
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = os.getenv(
     'STAGECRAFT_COLLECTION_ENDPOINT_TOKEN')
-DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')
diff --git a/backdrop/write/config/staging.py b/backdrop/write/config/staging.py
@@ -13,4 +13,3 @@
 SECRET_KEY = os.getenv('SECRET_KEY')
 STAGECRAFT_COLLECTION_ENDPOINT_TOKEN = os.getenv(
     'STAGECRAFT_COLLECTION_ENDPOINT_TOKEN')
-DEFAULT_COLLECTION = PAAS.get('DEFAULT_COLLECTION')
diff --git a/backdrop/write/config/test.py b/backdrop/write/config/test.py
@@ -8,7 +8,6 @@
     "evl_volumetrics": ["_timestamp", "service", "transaction"],
 }
 BROKER_URL = 'memory://'
-DEFAULT_COLLECTION = 'default'
 
 from development import (STAGECRAFT_COLLECTION_ENDPOINT_TOKEN, STAGECRAFT_URL,
                          SIGNON_API_USER_TOKEN)