From 008e1abc5d825dee8e00c6fa15abd12f38b5eac6 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 18 Apr 2017 20:31:49 +0200 Subject: [PATCH] build: fix screenshot golden upload (#4128) * Fixes the Google Cloud Storage upload for the goldens. The issue seems to happen because the `@google-cloud/storage` package has been installed manually and the `google-cloud` now uses a different storage version than before. Noticed this while debugging the `google-cloud` package. --- package.json | 1 - tools/gulp/util/firebase.ts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 51cd96a1a50..14836dc22d6 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "fs-extra": "^2.0.0", "glob": "^7.1.1", "google-closure-compiler": "^20170218.0.0", - "google-cloud": "^0.48.0", "gulp": "^3.9.1", "gulp-clean": "^0.3.2", "gulp-clean-css": "^3.0.3", diff --git a/tools/gulp/util/firebase.ts b/tools/gulp/util/firebase.ts index 554caeeba10..95124159c56 100644 --- a/tools/gulp/util/firebase.ts +++ b/tools/gulp/util/firebase.ts @@ -1,6 +1,6 @@ const firebaseAdmin = require('firebase-admin'); const firebase = require('firebase'); -const gcloud = require('google-cloud'); +const cloudStorage = require('@google-cloud/storage'); const config = require('../../../functions/config.json'); @@ -27,7 +27,7 @@ export function openFirebaseDashboardDatabase() { * The files uploaded to google cloud are also available to firebase storage. */ export function openScreenshotsBucket() { - let gcs = gcloud.storage({ + let gcs = cloudStorage({ projectId: 'material2-screenshots', credentials: { client_email: 'firebase-adminsdk-t4209@material2-screenshots.iam.gserviceaccount.com',