Merge pull request #69 from serverless/add-automatic-tilde-expansion

Add automatic tilde expansion

Author: pmuens

provider/googleProvider.js

@@ -1,6 +1,8 @@
 'use strict';
 
+const path = require('path');
 const fs = require('fs');
+const os = require('os');
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
@@ -72,7 +74,15 @@ class GoogleProvider {
   }
 
   getAuthClient() {
-    const keyFileContent = fs.readFileSync(this.serverless.service.provider.credentials).toString();
+    let credentials = this.serverless.service.provider.credentials;
+    const credParts = credentials.split(path.sep);
+
+    if (credParts[0] === '~') {
+      credParts[0] = os.homedir();
+      credentials = credParts.reduce((memo, part) => path.join(memo, part), '');
+    }
+
+    const keyFileContent = fs.readFileSync(credentials).toString();
     const key = JSON.parse(keyFileContent);
 
     return new google.auth

provider/googleProvider.test.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 
 const sinon = require('sinon');
 const google = require('googleapis');
@@ -13,24 +14,28 @@ describe('GoogleProvider', () => {
   let googleProvider;
   let serverless;
   let setProviderStub;
+  let homedirStub;
 
   beforeEach(() => {
     serverless = new Serverless();
     serverless.service = {
       provider: {
         project: 'example-project',
-        credentials: '12345678-abcdefgh',
+        credentials: '/root/.gcloud/project-1234.json',
       },
     };
     setProviderStub = sinon.stub(serverless, 'setProvider').returns();
     readFileSyncStub = sinon.stub(fs, 'readFileSync')
       .returns('{"client_email": "[email protected]","private_key": "wasdqwerty"}');
+    homedirStub = sinon.stub(os, 'homedir')
+      .returns('/root');
     googleProvider = new GoogleProvider(serverless);
   });
 
   afterEach(() => {
     serverless.setProvider.restore();
     fs.readFileSync.restore();
+    os.homedir.restore();
   });
 
   describe('#getProviderName()', () => {
@@ -65,7 +70,19 @@ describe('GoogleProvider', () => {
     it('should return a new authClient', () => {
       const authClient = googleProvider.getAuthClient();
 
-      expect(readFileSyncStub.calledOnce).toEqual(true);
+      expect(readFileSyncStub.calledWithExactly('/root/.gcloud/project-1234.json'))
+        .toEqual(true);
+      expect(authClient).toBeInstanceOf(google.auth.JWT);
+    });
+
+    it('should expand tilde characters in credentials file paths', () => {
+      googleProvider.serverless.service.provider.credentials = '~/.gcloud/project-1234.json';
+
+      const authClient = googleProvider.getAuthClient();
+
+      expect(homedirStub.calledOnce).toEqual(true);
+      expect(readFileSyncStub.calledWithExactly('/root/.gcloud/project-1234.json'))
+        .toEqual(true);
       expect(authClient).toBeInstanceOf(google.auth.JWT);
     });
   });