Storage: remove build environment storage (#12077)

We are not using this storage backend anymore,
we should delete the buckets as well.

Author: stsewd

readthedocs/settings/base.py

@@ -422,9 +422,6 @@ def MIDDLEWARE(self):
     # Django Storage subclass used to write build artifacts to cloud or local storage
     # https://docs.readthedocs.io/page/development/settings.html#rtd-build-media-storage
     RTD_BUILD_MEDIA_STORAGE = "readthedocs.builds.storage.BuildMediaFileSystemStorage"
-    RTD_BUILD_ENVIRONMENT_STORAGE = (
-        "readthedocs.builds.storage.BuildMediaFileSystemStorage"
-    )
     RTD_BUILD_TOOLS_STORAGE = "readthedocs.builds.storage.BuildMediaFileSystemStorage"
     RTD_BUILD_COMMANDS_STORAGE = (
         "readthedocs.builds.storage.BuildMediaFileSystemStorage"

readthedocs/settings/docker_compose.py

@@ -177,10 +177,6 @@ def DATABASES(self):  # noqa
     EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
     RTD_BUILD_MEDIA_STORAGE = "readthedocs.storage.s3_storage.S3BuildMediaStorage"
-    # Storage backend for build cached environments
-    RTD_BUILD_ENVIRONMENT_STORAGE = (
-        "readthedocs.storage.s3_storage.S3BuildEnvironmentStorage"
-    )
     # Storage backend for build languages
     RTD_BUILD_TOOLS_STORAGE = "readthedocs.storage.s3_storage.S3BuildToolsStorage"
     # Storage for static files (those collected with `collectstatic`)
@@ -191,7 +187,6 @@ def DATABASES(self):  # noqa
     AWS_SECRET_ACCESS_KEY = "password"
     S3_MEDIA_STORAGE_BUCKET = "media"
     S3_BUILD_COMMANDS_STORAGE_BUCKET = "builds"
-    S3_BUILD_ENVIRONMENT_STORAGE_BUCKET = "envs"
     S3_BUILD_TOOLS_STORAGE_BUCKET = "build-tools"
     S3_STATIC_STORAGE_BUCKET = "static"
     S3_STATIC_STORAGE_OVERRIDE_HOSTNAME = PRODUCTION_DOMAIN

readthedocs/storage/__init__.py

@@ -16,11 +16,6 @@ def _setup(self):
         self._wrapped = get_storage_class(settings.RTD_BUILD_MEDIA_STORAGE)()
 
 
-class ConfiguredBuildEnvironmentStorage(LazyObject):
-    def _setup(self):
-        self._wrapped = get_storage_class(settings.RTD_BUILD_ENVIRONMENT_STORAGE)()
-
-
 class ConfiguredBuildCommandsStorage(LazyObject):
     def _setup(self):
         self._wrapped = get_storage_class(settings.RTD_BUILD_COMMANDS_STORAGE)()
@@ -37,7 +32,6 @@ def _setup(self):
 
 
 build_media_storage = ConfiguredBuildMediaStorage()
-build_environment_storage = ConfiguredBuildEnvironmentStorage()
 build_commands_storage = ConfiguredBuildCommandsStorage()
 build_tools_storage = ConfiguredBuildToolsStorage()
 staticfiles_storage = ConfiguredStaticStorage()

readthedocs/storage/s3_storage.py

@@ -23,7 +23,20 @@
 from .mixins import S3PrivateBucketMixin
 
 
-class S3BuildMediaStorageMixin(BuildMediaStorageMixin, S3Boto3Storage):
+class S3BuildMediaStorage(OverrideHostnameMixin, BuildMediaStorageMixin, S3Boto3Storage):
+    """An AWS S3 Storage backend for build artifacts."""
+
+    bucket_name = getattr(settings, "S3_MEDIA_STORAGE_BUCKET", None)
+    override_hostname = getattr(settings, "S3_MEDIA_STORAGE_OVERRIDE_HOSTNAME", None)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not self.bucket_name:
+            raise ImproperlyConfigured(
+                "AWS S3 not configured correctly. Ensure S3_MEDIA_STORAGE_BUCKET is defined.",
+            )
+
     @cached_property
     def _rclone(self):
         provider = settings.S3_PROVIDER
@@ -39,21 +52,6 @@ def _rclone(self):
         )
 
 
-class S3BuildMediaStorage(OverrideHostnameMixin, S3BuildMediaStorageMixin):
-    """An AWS S3 Storage backend for build artifacts."""
-
-    bucket_name = getattr(settings, "S3_MEDIA_STORAGE_BUCKET", None)
-    override_hostname = getattr(settings, "S3_MEDIA_STORAGE_OVERRIDE_HOSTNAME", None)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if not self.bucket_name:
-            raise ImproperlyConfigured(
-                "AWS S3 not configured correctly. Ensure S3_MEDIA_STORAGE_BUCKET is defined.",
-            )
-
-
 class S3BuildCommandsStorage(S3PrivateBucketMixin, S3Boto3Storage):
     """An AWS S3 Storage backend for build commands."""
 
@@ -110,20 +108,7 @@ class NoManifestS3StaticStorage(S3StaticStorageMixin, OverrideHostnameMixin, S3B
     internal_redirect_root_path = "proxito-static"
 
 
-class S3BuildEnvironmentStorage(S3PrivateBucketMixin, S3BuildMediaStorageMixin):
-    bucket_name = getattr(settings, "S3_BUILD_ENVIRONMENT_STORAGE_BUCKET", None)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if not self.bucket_name:
-            raise ImproperlyConfigured(
-                "AWS S3 not configured correctly. "
-                "Ensure S3_BUILD_ENVIRONMENT_STORAGE_BUCKET is defined.",
-            )
-
-
-class S3BuildToolsStorage(S3PrivateBucketMixin, S3BuildMediaStorageMixin):
+class S3BuildToolsStorage(S3PrivateBucketMixin, S3Boto3Storage):
     bucket_name = getattr(settings, "S3_BUILD_TOOLS_STORAGE_BUCKET", None)
 
     def __init__(self, *args, **kwargs):