DEPR-14 Remove AWS.py

2019-03-21 12:29:01 -04:00
parent 17a993b70a
commit ac4845d052
36 changed files with 55 additions and 1745 deletions
--- a/openedx/core/djangoapps/ace_common/apps.py
+++ b/openedx/core/djangoapps/ace_common/apps.py
@@ -17,12 +17,12 @@ class AceCommonConfig(AppConfig):
    plugin_app = {
        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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
            },
            ProjectType.CMS: {
-                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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
            }
--- a/openedx/core/djangoapps/ace_common/settings/production.py
+++ b/openedx/core/djangoapps/ace_common/settings/production.py
@@ -1,4 +1,9 @@
+"""Common environment variables unique to the ace_common plugin."""
+
+
 def plugin_settings(settings):
+    """Settings for the ace_common plugin. """
+
    settings.ACE_ENABLED_CHANNELS = settings.ENV_TOKENS.get('ACE_ENABLED_CHANNELS', settings.ACE_ENABLED_CHANNELS)
    settings.ACE_ENABLED_POLICIES = settings.ENV_TOKENS.get('ACE_ENABLED_POLICIES', settings.ACE_ENABLED_POLICIES)
    settings.ACE_CHANNEL_SAILTHRU_DEBUG = settings.ENV_TOKENS.get(
--- a/openedx/core/djangoapps/bookmarks/apps.py
+++ b/openedx/core/djangoapps/bookmarks/apps.py
@@ -23,7 +23,7 @@ class BookmarksConfig(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'},
            }
        }
--- a/openedx/core/djangoapps/bookmarks/settings/production.py
+++ b/openedx/core/djangoapps/bookmarks/settings/production.py
@@ -1,5 +1,8 @@
+"""Common environment variables unique to the Course Content Bookmarks plugin."""
+
+
 def plugin_settings(settings):
-    # Course Content Bookmarks Settings
+    """Settings for the Course Content Bookmarks plugin. """
    settings.MAX_BOOKMARKS_PER_COURSE = settings.ENV_TOKENS.get(
        'MAX_BOOKMARKS_PER_COURSE',
        settings.MAX_BOOKMARKS_PER_COURSE
--- a/openedx/core/djangoapps/coursegraph/management/commands/dump_to_neo4j.py
+++ b/openedx/core/djangoapps/coursegraph/management/commands/dump_to_neo4j.py
@@ -33,7 +33,7 @@ class Command(BaseCommand):

    Example usage:
      python manage.py lms dump_to_neo4j --host localhost --https_port 7473 \
-        --secure --user user --password password --settings=aws
+        --secure --user user --password password --settings=production
    """
    def add_arguments(self, parser):
        parser.add_argument('--host', type=six.text_type)
--- a/openedx/core/djangoapps/credentials/apps.py
+++ b/openedx/core/djangoapps/credentials/apps.py
@@ -16,7 +16,7 @@ class CredentialsConfig(AppConfig):
    plugin_app = {
        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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
                SettingsType.TEST: {PluginSettings.RELATIVE_PATH: u'settings.test'},
--- a/openedx/core/djangoapps/credentials/settings/production.py
+++ b/openedx/core/djangoapps/credentials/settings/production.py
--- a/openedx/core/djangoapps/password_policy/apps.py
+++ b/openedx/core/djangoapps/password_policy/apps.py
@@ -23,12 +23,12 @@ class PasswordPolicyConfig(AppConfig):
    plugin_app = {
        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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
            },
            ProjectType.CMS: {
-                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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
            }
--- a/openedx/core/djangoapps/password_policy/settings/production.py
+++ b/openedx/core/djangoapps/password_policy/settings/production.py
--- a/openedx/core/djangoapps/plugins/README.rst
+++ b/openedx/core/djangoapps/plugins/README.rst
@@ -148,7 +148,7 @@ class::

                        # The python path (relative to this app) to the settings module for the relevant Project Type and Settings Type.
                        # Optional; Defaults to u'settings'.
-                        PluginSettings.RELATIVE_PATH: u'settings.aws',
+                        PluginSettings.RELATIVE_PATH: u'settings.production',
                    },
                    SettingsType.COMMON: {
                        PluginSettings.RELATIVE_PATH: u'settings.common',
@@ -203,7 +203,7 @@ OR use string constants when they cannot import from djangoapps.plugins::
            },
            u'settings_config': {
                u'lms.djangoapp': {
-                    u'aws': { relative_path: u'settings.aws' },
+                    u'production': { relative_path: u'settings.production' },
                    u'common': { relative_path: u'settings.common'},
                }
            },
--- a/openedx/core/djangoapps/plugins/constants.py
+++ b/openedx/core/djangoapps/plugins/constants.py
@@ -29,7 +29,6 @@ class SettingsType(object):
    See https://github.com/edx/edx-platform/master/lms/envs/docs/README.rst for
    further information on each Settings Type.
    """
-    AWS = u'aws'  # aws.py has been deprecated. See https://openedx.atlassian.net/browse/DEPR-14
    PRODUCTION = u'production'
    COMMON = u'common'
    DEVSTACK = u'devstack'
--- a/openedx/core/djangoapps/zendesk_proxy/apps.py
+++ b/openedx/core/djangoapps/zendesk_proxy/apps.py
@@ -30,11 +30,11 @@ class ZendeskProxyConfig(AppConfig):
        PluginSettings.CONFIG: {
            ProjectType.CMS: {
                SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'},
-                SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'},
+                SettingsType.PRODUCTION: {PluginSettings.RELATIVE_PATH: u'settings.production'},
            },
            ProjectType.LMS: {
                SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'},
-                SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'},
+                SettingsType.PRODUCTION: {PluginSettings.RELATIVE_PATH: u'settings.production'},
            }
        }
    }
--- a/openedx/core/djangoapps/zendesk_proxy/settings/production.py
+++ b/openedx/core/djangoapps/zendesk_proxy/settings/production.py
--- a/openedx/features/journals/apps.py
+++ b/openedx/features/journals/apps.py
@@ -21,7 +21,7 @@ class JournalsConfig(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.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.devstack'},
                SettingsType.TEST: {PluginSettings.RELATIVE_PATH: u'settings.test'},
--- a/openedx/features/journals/settings/production.py
+++ b/openedx/features/journals/settings/production.py