Merge pull request #81 from siegesmund/master

Corrects issue which prevents deploying binary function with sls deploy -f
serverless · Oct 4, 2017 · c1e0d42 · c1e0d42
2 parents 71f4c0d + 92b0cb4
commit c1e0d42
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/compile/functions/runtimes/base.js b/compile/functions/runtimes/base.js
@@ -96,7 +96,7 @@ class BaseRuntime {
 
   getArtifactPath(functionObject) {
     return this.serverless.service.package.individually ? 
-      functionObject.artifact : this.serverless.service.package.artifact;
+      functionObject.package.artifact : this.serverless.service.package.artifact;
   }
 }
 

diff --git a/compile/functions/runtimes/tests/binary.js b/compile/functions/runtimes/tests/binary.js
@@ -98,7 +98,7 @@ describe('Binary', () => {
     })
 
     it('should handle service artifact for individual function handler', () => {
-      const functionObj = {handler: 'handler', artifact: '/path/to/zip_file.zip'}
+      const functionObj = {handler: 'handler', package: { artifact: '/path/to/zip_file.zip'}}
       node.serverless.service.package = {individually: true};
       node.isValidFile = () => true
 

diff --git a/compile/functions/runtimes/tests/node.js b/compile/functions/runtimes/tests/node.js
@@ -145,7 +145,7 @@ describe('Node', () => {
     });
 
     it('should handle service artifact for individual function handler', () => {
-      const functionObj = {handler: 'handler.main', artifact: '/path/to/zip_file.zip'}
+      const functionObj = {handler: 'handler.main', package: { artifact: '/path/to/zip_file.zip'}}
       node.serverless.service.package = {individually: true};
       node.isValidFile = () => true
 

diff --git a/compile/functions/runtimes/tests/php.js b/compile/functions/runtimes/tests/php.js
@@ -109,7 +109,7 @@ describe('Php', () => {
     })
 
     it('should handle service artifact for individual function handler', () => {
-      const functionObj = {handler: 'handler.main', artifact: '/path/to/zip_file.zip'}
+      const functionObj = {handler: 'handler.main', package: { artifact: '/path/to/zip_file.zip'}}
       php.serverless.service.package = {individually: true};
       php.isValidFile = () => true
 

diff --git a/compile/functions/runtimes/tests/python.js b/compile/functions/runtimes/tests/python.js
@@ -111,7 +111,7 @@ describe('Python', () => {
     })
 
     it('should handle service artifact for individual function handler', () => {
-      const functionObj = {handler: 'handler.main', artifact: '/path/to/zip_file.zip'}
+      const functionObj = {handler: 'handler.main', package: { artifact: '/path/to/zip_file.zip'}}
       node.serverless.service.package = {individually: true};
       node.isValidFile = () => true
 

diff --git a/compile/functions/runtimes/tests/swift.js b/compile/functions/runtimes/tests/swift.js
@@ -122,7 +122,7 @@ describe('Swift', () => {
     })
 
     it('should handle service artifact for individual function handler', () => {
-      const functionObj = {handler: 'handler.main', artifact: '/path/to/zip_file.zip'}
+      const functionObj = {handler: 'handler.main', package: { artifact: '/path/to/zip_file.zip'}}
       node.serverless.service.package = {individually: true};
       node.isValidFile = () => true