From 245f66d5c1d2ef6c83b19c6927647a9171ba7327 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 23 Feb 2018 14:59:14 -0800 Subject: [PATCH] 1.0.0-beta.3 (#192) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- src/cli/controller.js | 4 ++++ src/service/rest-service.js | 17 +++++++++++++---- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6381b8..49b879e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +##### 1.0.0-beta.3 - 23 February 2017 + +###### Bug fixes +- Fixed missing promise +- Fixed default `source` value in Controller#deploy +- Fixed outdated discovery doc + ##### 1.0.0-beta.2 - 20 February 2017 ###### Other diff --git a/package.json b/package.json index bf8e2d7..c0fdafb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/functions-emulator", "description": "Google Cloud Functions Emulator", - "version": "1.0.0-beta.2", + "version": "1.0.0-beta.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { diff --git a/src/cli/controller.js b/src/cli/controller.js index cb97865..76dc48d 100644 --- a/src/cli/controller.js +++ b/src/cli/controller.js @@ -287,6 +287,10 @@ class Controller { cloudfunction.entryPoint = opts.entryPoint; } + if (!opts.source) { + opts.source = process.cwd(); + } + if (opts.source.startsWith('https://')) { throw new Error('"https://" source is not supported yet!'); } else if (opts.source.startsWith('gs://')) { diff --git a/src/service/rest-service.js b/src/service/rest-service.js index 8fe0f17..3c5478f 100644 --- a/src/service/rest-service.js +++ b/src/service/rest-service.js @@ -204,11 +204,20 @@ class RestService extends Service { }); } + /** + * Generates an upload URL. + * + * @param {object} req The request. + * @param {object} res The response. + */ generateUploadUrl (req, res) { logger.debug('RestService#generateUploadUrl'); - res.send({ - uploadUrl: CloudFunction.generateUploadUrl(this.config) - }).end(); + return new Promise((resolve) => { + res.send({ + uploadUrl: CloudFunction.generateUploadUrl(this.config) + }).end(); + resolve(); + }); } /** @@ -221,7 +230,7 @@ class RestService extends Service { return Promise.resolve() .then(() => { const doc = this._discovery.all; - if (typeof doc === 'object' && Object.keys(doc).length > 0) { + if (typeof doc === 'object' && Object.keys(doc).length > 0 && doc.version === API_VERSION) { return doc; } return got(DISCOVERY_URL, {