From fd6d2936723a45c0408b89461cc3ce0572813994 Mon Sep 17 00:00:00 2001 From: Kesara Rathnayake Date: Wed, 28 Jun 2023 19:26:59 +1200 Subject: [PATCH] chore: Remove leftover AWS configuration --- docker/Dockerfile | 6 +-- ietf/settings/dev.py | 1 + ietf/settings/docker/__init__.py | 32 ---------------- ietf/settings/docker/base.py | 4 -- ietf/settings/docker/dev.py | 4 -- ietf/settings/docker/grains/aws.py | 49 ------------------------- ietf/settings/docker/grains/database.py | 5 --- ietf/settings/docker/grains/logging.py | 32 ---------------- ietf/settings/docker/hosting.py | 6 --- 9 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 ietf/settings/docker/__init__.py delete mode 100644 ietf/settings/docker/base.py delete mode 100644 ietf/settings/docker/dev.py delete mode 100644 ietf/settings/docker/grains/aws.py delete mode 100644 ietf/settings/docker/grains/database.py delete mode 100644 ietf/settings/docker/grains/logging.py delete mode 100644 ietf/settings/docker/hosting.py diff --git a/docker/Dockerfile b/docker/Dockerfile index ff330548..63df4780 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -64,7 +64,7 @@ COPY --from=frontend /app/ /app/ ARG VERSION=dev ENV APPLICATION_VERSION=${VERSION} -ENV DJANGO_SETTINGS_MODULE ietf.settings.docker.hosting +ENV DJANGO_SETTINGS_MODULE ietf.settings.base ENV VERSION=${VERSION} ENV ENVIRONMENT unknown ENV PROJECT wagtail_website @@ -83,7 +83,7 @@ CMD ["/usr/local/bin/gunicorn", "--config", "/app/docker/gunicorn.py", "ietf.wsg # --------------------------------------------------------------------- # development stage FROM base as app-dev -ENV DJANGO_SETTINGS_MODULE ietf.settings.docker.dev +ENV DJANGO_SETTINGS_MODULE ietf.settings.dev COPY docker/init-dev.sh /app/docker/ ADD https://raw.githubusercontent.com/mrako/wait-for/d9699cb9fe8a4622f05c4ee32adf2fd93239d005/wait-for /usr/local/bin/ @@ -101,7 +101,7 @@ CMD ["/app/docker/init-dev.sh"] # --------------------------------------------------------------------- # test stage FROM base as app-test -ENV DJANGO_SETTINGS_MODULE ietf.settings.docker.dev +ENV DJANGO_SETTINGS_MODULE ietf.settings.dev COPY docker/init-test.sh /app/docker/ ADD https://raw.githubusercontent.com/mrako/wait-for/d9699cb9fe8a4622f05c4ee32adf2fd93239d005/wait-for /usr/local/bin/ diff --git a/ietf/settings/dev.py b/ietf/settings/dev.py index ce261658..982b89dc 100644 --- a/ietf/settings/dev.py +++ b/ietf/settings/dev.py @@ -9,6 +9,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +CACHE_MIDDLEWARE_ALIAS = "dummy" # Process all tasks synchronously. # Helpful for local development and running tests diff --git a/ietf/settings/docker/__init__.py b/ietf/settings/docker/__init__.py deleted file mode 100644 index 36319e61..00000000 --- a/ietf/settings/docker/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -from typed_environment_configuration import ( - BoolVariable, - StringVariable, - StringListVariable, - FillVars, -) -from ..base import * - -_ENVVARS = [ - StringVariable( - "APPLICATION_VERSION" - ), # The Application version used across project - StringListVariable("ADDRESSES", default=""), # list of allowed addresses - StringVariable("APP_SECRET_KEY", prefix="APP_"), - StringVariable("PROJECT"), # Project namespace - StringVariable( - "ENVIRONMENT" - ), # Application environment i.e. development, production, etc. - StringVariable("AWS_STORAGE_BUCKET_NAME", default=""), # S3 Bucket Name - StringVariable("AWS_S3_CUSTOM_DOMAIN", default=""), # S3 Domain - StringVariable("DATABASE_URL"), # e.g. postgres URL -] - -_DJANGO_ENVVARS = [ - BoolVariable("DJANGO_DEBUG", default=False), - StringVariable("DJANGO_SERVER_ENV", default="Nonprod"), -] - - -FillVars(_ENVVARS, vars()) -FillVars(_DJANGO_ENVVARS, vars(), "DJANGO_") -ALLOWED_HOSTS = ADDRESSES diff --git a/ietf/settings/docker/base.py b/ietf/settings/docker/base.py deleted file mode 100644 index d764d0bf..00000000 --- a/ietf/settings/docker/base.py +++ /dev/null @@ -1,4 +0,0 @@ -from . import * - -from .grains.database import * -from .grains.logging import * diff --git a/ietf/settings/docker/dev.py b/ietf/settings/docker/dev.py deleted file mode 100644 index 99684588..00000000 --- a/ietf/settings/docker/dev.py +++ /dev/null @@ -1,4 +0,0 @@ -from .base import * - -DEBUG = True -CACHE_MIDDLEWARE_ALIAS = "dummy" diff --git a/ietf/settings/docker/grains/aws.py b/ietf/settings/docker/grains/aws.py deleted file mode 100644 index e618b2b5..00000000 --- a/ietf/settings/docker/grains/aws.py +++ /dev/null @@ -1,49 +0,0 @@ -import requests - -from django.core.exceptions import ImproperlyConfigured - -from .. import AWS_S3_CUSTOM_DOMAIN, AWS_STORAGE_BUCKET_NAME, ALLOWED_HOSTS - - -def _probe_aws_ip(): - try: - ec2_private_ip = requests.get( - "http://169.254.169.254/latest/meta-data/local-ipv4", timeout=3 - ).text - except requests.exceptions.RequestException as e: - raise ValueError("Could not get EC2 private ip address: {}".format(e)) - else: - if not ec2_private_ip: - raise ValueError( - "Could not get EC2 private ip address: ec2_private_ip={!r}".format( - ec2_private_ip - ) - ) - return ec2_private_ip - - -ALLOWED_HOSTS.append(_probe_aws_ip()) - -AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "public, max-age=900"} -AWS_DEFAULT_ACL = None -# #S3 settings -DEFAULT_FILE_STORAGE = "ietf.s3utils.MediaRootS3BotoStorage" -THUMBNAIL_DEFAULT_STORAGE = DEFAULT_FILE_STORAGE -STATICFILES_STORAGE = "ietf.s3utils.StaticRootS3BotoStorage" - -if not AWS_STORAGE_BUCKET_NAME: - raise ImproperlyConfigured( - "Wrong AWS_STORAGE_BUCKET_NAME={!r} env variable".format( - AWS_STORAGE_BUCKET_NAME - ) - ) - -if not AWS_S3_CUSTOM_DOMAIN: - AWS_S3_CUSTOM_DOMAIN = "{}.s3-ap-southeast-2.amazonaws.com".format( - AWS_STORAGE_BUCKET_NAME - ) - -STATIC_URL = "https://%s/static/" % AWS_S3_CUSTOM_DOMAIN -MEDIA_URL = "https://%s/media/" % AWS_S3_CUSTOM_DOMAIN - -AWS_S3_FILE_OVERWRITE = False diff --git a/ietf/settings/docker/grains/database.py b/ietf/settings/docker/grains/database.py deleted file mode 100644 index c9718fdd..00000000 --- a/ietf/settings/docker/grains/database.py +++ /dev/null @@ -1,5 +0,0 @@ -import dj_database_url - -from .. import DATABASE_URL - -DATABASES = {"default": dj_database_url.parse(DATABASE_URL, conn_max_age=600)} diff --git a/ietf/settings/docker/grains/logging.py b/ietf/settings/docker/grains/logging.py deleted file mode 100644 index df939017..00000000 --- a/ietf/settings/docker/grains/logging.py +++ /dev/null @@ -1,32 +0,0 @@ -LOGGING = { - "version": 1, - "disable_existing_loggers": False, - "formatters": { - "verbose": { - "format": "%(asctime)s | %(levelname)s [%(name)s.%(filename)s:%(lineno)s] %(message)s", - "datefmt": "%Y-%m-%d %H:%M:%S%z", - }, - "simple": {"format": "%(levelname)s %(message)s"}, - }, - "handlers": { - "stdout": { - "level": "DEBUG", - "class": "logging.StreamHandler", - "formatter": "verbose", - }, - "mail_admins": { - "level": "ERROR", - "class": "django.utils.log.AdminEmailHandler", - }, - }, - "loggers": { - "django": {"handlers": ["stdout"], "propagate": True, "level": "ERROR"}, - "core": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "accounts": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "shop": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "certificates": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "forms": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "elearning": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - "shop_apps": {"handlers": ["stdout"], "propagate": True, "level": "INFO"}, - }, -} diff --git a/ietf/settings/docker/hosting.py b/ietf/settings/docker/hosting.py deleted file mode 100644 index c954d86d..00000000 --- a/ietf/settings/docker/hosting.py +++ /dev/null @@ -1,6 +0,0 @@ -from .base import * - -from .grains.aws import * - -SECURE_HSTS_SECONDS = 31536000 -CACHE_MIDDLEWARE_ALIAS = "dummy" # Remove after upgrade to Wagtail >= 2.10. See https://github.com/wagtail/wagtail/issues/5975