Merge pull request #163 from fiveisprime/master

Update the Azure example to match recent updates.

Author: DavidWells

azure-node-simple-http-endpoint/README.md

@@ -5,28 +5,40 @@ layout: Doc
 -->
 # Simple HTTP example
 
-In this example, we deploy an HTTP Node.js Azure Function. This sample show you how to read properties off of a query string or the request body, then set a result back to Azure.
+In this example, we deploy an HTTP Node.js Azure Function. This sample show you
+how to read properties off of a query string or the request body, then set a
+result back to Azure.
 
 See the [Azure Functions Serverless Plugin docs](https://www.serverless.com/framework/docs/providers/azure/) for more info.
 
+_Note: you may need to change the `service` name in `serverless.yml`_
+
 ## Setup
 
 1. We recommend Node.js v6.5.0
-2. Install the serverless framework - `npm i -g serverless`
-3. Install the dependencies of this example - `npm i`
+2. Install the serverless framework - `npm install -g serverless`
+3. Install the dependencies of this example - `npm install`
 
 ## Deploying
 
-To deploy, set up your [Credentials](https://www.serverless.com/framework/docs/providers/azure/guide/credentials) and run
+To deploy, use the `deploy` and follow the instructions to log into your Azure
+account.
 
 ```bash
-serverless deploy
+$ serverless deploy
+Serverless: Packaging service...
+Serverless: Logging in to Azure
+Serverless: Paste this code (copied to your clipboard) into the launched browser, and complete the authentication process: BLAZSRMVJ
 ```
 
+Once authenticated, the session will continue and deploy the app.
+
 ## Invoking
 
-Once deployed, run
+Invoke the deployed function using the `invoke` command.
 
 ```bash
-serverless invoke -f hello
+$ serverless invoke -f hello -d "{ \"name\": \"World\" }"
+Serverless: Logging in to Azure
+"Hello World"
 ```

azure-node-simple-http-endpoint/handler.js

@@ -2,14 +2,17 @@
 
 module.exports.hello = (context, req) => {
   context.log('JavaScript HTTP trigger function processed a request.');
+
   const res = {};
+
   if (req.query.name || (req.body && req.body.name)) {
-    // status: 200, /* Defaults to 200 */
     const name = req.query.name || req.body.name;
+
     res.body = `Hello ${name}`;
   } else {
     res.status = 400;
     res.body = 'Please pass a name on the query string or in the request body';
   }
+
   context.done(null, res);
 };

azure-node-simple-http-endpoint/package.json

@@ -3,12 +3,9 @@
   "version": "0.1.0",
   "description": "An example of making http endpoints with the Azure Functions Serverless Framework plugin",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "author": "serverless.com",
   "license": "MIT",
    "dependencies": {
-    "serverless-azure-functions": "^0.1.0"
+    "serverless-azure-functions": "^0.2.0"
   }
 }

azure-node-simple-http-endpoint/serverless.yml

@@ -2,10 +2,6 @@ service: azfx-node-http
 
 provider:
   name: azure
-  azureSubId: YourAzureSubscriptionID
-  azureServicePrincipalTenantId: servicePrincipalTenantId
-  azureservicePrincipalClientId: servicePrincipalClientId
-  azureServicePrincipalPassword: servicePrincipalPassword
   location: West US
 
 plugins:
@@ -19,11 +15,9 @@ package:
     - .git/**
 
 functions:
-  hello: 
+  hello:
      handler: handler.hello
-     events: 
+     events:
        - http: true
          x-azure-settings:
-           authLevel : anonymous
-     
- 
+           authLevel: anonymous