Merge pull request #3524 from serverless/releasing-1.12

releasing 1.12

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.12.0 (26.04.2017)
+- Separated packaging and deployment with a new package command (#3344)
+- Extend OpenWhisk runtime support (#3454)
+- Upgrade gradle wrapper to 3.5 (#3466)
+- Fixed bug when using event streams with custom roles (#3457)
+- Fixed bug with SNS events (#3443)
+- Fixed bug when using custom deployment bucket (#3479)
+- Added support for Python 3.6 for Lambda (#3483)
+- Added new syntax to specify ARN for SNS events (#3505)
+
 # 1.11.0 (12.04.2017)
 - Add CloudWatch Logs Event Source (#3407)
 - Add version description from function (#3429)

lib/plugins/aws/deploy/lib/extendedValidate.js

@@ -19,7 +19,8 @@ module.exports = {
       .utils.readFileSync(serviceStateFilePath);
     _.assign(this.serverless.service, state.service);
     this.serverless.service.package.artifactDirectoryName = state.package.artifactDirectoryName;
-    if (!_.isEmpty(state.package.artifact)) {
+    // only restore the default artifact path if the user is not using a custom path
+    if (!_.isEmpty(state.package.artifact) && this.serverless.service.artifact) {
       this.serverless.service.package.artifact = path
         .join(this.serverless.config.servicePath, '.serverless', state.package.artifact);
     }

lib/plugins/aws/deploy/lib/uploadArtifacts.js

@@ -53,8 +53,8 @@ module.exports = {
       functionObject.package = functionObject.package || {};
       let artifactFilePath = functionObject.package.artifact ||
         this.serverless.service.package.artifact;
-
-      if (!artifactFilePath || this.serverless.service.artifact) {
+      if (!artifactFilePath ||
+        (this.serverless.service.artifact && !functionObject.package.artifact)) {
         if (this.serverless.service.package.individually || functionObject.package.individually) {
           const artifactFileName = functionArtifactFileName;
           artifactFilePath = path.join(this.packagePath, artifactFileName);

lib/plugins/aws/package/compile/functions/index.js

@@ -77,7 +77,8 @@ class AwsCompileFunctions {
 
     let artifactFilePath = functionObject.package.artifact ||
       this.serverless.service.package.artifact;
-    if (!artifactFilePath || this.serverless.service.artifact) {
+    if (!artifactFilePath ||
+      (this.serverless.service.artifact && !functionObject.package.artifact)) {
       let artifactFileName = serviceArtifactFileName;
       if (this.serverless.service.package.individually || functionObject.package.individually) {
         artifactFileName = functionArtifactFileName;

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "dependencies": {
     "agent-base": {
       "version": "2.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "engines": {
     "node": ">=4.0"
   },