From 1a49a6d7a6770bdb8b3946f251d421c01ae4eaab Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Thu, 8 Nov 2018 11:35:02 +0100 Subject: [PATCH] Storage/S3: Add custom metadata exposed via API --- storage_s3/indico_storage_s3/controllers.py | 2 +- storage_s3/indico_storage_s3/storage.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/storage_s3/indico_storage_s3/controllers.py b/storage_s3/indico_storage_s3/controllers.py index 1c1ae27..5995b79 100644 --- a/storage_s3/indico_storage_s3/controllers.py +++ b/storage_s3/indico_storage_s3/controllers.py @@ -69,7 +69,7 @@ class RHBuckets(RH): if not isinstance(storage, S3StorageBase): continue readonly = isinstance(storage, ReadOnlyStorageMixin) - data[key] = {'readonly': readonly} + data[key] = {'readonly': readonly, 'meta': storage.meta} if isinstance(storage, S3Storage): data[key].update(self._get_static_info(storage)) elif isinstance(storage, DynamicS3Storage): diff --git a/storage_s3/indico_storage_s3/storage.py b/storage_s3/indico_storage_s3/storage.py index 124c461..f370f07 100644 --- a/storage_s3/indico_storage_s3/storage.py +++ b/storage_s3/indico_storage_s3/storage.py @@ -53,6 +53,7 @@ class S3StorageBase(Storage): session_kwargs['aws_secret_access_key'] = data['secret_key'] self.bucket_policy_file = data.get('bucket_policy_file') self.bucket_versioning = data.get('bucket_versioning') in ('1', 'true', 'yes') + self.meta = data.get('meta') self.session = boto3.session.Session(**session_kwargs) self.client = self.session.client('s3', endpoint_url=self.endpoint_url)