Skip to content

BF: fix merge conflict error #1182

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
Mar 29, 2018
Merged

BF: fix merge conflict error #1182

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
71 changes: 1 addition & 70 deletions lib/data/external/GcpClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,76 +288,7 @@ class GcpClient extends AwsClient {
return callback();
});
}

/**
* healthcheck - the gcp health requires checking multiple buckets:
* main, mpu, and overflow buckets
* @param {string} location - location name
* @param {function} callback - callback function to call with the bucket
* statuses
* @return {undefined}
*/
healthcheck(location, callback) {
const checkBucketHealth = (bucket, cb) => {
const bucketResp = {};
this._client.headBucket({ Bucket: bucket }, err => {
if (err) {
bucketResp[bucket] = {
gcpBucket: bucket,
error: err,
external: true };
return cb(null, bucketResp);
}
return this._client.getBucketVersioning({ Bucket: bucket },
(err, data) => {
if (err) {
bucketResp[bucket] = {
gcpBucket: bucket,
error: err,
external: true,
};
} else if (!data.Status || data.Status === 'Suspended') {
bucketResp[bucket] = {
gcpBucket: bucket,
versioningStatus: data.Status,
error: 'Versioning must be enabled',
external: true,
};
} else {
bucketResp[bucket] = {
gcpBucket: bucket,
versioningStatus: data.Status,
message: 'Congrats! You own the bucket',
};
}
return cb(null, bucketResp);
});
});
};
const bucketList = [
this._gcpBucketName,
this._mpuBucketName,
this._overflowBucketname,
];
async.map(bucketList, checkBucketHealth, (err, results) => {
const gcpResp = {};
gcpResp[location] = {
buckets: [],
};
if (err) {
// err should always be undefined
return callback(errors.InternalFailure
.customizeDescription('Unable to perform health check'));
}
results.forEach(bucketResp => {
if (bucketResp.error) {
gcpResp[location].error = true;
}
gcpResp[location].buckets.push(bucketResp);
});
return callback(null, gcpResp);
});
}
}

module.exports = GcpClient;