Merge pull request #11179 from overleaf/em-upgrade-gcs-lib

Upgrade @google-cloud/storage library to 6.9.0

GitOrigin-RevId: 0e80dcccca4679ffe28d5b16512a691e58694e2b
This commit is contained in:
Eric Mc Sween
2023-01-17 07:44:43 -05:00
committed by Copybot
parent ea11b1afed
commit 874dcdb9a7
6 changed files with 285 additions and 1210 deletions
@@ -213,7 +213,8 @@ module.exports = class GcsPersistor extends AbstractPersistor {
}
async deleteDirectory(bucketName, key) {
let query = { directory: key, autoPaginate: false }
const prefix = ensurePrefixIsDirectory(key)
let query = { prefix, autoPaginate: false }
do {
try {
const [files, nextQuery] = await this.storage
@@ -247,11 +248,12 @@ module.exports = class GcsPersistor extends AbstractPersistor {
async directorySize(bucketName, key) {
let files
const prefix = ensurePrefixIsDirectory(key)
try {
const [response] = await this.storage
.bucket(bucketName)
.getFiles({ directory: key })
.getFiles({ prefix })
files = response
} catch (err) {
throw PersistorHelper.wrapError(
@@ -301,3 +303,7 @@ module.exports = class GcsPersistor extends AbstractPersistor {
}
}
}
function ensurePrefixIsDirectory(key) {
return key === '' || key.endsWith('/') ? key : `${key}/`
}