Merge 04ecc74 into 1c15ac3

serverless · Mar 13, 2019 · d0602f8 · d0602f8
2 parents 1c15ac3 + 04ecc74
commit d0602f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package/lib/compileFunctions.js b/package/lib/compileFunctions.js
@@ -43,11 +43,18 @@ module.exports = {
       funcTemplate.properties.timeout = _.get(funcObject, 'timeout')
         || _.get(this, 'serverless.service.provider.timeout')
         || '60s';
+      funcTemplate.properties.serviceAccount = _.get(funcObject, 'serviceAccount')
+        || _.get(this, 'serverless.service.provider.serviceAccount')
+        || '';
       funcTemplate.properties.environmentVariables = _.merge(
         _.get(this, 'serverless.service.provider.environment'),
         funcObject.environment // eslint-disable-line comma-dangle
       );
 
+      if (!funcTemplate.properties.serviceAccount) {
+        delete funcTemplate.properties.serviceAccount;
+      }
+
       if (!_.size(funcTemplate.properties.environmentVariables)) {
         delete funcTemplate.properties.environmentVariables;
       }