mirror of https://github.com/MISP/MISP
fix: aws would error if asked to del non-existing
parent
3d694bf6f1
commit
608ddaa969
|
@ -77,18 +77,25 @@ class AWSS3Client
|
|||
}
|
||||
|
||||
public function deleteDirectory($prefix) {
|
||||
$keys = $s3->listObjects([
|
||||
$keys = $this->__client->listObjectsV2([
|
||||
'Bucket' => $this->__settings['bucket_name'],
|
||||
'Prefix' => $prefix
|
||||
]) ->getPath('Contents/*/Key');
|
||||
|
||||
$s3->deleteObjects([
|
||||
'Bucket' => $bucket,
|
||||
'Delete' => [
|
||||
'Objects' => array_map(function ($key) {
|
||||
return ['Key' => $key];
|
||||
}, $keys)
|
||||
],
|
||||
]);
|
||||
|
||||
$toDelete = array_map(
|
||||
function ($key) {
|
||||
return ['Key' => $key['Key']];
|
||||
},
|
||||
is_array($keys['Contents'])?$keys['Contents']:[]
|
||||
);
|
||||
|
||||
if (sizeof($toDelete) != 0) {
|
||||
$this->__client->deleteObjects([
|
||||
'Bucket' => $this->__settings['bucket_name'],
|
||||
'Delete' => [
|
||||
'Objects' => $toDelete
|
||||
]
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue