Skip to content

Fixed test_store_validity #6003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2020
Merged

Fixed test_store_validity #6003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/agent/block_store_services/block_store_s3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,19 @@ class BlockStoreS3 extends BlockStoreBase {
async test_store_validity() {
const block_key = this._block_key(`test-delete-non-existing-key-${Date.now()}`);
try {
// in s3 there is no error for non-existing object
await this.s3cloud.deleteObject({
Bucket: this.cloud_info.target_bucket,
Key: block_key
}).promise();
const endpoint = this.cloud_info.endpoint;
if (cloud_utils.is_aws_endpoint(endpoint)) {
// in s3 there is no error for non-existing object
await this.s3cloud.deleteObjectTagging({
Bucket: this.cloud_info.target_bucket,
Key: block_key
}).promise();
} else {
await this.s3cloud.deleteObject({
Bucket: this.cloud_info.target_bucket,
Key: block_key
}).promise();
}
} catch (err) {
dbg.error('in _test_cloud_service - deleteObject failed:', err, _.omit(this.cloud_info, 'access_keys'));
if (err.code === 'NoSuchBucket') {
Expand Down