From e4270c2be481480824ca54aebf9ab58a0ce6ab40 Mon Sep 17 00:00:00 2001
From: Nathan White <nw@nwhite.net>
Date: Sun, 2 Oct 2016 15:12:58 -0600
Subject: [PATCH 1/3] normalizes project_id from service account key to

---
 CONTRIBUTORS                | 1 +
 packages/common/src/util.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a3b3418ae4a..4f7c580a86a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -21,6 +21,7 @@ Ido Shamun <idoesh1@gmail.com>
 Jason Dobry <jason.dobry@gmail.com>
 Jesse Friedman <jesse@jesse.ws>
 Johan Euphrosine <proppy@google.com>
+Nathan White <nw@nwhite.net>
 Marco Ziccardi <marco.ziccard@gmail.com>
 Patrick Costello <pcostell@google.com>
 Silvano Luciani <silvano@google.com>
diff --git a/packages/common/src/util.js b/packages/common/src/util.js
index 2d7c7096c60..eb5c71741a7 100644
--- a/packages/common/src/util.js
+++ b/packages/common/src/util.js
@@ -541,6 +541,10 @@ function normalizeArguments(globalContext, localConfig, options) {
 
   var config = util.extendGlobalConfig(globalConfig, localConfig);
 
+  if(!config.projectId && config.project_id) {
+    config.projectId = config.project_id;
+  }
+
   if (options.projectIdRequired !== false && !config.projectId) {
     throw util.missingProjectIdError;
   }

From 6fb4f2e3a71038c68c2a809cfb3817acdca82f5d Mon Sep 17 00:00:00 2001
From: Nathan White <nw@nwhite.net>
Date: Sun, 2 Oct 2016 15:25:27 -0600
Subject: [PATCH 2/3] added test

---
 packages/common/test/util.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/common/test/util.js b/packages/common/test/util.js
index 4cf81399b3e..c43f3a6a9e8 100644
--- a/packages/common/test/util.js
+++ b/packages/common/test/util.js
@@ -1215,6 +1215,22 @@ describe('common/util', function() {
       config = util.normalizeArguments(fakeContext, local);
       assert.strictEqual(config, fakeContext.config_);
     });
+    
+    describe('project_idNormalized', function() {
+      var fakeContextWithProject_id = {
+        config_: {
+          project_id: 'grapespaceship911'
+        }
+      };
+      
+      it('should return projectId', function() {
+        var config;
+        
+        config = util.normalizeArguments(fakeContextWithProject_id);
+        assert.strictEqual(config.projectId, fakeContextWithProject_id.config_.project_id);
+      })
+      
+    });
 
     describe('projectIdRequired', function() {
       var defaultProjectId;

From ce67f70bf9707288b433550b89186b7e73d62855 Mon Sep 17 00:00:00 2001
From: Nathan White <nw@nwhite.net>
Date: Sun, 2 Oct 2016 15:49:35 -0600
Subject: [PATCH 3/3] fixed linting issues

---
 packages/common/src/util.js  |  2 +-
 packages/common/test/util.js | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/common/src/util.js b/packages/common/src/util.js
index eb5c71741a7..fd240a19a3a 100644
--- a/packages/common/src/util.js
+++ b/packages/common/src/util.js
@@ -541,7 +541,7 @@ function normalizeArguments(globalContext, localConfig, options) {
 
   var config = util.extendGlobalConfig(globalConfig, localConfig);
 
-  if(!config.projectId && config.project_id) {
+  if (!config.projectId && config.project_id) {
     config.projectId = config.project_id;
   }
 
diff --git a/packages/common/test/util.js b/packages/common/test/util.js
index c43f3a6a9e8..4ff5c0a2ad2 100644
--- a/packages/common/test/util.js
+++ b/packages/common/test/util.js
@@ -1215,21 +1215,21 @@ describe('common/util', function() {
       config = util.normalizeArguments(fakeContext, local);
       assert.strictEqual(config, fakeContext.config_);
     });
-    
+
     describe('project_idNormalized', function() {
-      var fakeContextWithProject_id = {
+      var fakeContextWithProjectUnderscoreId = {
         config_: {
           project_id: 'grapespaceship911'
         }
       };
-      
+
       it('should return projectId', function() {
         var config;
-        
-        config = util.normalizeArguments(fakeContextWithProject_id);
-        assert.strictEqual(config.projectId, fakeContextWithProject_id.config_.project_id);
-      })
-      
+        var projectId = fakeContextWithProjectUnderscoreId.config_.project_id;
+
+        config = util.normalizeArguments(fakeContextWithProjectUnderscoreId);
+        assert.strictEqual(config.projectId, projectId);
+      });
     });
 
     describe('projectIdRequired', function() {