Issue 3224 s3 copy glacier object (#3318)

* 3224 Enhancement - S3 Copy restored glacier objects

- adds setter for expiry date
- copy sets expiry date to none when source is glacier object
- throws error for copying glacier object only if not restored/still restoring

* 3224 Enhancement - S3 Copy restored glacier objects

- throws error for copying deep archive object only if not restored/still restoring
This commit is contained in:
ruthbovell 2020-09-21 07:37:50 +01:00 committed by GitHub
commit 1022aa0968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 3 deletions

View file

@ -169,6 +169,9 @@ class FakeKey(BaseModel):
raise InvalidStorageClass(storage=storage)
self._storage_class = storage
def set_expiry(self, expiry):
self._expiry = expiry
def set_acl(self, acl):
self.acl = acl
@ -1689,6 +1692,9 @@ class S3Backend(BaseBackend):
new_key.set_storage_class(storage)
if acl is not None:
new_key.set_acl(acl)
if key.storage_class in "GLACIER":
# Object copied from Glacier object should not have expiry
new_key.set_expiry(None)
dest_bucket.keys[dest_key_name] = new_key

View file

@ -1276,7 +1276,13 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
if key is not None:
if key.storage_class in ["GLACIER", "DEEP_ARCHIVE"]:
raise ObjectNotInActiveTierError(key)
if key.response_dict.get(
"x-amz-restore"
) is None or 'ongoing-request="true"' in key.response_dict.get(
"x-amz-restore"
):
raise ObjectNotInActiveTierError(key)
self.backend.copy_key(
src_bucket,
src_key,