From c5cb52a8122e6d6d51a6d60af31acae900659802 Mon Sep 17 00:00:00 2001 From: nvi9 <42123156+nvi9@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:56:35 +0200 Subject: [PATCH 1/2] Support django-storages >=1.14 --- private_storage/storage/s3boto3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/private_storage/storage/s3boto3.py b/private_storage/storage/s3boto3.py index 320446c..080fdb4 100644 --- a/private_storage/storage/s3boto3.py +++ b/private_storage/storage/s3boto3.py @@ -16,8 +16,8 @@ class PrivateS3BotoStorage(S3Boto3Storage): Private storage bucket for S3 """ - access_key_names = ['AWS_PRIVATE_S3_ACCESS_KEY_ID', 'AWS_PRIVATE_ACCESS_KEY_ID'] + S3Boto3Storage.access_key_names - secret_key_names = ['AWS_PRIVATE_S3_SECRET_ACCESS_KEY', 'AWS_PRIVATE_SECRET_ACCESS_KEY'] + S3Boto3Storage.secret_key_names + access_key_names = ['AWS_PRIVATE_S3_ACCESS_KEY_ID', 'AWS_PRIVATE_ACCESS_KEY_ID'] + getattr(S3Boto3Storage, 'access_key_names', []) + secret_key_names = ['AWS_PRIVATE_S3_SECRET_ACCESS_KEY', 'AWS_PRIVATE_SECRET_ACCESS_KEY'] + getattr(S3Boto3Storage, 'secret_key_names', []) def __init__(self, **settings): super().__init__(**settings) From b682ea6b1f00457e1d38b0f3fc2d1418a20d8d6f Mon Sep 17 00:00:00 2001 From: Antonio Morillas Date: Sun, 8 Oct 2023 23:02:25 +0200 Subject: [PATCH 2/2] Update s3boto3.py These elements are not used. --- private_storage/storage/s3boto3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/private_storage/storage/s3boto3.py b/private_storage/storage/s3boto3.py index 080fdb4..d564bc3 100644 --- a/private_storage/storage/s3boto3.py +++ b/private_storage/storage/s3boto3.py @@ -16,8 +16,8 @@ class PrivateS3BotoStorage(S3Boto3Storage): Private storage bucket for S3 """ - access_key_names = ['AWS_PRIVATE_S3_ACCESS_KEY_ID', 'AWS_PRIVATE_ACCESS_KEY_ID'] + getattr(S3Boto3Storage, 'access_key_names', []) - secret_key_names = ['AWS_PRIVATE_S3_SECRET_ACCESS_KEY', 'AWS_PRIVATE_SECRET_ACCESS_KEY'] + getattr(S3Boto3Storage, 'secret_key_names', []) + #access_key_names = ['AWS_PRIVATE_S3_ACCESS_KEY_ID', 'AWS_PRIVATE_ACCESS_KEY_ID'] + getattr(S3Boto3Storage, 'access_key_names', []) + #secret_key_names = ['AWS_PRIVATE_S3_SECRET_ACCESS_KEY', 'AWS_PRIVATE_SECRET_ACCESS_KEY'] + getattr(S3Boto3Storage, 'secret_key_names', []) def __init__(self, **settings): super().__init__(**settings)