remove storage region configuration from the migration stream and add…

… to config file

.gitignore

@@ -204,3 +204,4 @@ ssl/
 # pyenv
 .python-version
 
+/storage-regions.yaml  # contains secrets

osf/apps.py

@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig as BaseAppConfig
 from django.db.models.signals import post_migrate
-from osf.migrations import update_permission_groups
+from osf.migrations import update_permission_groups, update_storage_regions
 
 
 class AppConfig(BaseAppConfig):
@@ -16,3 +16,7 @@ def ready(self):
             update_permission_groups,
             dispatch_uid='osf.apps.update_permissions_groups'
         )
+        post_migrate.connect(
+            update_storage_regions,
+            dispatch_uid='osf.apps.update_storage_regions'
+        )

osf/migrations/__init__.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
+import sys
+import yaml
 import logging
 from django.db.utils import ProgrammingError
+from website import settings
 
 logger = logging.getLogger(__file__)
 
@@ -52,6 +55,7 @@ def get_admin_write_permissions():
         'delete_preprintprovider',
         'change_subject',
         'change_maintenancestate',
+        'change_registrationschema',
         'delete_maintenancestate',
         'change_scheduledbanner',
         'delete_scheduledbanner',
@@ -118,3 +122,17 @@ def update_permission_groups(sender, verbosity=0, **kwargs):
     if getattr(sender, 'label', None) == 'osf':
         update_admin_permissions(verbosity)
         update_provider_auth_groups(verbosity)
+
+
+def update_storage_regions(sender, verbosity=0, **kwargs):
+    from django.apps import apps
+
+    if getattr(sender, 'label', None) == 'osf':
+        with open(settings.STORAGE_REGION_CONFIG_PATH, 'r') as stream:
+            features = yaml.safe_load(stream)
+            Region = apps.get_model('addons_osfstorage', 'Region')
+            for region in features['storage_regions']:
+                Region.objects.update_or_create(_id=region['_id'], defaults=region)
+
+        if 'pytest' not in sys.modules:  # Allows for isolated tests without Regions
+            assert not Region.objects.all(), 'No storage regions found.'

storage-regions-local.yaml

@@ -0,0 +1,13 @@
+# This is used to populate fake storage region's for use in development, urls and file paths in this file should point
+# to urls and file paths in test environments and services.
+storage_regions:
+ - _id: us  # default
+   name: United States
+   waterbutler_credentials:
+     storage: {}
+   waterbutler_url: http://localhost:7777
+   mfr_url: http://localhost:7778
+   waterbutler_settings:
+    storage:
+      folder: /code/website/osfstoragecache
+      provider: filesystem

website/settings/defaults.py

@@ -2101,3 +2101,5 @@ def from_node_usage(cls,  usage_bytes, private_limit=None, public_limit=None):
 CAS_LOG_LEVEL = 3  # ERROR
 
 PREPRINT_METRICS_START_DATE = datetime.datetime(2019, 1, 1)
+
+STORAGE_REGION_CONFIG_PATH = '/code/storage-regions.yaml'

website/settings/local-dist.py

@@ -142,3 +142,5 @@ class CeleryConfig(defaults.CeleryConfig):
 DATACITE_ENABLED = False
 
 OOPSPAM_CHECK_IP = False
+
+STORAGE_REGION_CONFIG_PATH = 'storage-regions-local.yaml'

website/settings/local-travis.py

@@ -107,3 +107,5 @@ class CeleryConfig(defaults.CeleryConfig):
 SHARE_ENABLED = False
 DATACITE_ENABLED = False
 IA_ARCHIVE_ENABLED = False
+
+STORAGE_REGION_CONFIG_PATH = 'storage-regions-local.yaml'