DEPR-14 Remove AWS.py

edx · Mar 28, 2019 · ac4845d · ac4845d
1 parent 17a993b
commit ac4845d
Show file tree

Hide file tree

Showing 36 changed files with 55 additions and 1,745 deletions.
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -654,7 +654,7 @@
 ADMINS = []
 MANAGERS = ADMINS
 
-# Initialize to 'unknown', but read from JSON in aws.py
+# Initialize to 'unknown', but read from JSON in production.py
 EDX_PLATFORM_REVISION = 'unknown'
 
 # Static content

diff --git a/cms/envs/openstack.py b/cms/envs/openstack.py
@@ -2,8 +2,6 @@
 Settings for OpenStack deployments.
 """
 
-# We import the aws settings because that's currently where the base settings are stored for all deployments.
-# TODO - fix this when aws.py is split/renamed.
 from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 SWIFT_AUTH_URL = AUTH_TOKENS.get('SWIFT_AUTH_URL')

diff --git a/cms/envs/production.py b/cms/envs/production.py
@@ -604,12 +604,6 @@ def get_env_setting(setting):
 
 # This is at the bottom because it is going to load more settings after base settings are loaded
 
-# Load aws.py in plugins for reverse compatibility.  This can be removed after aws.py
-# is officially removed.
-plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.CMS,
-                            plugin_constants.SettingsType.AWS)
-
-# We continue to load production.py over aws.py
 plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.CMS, plugin_constants.SettingsType.PRODUCTION)
 
 ########################## Derive Any Derived Settings  #######################

diff --git a/common/djangoapps/third_party_auth/models.py b/common/djangoapps/third_party_auth/models.py
@@ -338,7 +338,8 @@ class OAuth2ProviderConfig(ProviderConfig):
         help_text=(
             "Which python-social-auth OAuth2 provider backend to use. "
             "The list of backend choices is determined by the THIRD_PARTY_AUTH_BACKENDS setting."
-            # To be precise, it's set by AUTHENTICATION_BACKENDS - which aws.py sets from THIRD_PARTY_AUTH_BACKENDS
+            # To be precise, it's set by AUTHENTICATION_BACKENDS
+            # which production.py sets from THIRD_PARTY_AUTH_BACKENDS
         )
     )
     key = models.TextField(blank=True, verbose_name="Client ID")

diff --git a/lms/djangoapps/grades/apps.py b/lms/djangoapps/grades/apps.py
@@ -26,7 +26,7 @@ class GradesConfig(AppConfig):
         },
         PluginSettings.CONFIG: {
             ProjectType.LMS: {
-                SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'},
+                SettingsType.PRODUCTION: {PluginSettings.RELATIVE_PATH: u'settings.production'},
                 SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'},
                 SettingsType.TEST: {PluginSettings.RELATIVE_PATH: u'settings.test'},
             }

diff --git a/lms/djangoapps/grades/settings/aws.py → lms/djangoapps/grades/settings/production.py b/lms/djangoapps/grades/settings/aws.py → lms/djangoapps/grades/settings/production.py
@@ -1,4 +1,8 @@
+"""Common environment variables unique to the grades plugin."""
+
+
 def plugin_settings(settings):
+    """Common settings for Grades"""
     # Queue to use for updating persistent grades
     settings.RECALCULATE_GRADES_ROUTING_KEY = settings.ENV_TOKENS.get(
         'RECALCULATE_GRADES_ROUTING_KEY', settings.DEFAULT_PRIORITY_QUEUE,

diff --git a/lms/djangoapps/instructor/apps.py b/lms/djangoapps/instructor/apps.py
@@ -26,7 +26,7 @@ class InstructorConfig(AppConfig):
         PluginSettings.CONFIG: {
             ProjectType.LMS: {
                 SettingsType.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
-                SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'},
+                SettingsType.PRODUCTION: {PluginSettings.RELATIVE_PATH: u'settings.production'},
                 SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'},
                 SettingsType.TEST: {PluginSettings.RELATIVE_PATH: u'settings.test'},
             }

diff --git a/lms/djangoapps/instructor/settings/aws.py → ...ngoapps/instructor/settings/production.py b/lms/djangoapps/instructor/settings/aws.py → ...ngoapps/instructor/settings/production.py