Skip to content

Commit 6249ef2

Browse files
committed
Bring Storage samples up to standard.
1 parent ebf7a3d commit 6249ef2

15 files changed

+1079
-368
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"check": "yarn check --strict-semver --integrity",
4646
"lint": "samples lint",
4747
"generate": "node ./scripts/generate",
48-
"pretest": "npm run lint && ./scripts/clean",
48+
"pretest": "npm run lint && node ./scripts/clean coverage",
4949
"unit-test": "ava --verbose -T 30s functions/**/test/**/*.test.js",
5050
"unit-cover": "nyc --cache npm test && nyc report --reporter=html",
5151
"system-test": "ava --verbose -T 30s vision/system-test/**/*.test.js",
@@ -55,6 +55,7 @@
5555
},
5656
"devDependencies": {
5757
"@google-cloud/nodejs-repo-tools": "1.4.13",
58+
"@google-cloud/storage": "1.1.0",
5859
"ava": "0.19.1",
5960
"nyc": "10.3.2",
6061
"shelljs": "0.7.7"

scripts/clean

+32-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,35 @@
1515

1616
require('shelljs/global');
1717

18-
rm('-rf', 'coverage');
18+
const storage = require('@google-cloud/storage')();
19+
20+
const args = process.argv.slice(2);
21+
22+
if (!args.length || args[0] === 'coverage') {
23+
rm('-rf', 'coverage');
24+
} else if (args[0] === 'buckets') {
25+
const NAME_REG_EXP = /^nodejs-docs-samples-test-[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$/;
26+
27+
storage
28+
.getBuckets()
29+
.then(([buckets]) => {
30+
let promise = Promise.resolve();
31+
32+
buckets
33+
.filter((bucket) => NAME_REG_EXP.test(bucket.name))
34+
.forEach((bucket) => {
35+
promise = promise.then(() => {
36+
return bucket.deleteFiles()
37+
.then(() => bucket.deleteFiles(), console.error)
38+
.then(() => {
39+
console.log(`Deleting ${bucket.name}`);
40+
return bucket.delete();
41+
}, console.error)
42+
.catch(console.error);
43+
});
44+
});
45+
})
46+
.catch((err) => {
47+
console.error('ERROR:', err);
48+
});
49+
}

storage/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ __Usage:__ `node encryption.js --help`
110110
```
111111
Commands:
112112
generate-encryption-key Generate a sample encryption key.
113-
upload <bucketName> <srcFileName> <destFileName> <key> Encrypts and uploads a file.
114-
download <bucketName> <srcFileName> <destFileName> <key> Decrypts and downloads a file.
113+
upload <bucketName> <srcFilename> <destFilename> <key> Encrypts and uploads a file.
114+
download <bucketName> <srcFilename> <destFilename> <key> Decrypts and downloads a file.
115115
rotate <bucketName> <fileName> <oldkey> <newKey> Rotates encryption keys for a file.
116116
117117
Options:

0 commit comments

Comments
 (0)