Merge pull request #264 from apex/refactor-examples

refactor examples (same behavior in simple examples; less bloated)

Readme.md

@@ -23,9 +23,10 @@ apex upgrade
 
 Currently supports:
 
-- Nodejs
+- Node.js
 - Golang
 - Python
+- Java
 
 ## Features
 

_examples/babel-browserify/project.json

@@ -1,11 +1,9 @@
 {
   "name": "babel",
-  "description": "Node.js Babel example project",
+  "description": "Node.js Babel (using browserify) example project",
   "role": "arn:aws:iam::293503197324:role/lambda",
   "runtime": "nodejs",
   "handler": "main.default",
-  "memory": 128,
-  "timeout": 30,
   "hooks": {
     "build": "../../node_modules/.bin/browserify -s default -t babelify -o main.js index.js",
     "clean": "rm -f main.js"

_examples/babel-webpack/project.json

@@ -1,11 +1,9 @@
 {
   "name": "babel",
-  "description": "Node.js Babel example project",
+  "description": "Node.js Babel (using webpack) example project",
   "role": "arn:aws:iam::293503197324:role/lambda",
   "runtime": "nodejs",
   "handler": "lib.default",
-  "memory": 128,
-  "timeout": 30,
   "hooks": {
     "build": "../../node_modules/.bin/webpack --config ../../webpack.config.js",
     "clean": "rm -fr lib"

_examples/go/functions/simple/.apexignore

@@ -0,0 +1 @@
+*.go

_examples/go/functions/bar/main.go → _examples/go/functions/simple/main.go

@@ -12,6 +12,12 @@ type message struct {
 
 func main() {
 	apex.HandleFunc(func(event json.RawMessage, ctx *apex.Context) (interface{}, error) {
-		return &message{"bar"}, nil
+		var m message
+
+		if err := json.Unmarshal(event, &m); err != nil {
+			return nil, err
+		}
+
+		return m, nil
 	})
 }

_examples/go/project.json

@@ -1,8 +1,5 @@
 {
   "name": "go",
   "description": "Go example project",
-  "runtime": "golang",
-  "memory": 128,
-  "timeout": 5,
   "role": "arn:aws:iam::293503197324:role/lambda"
 }

_examples/java/functions/simple/.apexignore

@@ -0,0 +1 @@
+*.java

_examples/java/functions/baz/src/main/java/lambda/Main.java → _examples/java/functions/simple/src/main/java/lambda/Main.java

@@ -1,6 +1,6 @@
 package lambda;
 
-import com.amazonaws.services.lambda.runtime.Context; 
+import com.amazonaws.services.lambda.runtime.Context;
 
 public class Main {
 
@@ -23,7 +23,6 @@ public ExampleRequest() {
         }
     }
 
-
     public static class ExampleResponse {
         String hello;
 
@@ -44,6 +43,6 @@ public ExampleResponse() {
     }
 
     public ExampleResponse handler(ExampleRequest event, Context context) {
-        return new ExampleResponse("baz");
+        return new ExampleResponse(event.getHello());
     }
 }

_examples/java/functions/with-pom/.apexignore

@@ -0,0 +1 @@
+*.java

_examples/java/functions/with-pom/function.json

@@ -0,0 +1,4 @@
+{
+  "description": "Java example function with existing pom.xml",
+  "handler": "lambda.Example::handler"
+}

_examples/java/functions/bar/src/main/java/lambda/Example.java → _examples/java/functions/with-pom/src/main/java/lambda/Example.java

@@ -1,6 +1,6 @@
 package lambda;
 
-import com.amazonaws.services.lambda.runtime.Context; 
+import com.amazonaws.services.lambda.runtime.Context;
 
 public class Example {
 
@@ -23,7 +23,6 @@ public ExampleRequest() {
         }
     }
 
-
     public static class ExampleResponse {
         String hello;
 
@@ -44,6 +43,6 @@ public ExampleResponse() {
     }
 
     public ExampleResponse handler(ExampleRequest event, Context context) {
-        return new ExampleResponse("bar");
+        return new ExampleResponse(event.getHello());
     }
 }

_examples/java/project.json

@@ -1,7 +1,5 @@
 {
   "name": "java",
   "description": "Java example project",
-  "memory": 128,
-  "timeout": 5,
   "role": "arn:aws:iam::293503197324:role/lambda"
 }

_examples/node/functions/more-resources/function.json

@@ -0,0 +1,5 @@
+{
+  "description": "Node.js example function with more memory and higher timeout",
+  "timeout": 10,
+  "memory": 128
+}

_examples/node/functions/more-resources/index.js

@@ -0,0 +1,6 @@
+
+console.log('start more-resources')
+exports.handle = function(e, ctx) {
+  console.log('processing event: %j', e)
+  ctx.succeed({ hello: e.hello })
+}

_examples/node/functions/baz/index.js → _examples/node/functions/simple/index.js

@@ -1,6 +1,6 @@
 
-console.log('start baz')
+console.log('start simple')
 exports.handle = function(e, ctx) {
   console.log('processing event: %j', e)
-  ctx.succeed({ hello: 'baz' })
+  ctx.succeed({ hello: e.hello })
 }

_examples/node/functions/using-env/function.json

@@ -0,0 +1,6 @@
+{
+  "description": "Node.js example function using environment variables",
+  "environment": {
+    "LOGGLY_TOKEN": "some token defined in function.json"
+  }
+}

_examples/node/functions/using-env/index.js

@@ -0,0 +1,9 @@
+
+console.log('start using-env LOGGLY_TOKEN=%s', process.env.LOGGLY_TOKEN)
+exports.handle = function(e, ctx) {
+  console.log('processing event: %j', e)
+  ctx.succeed({
+    hello: 'bar',
+    token_used: process.env.LOGGLY_TOKEN
+  })
+}

_examples/node/project.json

@@ -1,10 +1,8 @@
 {
   "name": "node",
   "description": "Node.js example project",
-  "memory": 128,
-  "timeout": 5,
   "role": "arn:aws:iam::293503197324:role/lambda",
   "environment": {
-    "LOGGLY_TOKEN": "123123123123"
+    "LOGGLY_TOKEN": "some token defined in project.json"
   }
 }

_examples/python/functions/dependency/.apexignore

@@ -1 +1 @@
-*.dist-info/*
+*.dist-info/

_examples/python/functions/dependency/function.json

@@ -1,4 +1,3 @@
 {
-  "name": "dependency",
   "description": "Example with python dependency on an external package"
 }

_examples/python/functions/baz/main.py → _examples/python/functions/simple/main.py

@@ -1,5 +1,5 @@
 
-print "start baz"
+print "start simple function"
 def handle(event, context):
     print "processing event"
     return event

_examples/python/project.json

@@ -1,7 +1,5 @@
 {
   "name": "python",
   "description": "Python example project",
-  "memory": 128,
-  "timeout": 5,
   "role": "arn:aws:iam::293503197324:role/lambda"
 }