From ca1eee3e052d436f6daafbb5c78eb7f30eeb5991 Mon Sep 17 00:00:00 2001 From: Rowell Belen Date: Fri, 10 Mar 2017 22:10:25 -0700 Subject: [PATCH] AWS Groovy Gradle Template --- docker-compose.yml | 4 + .../templates/aws-groovy-gradle/.gitignore | 16 ++ .../templates/aws-groovy-gradle/build.gradle | 40 ++++ .../gradle/wrapper/gradle-wrapper.properties | 6 + .../templates/aws-groovy-gradle/gradlew | 172 ++++++++++++++++++ .../templates/aws-groovy-gradle/gradlew.bat | 84 +++++++++ .../aws-groovy-gradle/serverless.yml | 94 ++++++++++ .../com/serverless/ApiGatewayResponse.groovy | 12 ++ .../main/groovy/com/serverless/Handler.groovy | 26 +++ .../groovy/com/serverless/Response.groovy | 11 ++ .../src/main/resources/log4j.properties | 6 + tests/templates/test_all_templates | 1 + 12 files changed, 472 insertions(+) create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/.gitignore create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/build.gradle create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/gradle/wrapper/gradle-wrapper.properties create mode 100755 lib/plugins/create/templates/aws-groovy-gradle/gradlew create mode 100755 lib/plugins/create/templates/aws-groovy-gradle/gradlew.bat create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/serverless.yml create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/ApiGatewayResponse.groovy create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Handler.groovy create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Response.groovy create mode 100644 lib/plugins/create/templates/aws-groovy-gradle/src/main/resources/log4j.properties diff --git a/docker-compose.yml b/docker-compose.yml index 609d02c8b..52f12dae0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,10 @@ services: image: java:8 volumes: - ./tmp/serverless-integration-test-aws-java-gradle:/app + aws-groovy-gradle: + image: java:8 + volumes: + - ./tmp/serverless-integration-test-aws-groovy-gradle:/app aws-scala-sbt: image: hseeberger/scala-sbt volumes: diff --git a/lib/plugins/create/templates/aws-groovy-gradle/.gitignore b/lib/plugins/create/templates/aws-groovy-gradle/.gitignore new file mode 100644 index 000000000..82f51ee8f --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/.gitignore @@ -0,0 +1,16 @@ +*.class +.gradle +/build/ +/bin/ +/.settings/ +.project +.classpath + +# Package Files +*.jar +*.war +*.ear + +# Serverless directories +.serverless + diff --git a/lib/plugins/create/templates/aws-groovy-gradle/build.gradle b/lib/plugins/create/templates/aws-groovy-gradle/build.gradle new file mode 100644 index 000000000..6ecb4ddd0 --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/build.gradle @@ -0,0 +1,40 @@ +apply plugin: 'groovy' + +repositories { + mavenCentral() +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +dependencies { + compile ( + 'org.codehaus.groovy:groovy-all:2.4.7', + 'com.amazonaws:aws-lambda-java-core:1.1.0', + 'com.amazonaws:aws-lambda-java-log4j:1.0.0' + ) +} + +// Task for building the zip file for upload +task buildZip(type: Zip) { + // Using the Zip API from gradle to build a zip file of all the dependencies + // + // The path to this zip file can be set in the serverless.yml file for the + // package/artifact setting for deployment to the S3 bucket + // + // Link: https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Zip.html + + // set the base name of the zip file + baseName = "hello" + from compileGroovy + from processResources + into('lib') { + from configurations.runtime + } +} + +build.dependsOn buildZip + +task wrapper(type: Wrapper) { + gradleVersion = '3.2.1' +} diff --git a/lib/plugins/create/templates/aws-groovy-gradle/gradle/wrapper/gradle-wrapper.properties b/lib/plugins/create/templates/aws-groovy-gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..829a52ffe --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Dec 18 20:54:11 CET 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip diff --git a/lib/plugins/create/templates/aws-groovy-gradle/gradlew b/lib/plugins/create/templates/aws-groovy-gradle/gradlew new file mode 100755 index 000000000..4453ccea3 --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/lib/plugins/create/templates/aws-groovy-gradle/gradlew.bat b/lib/plugins/create/templates/aws-groovy-gradle/gradlew.bat new file mode 100755 index 000000000..f9553162f --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml new file mode 100644 index 000000000..c486b39d2 --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml @@ -0,0 +1,94 @@ +# Welcome to Serverless! +# +# This file is the main config file for your service. +# It's very minimal at this point and uses default values. +# You can always add more config options for more control. +# We've included some commented out config examples here. +# Just uncomment any of them to get that config option. +# +# For full config options, check the docs: +# docs.serverless.com +# +# Happy Coding! + +service: aws-groovy-gradle # NOTE: update this with your service name + +# You can pin your service to only deploy with a specific Serverless version +# Check out our docs for more details +# frameworkVersion: "=X.X.X" + +provider: + name: aws + runtime: java8 + +# you can overwrite defaults here +# stage: dev +# region: us-east-1 + +# you can add statements to the Lambda function's IAM Role here +# iamRoleStatements: +# - Effect: "Allow" +# Action: +# - "s3:ListBucket" +# Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ] } +# - Effect: "Allow" +# Action: +# - "s3:PutObject" +# Resource: +# Fn::Join: +# - "" +# - - "arn:aws:s3:::" +# - "Ref" : "ServerlessDeploymentBucket" +# - "/*" + +# you can define service wide environment variables here +# environment: +# variable1: value1 + +# you can add packaging information here +package: + artifact: build/distributions/hello.zip + +functions: + hello: + handler: com.serverless.Handler + +# The following are a few example events you can configure +# NOTE: Please make sure to change your handler code to work with those events +# Check the event documentation for details +# events: +# - http: +# path: users/create +# method: get +# - s3: ${env:BUCKET} +# - schedule: rate(10 minutes) +# - sns: greeter-topic +# - stream: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000 +# - alexaSkill +# - iot: +# sql: "SELECT * FROM 'some_topic'" +# - cloudwatchEvent: +# event: +# source: +# - "aws.ec2" +# detail-type: +# - "EC2 Instance State-change Notification" +# detail: +# state: +# - pending + +# Define function environment variables here +# environment: +# variable2: value2 + +# you can add CloudFormation resource templates here +#resources: +# Resources: +# NewResource: +# Type: AWS::S3::Bucket +# Properties: +# BucketName: my-new-bucket +# Outputs: +# NewOutput: +# Description: "Description for the output" +# Value: "Some output value" diff --git a/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/ApiGatewayResponse.groovy b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/ApiGatewayResponse.groovy new file mode 100644 index 000000000..bc687e20c --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/ApiGatewayResponse.groovy @@ -0,0 +1,12 @@ +package com.serverless + +import groovy.transform.CompileStatic +import groovy.transform.builder.Builder + +@Builder +@CompileStatic +class ApiGatewayResponse { + int statusCode + Response body + Map headers +} diff --git a/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Handler.groovy b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Handler.groovy new file mode 100644 index 000000000..489d38ab6 --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Handler.groovy @@ -0,0 +1,26 @@ +package com.serverless + +import com.amazonaws.services.lambda.runtime.Context +import com.amazonaws.services.lambda.runtime.RequestHandler +import groovy.transform.CompileStatic +import org.apache.log4j.Logger + +@CompileStatic +class Handler implements RequestHandler, ApiGatewayResponse> { + + private static final Logger LOG = Logger.getLogger(Handler.class) + + @Override + ApiGatewayResponse handleRequest(Map input, Context context) { + LOG.info("received: " + input) + Response responseBody = Response.builder() + .message('Go Serverless v1.x! Your function executed successfully!') + .input(input) + .build() + return ApiGatewayResponse.builder() + .statusCode(200) + .body(responseBody) + .headers(['X-Powered-By': 'AWS Lambda & serverless']) + .build() + } +} diff --git a/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Response.groovy b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Response.groovy new file mode 100644 index 000000000..eda612e2f --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/src/main/groovy/com/serverless/Response.groovy @@ -0,0 +1,11 @@ +package com.serverless + +import groovy.transform.CompileStatic +import groovy.transform.builder.Builder + +@Builder +@CompileStatic +class Response { + Object message + Map input +} diff --git a/lib/plugins/create/templates/aws-groovy-gradle/src/main/resources/log4j.properties b/lib/plugins/create/templates/aws-groovy-gradle/src/main/resources/log4j.properties new file mode 100644 index 000000000..63904cf8d --- /dev/null +++ b/lib/plugins/create/templates/aws-groovy-gradle/src/main/resources/log4j.properties @@ -0,0 +1,6 @@ +log = . +log4j.rootLogger = DEBUG, LAMBDA + +log4j.appender.LAMBDA=com.amazonaws.services.lambda.runtime.log4j.LambdaAppender +log4j.appender.LAMBDA.layout=org.apache.log4j.PatternLayout +log4j.appender.LAMBDA.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} <%X{AWSRequestId}> %-5p %c:%L - %m%n diff --git a/tests/templates/test_all_templates b/tests/templates/test_all_templates index d1a1f2d93..8a4d34d0f 100755 --- a/tests/templates/test_all_templates +++ b/tests/templates/test_all_templates @@ -9,6 +9,7 @@ function integration-test { } integration-test aws-csharp 'apt-get -qq update && apt-get -qq -y install zip && dotnet restore && dotnet publish -c release && pushd bin/release/netcoreapp1.0/publish && zip -r ./deploy-package.zip ./* && popd' +integration-test aws-groovy-gradle ./gradlew build integration-test aws-java-gradle ./gradlew build integration-test aws-java-maven mvn package integration-test aws-scala-sbt sbt assembly