diff --git a/aws-lambda-project/.github/workflows/maven.yml b/aws-lambda-project/.github/workflows/maven.yml new file mode 100644 index 00000000..9bcf32e7 --- /dev/null +++ b/aws-lambda-project/.github/workflows/maven.yml @@ -0,0 +1,43 @@ +name: CI Build + +on: + push: + branches: + - "**" + +jobs: + build: + name: Build + runs-on: ubuntu-latest + strategy: + matrix: + distribution: [ 'temurin' ] + java: [ '17' ] + steps: + - uses: actions/checkout@v3 + + - name: Setup Java 17 + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: ${{ matrix.distribution }} + cache: 'maven' + + - name: Grant execute permission for mvnw + run: chmod +x mvnw + + - name: Build with Maven + run: ./mvnw clean verify + + - if: ${{ github.ref == 'refs/heads/main' }} + name: SonarQube Scan + run: ./mvnw compile sonar:sonar -Dsonar.login=${{ secrets.SONAR_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - if: ${{ github.ref == 'refs/heads/main' }} + name: Build and Publish Docker Image + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + ./mvnw spring-boot:build-image -Dspring-boot.build-image.imageName=${{ secrets.DOCKER_USERNAME }}/aws-lambda-project + docker push ${{ secrets.DOCKER_USERNAME }}/aws-lambda-project diff --git a/aws-lambda-project/.localstack/01_init.sh b/aws-lambda-project/.localstack/01_init.sh new file mode 100644 index 00000000..828fd019 --- /dev/null +++ b/aws-lambda-project/.localstack/01_init.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +awslocal s3 mb s3://testbucket +echo "List of S3 buckets:" +echo "-------------------------------" +awslocal s3 ls + +awslocal sqs create-queue --queue-name test_queue +echo "List of SQS Queues:" +echo "-------------------------------" +awslocal sqs list-queues diff --git a/aws-lambda-project/.localstack/init-aws.sh b/aws-lambda-project/.localstack/init-aws.sh deleted file mode 100755 index a35e15fd..00000000 --- a/aws-lambda-project/.localstack/init-aws.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# Set the JAR file path -JAR_FILE="target/aws-lambda-project-0.0.1-SNAPSHOT-aws.jar" - -# Check if the JAR file exists -if [ -f "$JAR_FILE" ]; then - # Zip the JAR file - zip -j function.zip "$JAR_FILE" - - # Create Lambda function - awslocal lambda create-function \ - --function-name localstack-lambda-url-example \ - --runtime java17 \ - --zip-file fileb://function.zip \ - --handler org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest \ - --role arn:aws:iam::000000000000:role/lambda-role - - echo "created lambda function" - - awslocal lambda create-function-url-config \ - --function-name localstack-lambda-url-example \ - --auth-type NONE - - echo "created function URL" - - awslocal lambda invoke --function-name localstack-lambda-url-example \ - --cli-binary-format raw-in-base64-out \ - --payload '{"body": "{\"name\": \"profile\"}" }' output.txt - - echo "invoked lambda function" -else - echo "Error: JAR file not found at $JAR_FILE" -fi diff --git a/aws-lambda-project/.mvn/wrapper/maven-wrapper.jar b/aws-lambda-project/.mvn/wrapper/maven-wrapper.jar index cb28b0e3..bf82ff01 100644 Binary files a/aws-lambda-project/.mvn/wrapper/maven-wrapper.jar and b/aws-lambda-project/.mvn/wrapper/maven-wrapper.jar differ diff --git a/aws-lambda-project/.yo-rc.json b/aws-lambda-project/.yo-rc.json new file mode 100644 index 00000000..a7a846a0 --- /dev/null +++ b/aws-lambda-project/.yo-rc.json @@ -0,0 +1,15 @@ +{ + "generator-springboot": { + "appName": "aws-lambda-project", + "packageName": "com.learning.awslambda", + "databaseType": "postgresql", + "dbMigrationTool": "liquibase", + "dbMigrationFormat": "xml", + "features": [ + "localstack" + ], + "buildTool": "maven", + "packageFolder": "com/learning/awslambda", + "liquibaseMigrationCounter": 2 + } +} diff --git a/aws-lambda-project/Dockerfile b/aws-lambda-project/Dockerfile new file mode 100644 index 00000000..91941981 --- /dev/null +++ b/aws-lambda-project/Dockerfile @@ -0,0 +1,14 @@ +FROM eclipse-temurin:17.0.9_9-jre-focal as builder +WORKDIR application +ARG JAR_FILE=target/aws-lambda-project-0.0.1-SNAPSHOT.jar +COPY ${JAR_FILE} application.jar +RUN java -Djarmode=layertools -jar application.jar extract + +# the second stage of our build will copy the extracted layers +FROM eclipse-temurin:17.0.9_9-jre-focal +WORKDIR application +COPY --from=builder application/dependencies/ ./ +COPY --from=builder application/spring-boot-loader/ ./ +COPY --from=builder application/snapshot-dependencies/ ./ +COPY --from=builder application/application/ ./ +ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"] diff --git a/aws-lambda-project/Jenkinsfile b/aws-lambda-project/Jenkinsfile new file mode 100644 index 00000000..59788449 --- /dev/null +++ b/aws-lambda-project/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent any + + triggers { + pollSCM('* * * * *') + } + + environment { + APPLICATION_NAME = 'aws-lambda-project' + } + + stages { + stage('Build') { + steps { + sh './mvnw clean verify' + } + } + } +} diff --git a/aws-lambda-project/README.md b/aws-lambda-project/README.md index 572e3951..d528099d 100644 --- a/aws-lambda-project/README.md +++ b/aws-lambda-project/README.md @@ -1,2 +1,33 @@ -# aws-lambda - +# aws-lambda-project + +### Format code + +```shell +$ ./mvnw spotless:apply +``` + +### Run tests + +```shell +$ ./mvnw clean verify +``` + +### Run locally + +```shell +$ docker-compose -f docker/docker-compose.yml up -d +$ ./mvnw spring-boot:run -Dspring-boot.run.profiles=local +``` + +### Using Testcontainers at Development Time +You can run `TestApplication.java` from your IDE directly. +You can also run the application using Maven as follows: + +```shell +./mvnw spring-boot:test-run +``` + + +### Useful Links +* Swagger UI: http://localhost:8080/swagger-ui.html +* Actuator Endpoint: http://localhost:8080/actuator diff --git a/aws-lambda-project/docker/docker-compose-app.yml b/aws-lambda-project/docker/docker-compose-app.yml index 032679e8..a84bbffb 100644 --- a/aws-lambda-project/docker/docker-compose-app.yml +++ b/aws-lambda-project/docker/docker-compose-app.yml @@ -1,18 +1,17 @@ -version: '3.8' -services: - - aws-sqs-project: - build: .. - ports: - - "18080:8080" - - "18787:8787" - restart: always - depends_on: - - postgresqldb - - localstack - environment: - - SPRING_PROFILES_ACTIVE=docker - - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresqldb:5432/appdb - - SPRING_DATASOURCE_USERNAME=siva - - SPRING_DATASOURCE_PASSWORD=secret +version: '3.8' +services: + + aws-lambda-project: + build: .. + ports: + - "18080:8080" + - "18787:8787" + restart: always + depends_on: + - postgresqldb + environment: + - SPRING_PROFILES_ACTIVE=docker + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver + - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresqldb:5432/appdb + - SPRING_DATASOURCE_USERNAME=appuser + - SPRING_DATASOURCE_PASSWORD=secret diff --git a/aws-lambda-project/docker/docker-compose.yml b/aws-lambda-project/docker/docker-compose.yml index b392410d..774e5a26 100644 --- a/aws-lambda-project/docker/docker-compose.yml +++ b/aws-lambda-project/docker/docker-compose.yml @@ -1,25 +1,26 @@ -version: '3.8' -services: - - postgresqldb: - image: postgres:16.1-alpine - environment: - - POSTGRES_USER=appuser - - POSTGRES_PASSWORD=secret - - POSTGRES_DB=appdb - ports: - - "5432:5432" - - localstack: - image: localstack/localstack:3.0.0 - ports: - - "127.0.0.1:4566:4566" # LocalStack Gateway - - "127.0.0.1:4510-4559:4510-4559" # external services port range - environment: - - DEBUG=${DEBUG-} - - DOCKER_HOST=unix:///var/run/docker.sock - - SERVICES=lambda - volumes: - - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack" - - "/var/run/docker.sock:/var/run/docker.sock" - - "../.localstack:/etc/localstack/init/ready.d" # ready hook +version: '3.8' +services: + + postgresqldb: + image: postgres:16.0-alpine + environment: + - POSTGRES_USER=appuser + - POSTGRES_PASSWORD=secret + - POSTGRES_DB=appdb + ports: + - "5432:5432" + + localstack: + image: localstack/localstack:2.3.2 + ports: + - "4566:4566" + environment: + - SERVICES=s3,sqs + - DEFAULT_REGION=us-east-1 + - DOCKER_HOST=unix:///var/run/docker.sock + - USE_SSL=0 + - AWS_CBOR_DISABLE=1 + volumes: + - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack" + - "/var/run/docker.sock:/var/run/docker.sock" + - "../.localstack:/etc/localstack/init/ready.d" # ready hook diff --git a/aws-lambda-project/lombok.config b/aws-lambda-project/lombok.config new file mode 100644 index 00000000..7a21e880 --- /dev/null +++ b/aws-lambda-project/lombok.config @@ -0,0 +1 @@ +lombok.addLombokGeneratedAnnotation = true diff --git a/aws-lambda-project/mvnw b/aws-lambda-project/mvnw index 8d937f4c..8a8fb228 100755 --- a/aws-lambda-project/mvnw +++ b/aws-lambda-project/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 +# Maven Start Up Batch script # # Required ENV vars: # ------------------ @@ -27,6 +27,7 @@ # # Optional ENV vars # ----------------- +# M2_HOME - location of maven2's installed home dir # MAVEN_OPTS - parameters passed to the Java VM when running Maven # e.g. to debug Maven itself, use # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -53,7 +54,7 @@ fi cygwin=false; darwin=false; mingw=false -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true @@ -61,9 +62,9 @@ case "$(uname)" in # See https://developer.apple.com/library/mac/qa/qa1170/_index.html if [ -z "$JAVA_HOME" ]; then if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + export JAVA_HOME="`/usr/libexec/java_home`" else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + export JAVA_HOME="/Library/Java/Home" fi fi ;; @@ -71,38 +72,68 @@ esac if [ -z "$JAVA_HOME" ] ; then if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) + JAVA_HOME=`java-config --jre-home` fi fi +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi # For Mingw, ensure paths are in UNIX format before anything is touched if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" fi if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" + javaExecutable="`readlink -f \"$javaExecutable\"`" fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` JAVA_HOME="$javaHome" export JAVA_HOME fi @@ -118,7 +149,7 @@ if [ -z "$JAVACMD" ] ; then JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + JAVACMD="`\\unset -f command; \\command -v java`" fi fi @@ -132,9 +163,12 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { + if [ -z "$1" ] then echo "Path not specified to find_maven_basedir" @@ -150,99 +184,96 @@ find_maven_basedir() { fi # workaround for JBEAP-8937 (on Solaris 10/Sparc) if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) + wdir=`cd "$wdir/.."; pwd` fi # end of workaround done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + echo "${basedir}" } # concatenates all lines of a file concat_lines() { if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" + echo "$(tr -s '\n' ' ' < "$1")" fi } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +BASE_DIR=`find_maven_basedir "$(pwd)"` if [ -z "$BASE_DIR" ]; then exit 1; fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - ########################################################################################## # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central # This allows using the maven wrapper in projects that prohibit checking in binary data. ########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi else - log "Couldn't find $wrapperJarPath, downloading it ..." - + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` fi if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" fi elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl -o "$wrapperJarPath" "$jarUrl" -f else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f fi + else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" # For Cygwin, switch paths to Windows format before running javac if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") + javaClass=`cygpath --path --windows "$javaClass"` fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") fi fi fi @@ -251,58 +282,35 @@ fi # End of extension ########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR fi - MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` fi # Provide a "standardized" way to retrieve the CLI args that will # work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -# shellcheck disable=SC2086 # safe args exec "$JAVACMD" \ $MAVEN_OPTS \ $MAVEN_DEBUG_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/aws-lambda-project/mvnw.cmd b/aws-lambda-project/mvnw.cmd index f80fbad3..1d8ab018 100644 --- a/aws-lambda-project/mvnw.cmd +++ b/aws-lambda-project/mvnw.cmd @@ -1,205 +1,188 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/aws-lambda-project/pom.xml b/aws-lambda-project/pom.xml index 1eafe48a..8afea218 100644 --- a/aws-lambda-project/pom.xml +++ b/aws-lambda-project/pom.xml @@ -1,53 +1,110 @@ - + 4.0.0 org.springframework.boot spring-boot-starter-parent - 3.2.0-RC2 + 3.1.5 - com.example.awsspring + com.learning.awslambda aws-lambda-project 0.0.1-SNAPSHOT - aws-lambda-project-project - Demo project for Spring Boot + aws-lambda-project + aws-lambda-project + UTF-8 + UTF-8 + 17 - 2023.0.0-RC1 - 1.0.31.RELEASE - 2.21.28 + 2022.0.4 + 3.0.3 + 2.2.0 + 2.15.0 + + ${project.build.directory}/test-results + 2.40.0 + 8.4.2 + 1.2.1 + 3.10.0.2594 + 0.8.11 + 0.80 + ${project.build.directory}/jacoco/test + ${jacoco.utReportFolder}/test.exec + ${project.build.directory}/jacoco/integrationTest + ${jacoco.itReportFolder}/integrationTest.exec + ${project.testresult.directory}/test + ${project.testresult.directory}/integrationTest org.springframework.boot - spring-boot-starter + spring-boot-starter-actuator - org.springframework.cloud - spring-cloud-function-adapter-aws + org.springframework.boot + spring-boot-starter-validation org.springframework.boot - spring-boot-starter-data-jdbc + spring-boot-starter-web - org.flywaydb - flyway-core + org.springframework.boot + spring-boot-devtools + runtime + true - software.amazon.awssdk - lambda + org.springframework.boot + spring-boot-configuration-processor + true + + + org.projectlombok + lombok + true + + + io.awspring.cloud + spring-cloud-aws-starter + + + io.awspring.cloud + spring-cloud-aws-starter-sqs + + + org.springframework.boot + spring-boot-starter-data-jpa - org.postgresql postgresql runtime + + org.liquibase + liquibase-core + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi.version} + + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + ${commons-io.version} + org.springframework.boot @@ -55,29 +112,28 @@ test - org.testcontainers - junit-jupiter + org.springframework.boot + spring-boot-testcontainers test - org.testcontainers - localstack + org.awaitility + awaitility test org.testcontainers - postgresql + junit-jupiter test - org.apache.maven.shared - maven-invoker - 3.2.0 + org.testcontainers + postgresql test - io.rest-assured - rest-assured + org.testcontainers + localstack test @@ -92,9 +148,9 @@ import - software.amazon.awssdk - bom - ${aws.java.sdk.version} + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring-cloud-aws.version} pom import @@ -104,54 +160,215 @@ - org.apache.maven.plugins - maven-deploy-plugin + org.springframework.boot + spring-boot-maven-plugin + + + + build-info + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + + + + revision + + + - true + false + false + true + + ^git.branch$ + ^git.commit.id.abbrev$ + ^git.commit.user.name$ + ^git.commit.message.full$ + - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot.experimental - spring-boot-thin-layout - ${wrapper.version} - - + org.apache.maven.plugins + maven-surefire-plugin + + alphabetical + ${junit.utReportFolder} + + **/*IT* + **/*IntTest* + **/*IntegrationTest* + + org.apache.maven.plugins - maven-shade-plugin - 3.5.1 + maven-failsafe-plugin + + ${project.build.outputDirectory} + alphabetical + ${junit.itReportFolder} + + **/*IT* + **/*IntTest* + **/*IntegrationTest* + + + + + integration-test + + integration-test + + + + verify + + verify + + + + + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version} + + + initialize + + read-project-properties + + + + sonar-project.properties + + + + + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} - false - true - aws + + + 2.38.0 + + + + + + + + compile + + check + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + ${project.build.directory}/jacoco/test/jacoco.exec + + + BUNDLE + + + COMPLEXITY + COVEREDRATIO + ${jacoco.minimum.coverage} + + + + + + **/*Application.* + **/config/** + **/models/* + **/dtos/* + **/exceptions/* + **/*Constants* + + + + + pre-unit-tests + + prepare-agent + + + + ${jacoco.utReportFile} + + + + + post-unit-test + test + + report + + + ${jacoco.utReportFile} + ${jacoco.utReportFolder} + + + + pre-integration-tests + + prepare-agent-integration + + + + ${jacoco.itReportFile} + + + + + post-integration-tests + post-integration-test + + report-integration + + + ${jacoco.itReportFile} + ${jacoco.itReportFolder} + + + + + + org.owasp + dependency-check-maven + ${dependency-check-maven.version} + + false + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar-maven-plugin.version} + + + + sonar + + + - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - diff --git a/aws-lambda-project/sonar-project.properties b/aws-lambda-project/sonar-project.properties new file mode 100644 index 00000000..922e58e6 --- /dev/null +++ b/aws-lambda-project/sonar-project.properties @@ -0,0 +1,12 @@ +sonar.sourceEncoding=UTF-8 +sonar.projectKey=sonar_projectkey +sonar.organization=sonar_org +sonar.host.url=https://sonarcloud.io + +sonar.sources=src/main/java +sonar.tests=src/test/java +sonar.exclusions=src/main/java/**/config/*.*,src/main/java/**/entities/*.*,src/main/java/**/models/*.*,src/main/java/**/exceptions/*.*,src/main/java/**/utils/*.*,src/main/java/**/*Application.* +sonar.test.inclusions=**/*Test.java,**/*IntegrationTest.java,**/*IT.java +sonar.java.codeCoveragePlugin=jacoco +sonar.coverage.jacoco.xmlReportPaths=target/jacoco/test/jacoco.xml,target/jacoco/integrationTest/jacoco.xml +sonar.junit.reportPaths=target/test-results/test,target/test-results/integrationTest diff --git a/aws-lambda-project/src/main/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplication.java b/aws-lambda-project/src/main/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplication.java deleted file mode 100644 index 561c6b0c..00000000 --- a/aws-lambda-project/src/main/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplication.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.example.springcloudfunctionaws; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.jdbc.core.JdbcTemplate; - -import java.util.function.Function; - -@SpringBootApplication -public class SpringCloudFunctionAwsApplication { - - public static void main(String[] args) { - SpringApplication.run(SpringCloudFunctionAwsApplication.class, args); - } - - @Bean - Function fetchByName(JdbcTemplate jdbcTemplate) { - return profile -> jdbcTemplate.queryForObject("SELECT COUNT(*) FROM profile WHERE name LIKE ?", Integer.class, - profile.name() + "%"); - } - - public record Profile(String name) { - - } - -} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/Application.java b/aws-lambda-project/src/main/java/com/learning/awslambda/Application.java new file mode 100644 index 00000000..bf5e8024 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/Application.java @@ -0,0 +1,15 @@ +package com.learning.awslambda; + +import com.learning.awslambda.config.ApplicationProperties; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; + +@SpringBootApplication +@EnableConfigurationProperties({ApplicationProperties.class}) +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/ApplicationProperties.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/ApplicationProperties.java new file mode 100644 index 00000000..7b3ff461 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/ApplicationProperties.java @@ -0,0 +1,22 @@ +package com.learning.awslambda.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +@Data +@ConfigurationProperties("application") +public class ApplicationProperties { + + @NestedConfigurationProperty + private Cors cors = new Cors(); + + @Data + public static class Cors { + private String pathPattern = "/api/**"; + private String allowedMethods = "*"; + private String allowedHeaders = "*"; + private String allowedOriginPatterns = "*"; + private boolean allowCredentials = true; + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/GlobalExceptionHandler.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/GlobalExceptionHandler.java new file mode 100644 index 00000000..9b1ad7d7 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/GlobalExceptionHandler.java @@ -0,0 +1,61 @@ +package com.learning.awslambda.config; + +import com.learning.awslambda.exception.ResourceNotFoundException; +import java.net.URI; +import java.time.Instant; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ProblemDetail; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ControllerAdvice +@Order(Ordered.HIGHEST_PRECEDENCE) +public class GlobalExceptionHandler { + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + ProblemDetail onException(MethodArgumentNotValidException methodArgumentNotValidException) { + ProblemDetail problemDetail = + ProblemDetail.forStatusAndDetail(HttpStatusCode.valueOf(400), "Invalid request content."); + problemDetail.setTitle("Constraint Violation"); + List validationErrorsList = methodArgumentNotValidException.getAllErrors().stream() + .map(objectError -> { + FieldError fieldError = (FieldError) objectError; + return new ApiValidationError( + fieldError.getObjectName(), + fieldError.getField(), + fieldError.getRejectedValue(), + Objects.requireNonNull(fieldError.getDefaultMessage(), "")); + }) + .sorted(Comparator.comparing(ApiValidationError::field)) + .toList(); + problemDetail.setProperty("violations", validationErrorsList); + return problemDetail; + } + + @ExceptionHandler(Exception.class) + ProblemDetail onException(Exception exception) { + if (exception instanceof ResourceNotFoundException resourceNotFoundException) { + ProblemDetail problemDetail = ProblemDetail.forStatusAndDetail( + resourceNotFoundException.getHttpStatus(), resourceNotFoundException.getMessage()); + problemDetail.setTitle("Not Found"); + problemDetail.setType(URI.create("http://api.aws-lambda-project.com/errors/not-found")); + problemDetail.setProperty("errorCategory", "Generic"); + problemDetail.setProperty("timestamp", Instant.now()); + return problemDetail; + } else { + return ProblemDetail.forStatusAndDetail(HttpStatusCode.valueOf(500), exception.getMessage()); + } + } + + record ApiValidationError(String object, String field, Object rejectedValue, String message) {} +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/Initializer.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/Initializer.java new file mode 100644 index 00000000..812d5120 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/Initializer.java @@ -0,0 +1,19 @@ +package com.learning.awslambda.config; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Slf4j +public class Initializer implements CommandLineRunner { + + private final ApplicationProperties properties; + + @Override + public void run(String... args) { + log.info("Running Initializer....."); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/SwaggerConfig.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/SwaggerConfig.java new file mode 100644 index 00000000..611e5c85 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/SwaggerConfig.java @@ -0,0 +1,10 @@ +package com.learning.awslambda.config; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.info.Info; +import io.swagger.v3.oas.annotations.servers.Server; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@OpenAPIDefinition(info = @Info(title = "aws-lambda-project", version = "v1"), servers = @Server(url = "/")) +public class SwaggerConfig {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/WebMvcConfig.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/WebMvcConfig.java new file mode 100644 index 00000000..1f7dbdb7 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/WebMvcConfig.java @@ -0,0 +1,21 @@ +package com.learning.awslambda.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@RequiredArgsConstructor +public class WebMvcConfig implements WebMvcConfigurer { + private final ApplicationProperties properties; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping(properties.getCors().getPathPattern()) + .allowedMethods(properties.getCors().getAllowedMethods()) + .allowedHeaders(properties.getCors().getAllowedHeaders()) + .allowedOriginPatterns(properties.getCors().getAllowedOriginPatterns()) + .allowCredentials(properties.getCors().isAllowCredentials()); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/Loggable.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/Loggable.java new file mode 100644 index 00000000..59c1eaec --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/Loggable.java @@ -0,0 +1,14 @@ +package com.learning.awslambda.config.logging; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@Inherited +public @interface Loggable {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/LoggingAspect.java b/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/LoggingAspect.java new file mode 100644 index 00000000..fd4d413d --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/config/logging/LoggingAspect.java @@ -0,0 +1,81 @@ +package com.learning.awslambda.config.logging; + +import com.learning.awslambda.utils.AppConstants; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; +import org.springframework.stereotype.Component; + +@Aspect +@Component +public class LoggingAspect { + + private final Logger log = LoggerFactory.getLogger(this.getClass()); + + private final Environment env; + + public LoggingAspect(Environment env) { + this.env = env; + } + + @Pointcut("within(@org.springframework.stereotype.Repository *)" + + " || within(@org.springframework.stereotype.Service *)" + + " || within(@org.springframework.web.bind.annotation.RestController *)") + public void springBeanPointcut() { + // pointcut definition + } + + @Pointcut("@within(com.learning.awslambda.config.logging.Loggable) || " + + "@annotation(com.learning.awslambda.config.logging.Loggable)") + public void applicationPackagePointcut() { + // pointcut definition + } + + @AfterThrowing(pointcut = "applicationPackagePointcut()", throwing = "e") + public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { + if (env.acceptsProfiles(Profiles.of(AppConstants.PROFILE_NOT_PROD))) { + log.error( + "Exception in {}.{}() with cause = '{}' and exception = '{}'", + joinPoint.getSignature().getDeclaringTypeName(), + joinPoint.getSignature().getName(), + e.getCause() == null ? "NULL" : e.getCause(), + e.getMessage(), + e); + + } else { + log.error( + "Exception in {}.{}() with cause = {}", + joinPoint.getSignature().getDeclaringTypeName(), + joinPoint.getSignature().getName(), + e.getCause() == null ? "NULL" : e.getCause()); + } + } + + @Around("applicationPackagePointcut()") + public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable { + if (log.isTraceEnabled()) { + log.trace( + "Enter: {}.{}()", + joinPoint.getSignature().getDeclaringTypeName(), + joinPoint.getSignature().getName()); + } + long start = System.currentTimeMillis(); + Object result = joinPoint.proceed(); + long end = System.currentTimeMillis(); + if (log.isTraceEnabled()) { + log.trace( + "Exit: {}.{}(). Time taken: {} millis", + joinPoint.getSignature().getDeclaringTypeName(), + joinPoint.getSignature().getName(), + end - start); + } + return result; + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/entities/Actor.java b/aws-lambda-project/src/main/java/com/learning/awslambda/entities/Actor.java new file mode 100644 index 00000000..49075036 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/entities/Actor.java @@ -0,0 +1,43 @@ +package com.learning.awslambda.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.util.Objects; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.Hibernate; + +@Entity +@Table(name = "actors") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class Actor { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(nullable = false) + private String text; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; + Actor actor = (Actor) o; + return id != null && Objects.equals(id, actor.id); + } + + @Override + public int hashCode() { + return getClass().hashCode(); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ActorNotFoundException.java b/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ActorNotFoundException.java new file mode 100644 index 00000000..7ae33a9c --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ActorNotFoundException.java @@ -0,0 +1,8 @@ +package com.learning.awslambda.exception; + +public class ActorNotFoundException extends ResourceNotFoundException { + + public ActorNotFoundException(Long id) { + super("Actor with Id '%d' not found".formatted(id)); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ResourceNotFoundException.java b/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ResourceNotFoundException.java new file mode 100644 index 00000000..43c5a081 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/exception/ResourceNotFoundException.java @@ -0,0 +1,17 @@ +package com.learning.awslambda.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; + +public class ResourceNotFoundException extends RuntimeException { + + private static final HttpStatus httpStatus = HttpStatus.NOT_FOUND; + + public ResourceNotFoundException(String errorMessage) { + super(errorMessage); + } + + public HttpStatusCode getHttpStatus() { + return httpStatus; + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/mapper/ActorMapper.java b/aws-lambda-project/src/main/java/com/learning/awslambda/mapper/ActorMapper.java new file mode 100644 index 00000000..56387f42 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/mapper/ActorMapper.java @@ -0,0 +1,29 @@ +package com.learning.awslambda.mapper; + +import com.learning.awslambda.entities.Actor; +import com.learning.awslambda.model.request.ActorRequest; +import com.learning.awslambda.model.response.ActorResponse; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ActorMapper { + + public Actor toEntity(ActorRequest actorRequest) { + Actor actor = new Actor(); + actor.setText(actorRequest.text()); + return actor; + } + + public void mapActorWithRequest(Actor actor, ActorRequest actorRequest) { + actor.setText(actorRequest.text()); + } + + public ActorResponse toResponse(Actor actor) { + return new ActorResponse(actor.getId(), actor.getText()); + } + + public List toResponseList(List actorList) { + return actorList.stream().map(this::toResponse).toList(); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/model/query/FindActorsQuery.java b/aws-lambda-project/src/main/java/com/learning/awslambda/model/query/FindActorsQuery.java new file mode 100644 index 00000000..dd8df797 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/model/query/FindActorsQuery.java @@ -0,0 +1,3 @@ +package com.learning.awslambda.model.query; + +public record FindActorsQuery(int pageNo, int pageSize, String sortBy, String sortDir) {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/model/request/ActorRequest.java b/aws-lambda-project/src/main/java/com/learning/awslambda/model/request/ActorRequest.java new file mode 100644 index 00000000..1910afc0 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/model/request/ActorRequest.java @@ -0,0 +1,5 @@ +package com.learning.awslambda.model.request; + +import jakarta.validation.constraints.NotEmpty; + +public record ActorRequest(@NotEmpty(message = "Text cannot be empty") String text) {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/ActorResponse.java b/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/ActorResponse.java new file mode 100644 index 00000000..31771b8e --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/ActorResponse.java @@ -0,0 +1,3 @@ +package com.learning.awslambda.model.response; + +public record ActorResponse(Long id, String text) {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/PagedResult.java b/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/PagedResult.java new file mode 100644 index 00000000..37f5c942 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/model/response/PagedResult.java @@ -0,0 +1,27 @@ +package com.learning.awslambda.model.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import org.springframework.data.domain.Page; + +public record PagedResult( + List data, + long totalElements, + int pageNumber, + int totalPages, + @JsonProperty("isFirst") boolean isFirst, + @JsonProperty("isLast") boolean isLast, + @JsonProperty("hasNext") boolean hasNext, + @JsonProperty("hasPrevious") boolean hasPrevious) { + public PagedResult(Page page, List data) { + this( + data, + page.getTotalElements(), + page.getNumber() + 1, + page.getTotalPages(), + page.isFirst(), + page.isLast(), + page.hasNext(), + page.hasPrevious()); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/repositories/ActorRepository.java b/aws-lambda-project/src/main/java/com/learning/awslambda/repositories/ActorRepository.java new file mode 100644 index 00000000..578714a3 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/repositories/ActorRepository.java @@ -0,0 +1,6 @@ +package com.learning.awslambda.repositories; + +import com.learning.awslambda.entities.Actor; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ActorRepository extends JpaRepository {} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/services/ActorService.java b/aws-lambda-project/src/main/java/com/learning/awslambda/services/ActorService.java new file mode 100644 index 00000000..577ec9f2 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/services/ActorService.java @@ -0,0 +1,78 @@ +package com.learning.awslambda.services; + +import com.learning.awslambda.entities.Actor; +import com.learning.awslambda.exception.ActorNotFoundException; +import com.learning.awslambda.mapper.ActorMapper; +import com.learning.awslambda.model.query.FindActorsQuery; +import com.learning.awslambda.model.request.ActorRequest; +import com.learning.awslambda.model.response.ActorResponse; +import com.learning.awslambda.model.response.PagedResult; +import com.learning.awslambda.repositories.ActorRepository; +import java.util.List; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(readOnly = true) +@RequiredArgsConstructor +public class ActorService { + + private final ActorRepository actorRepository; + private final ActorMapper actorMapper; + + public PagedResult findAllActors(FindActorsQuery findActorsQuery) { + + // create Pageable instance + Pageable pageable = createPageable(findActorsQuery); + + Page actorsPage = actorRepository.findAll(pageable); + + List actorResponseList = actorMapper.toResponseList(actorsPage.getContent()); + + return new PagedResult<>(actorsPage, actorResponseList); + } + + private Pageable createPageable(FindActorsQuery findActorsQuery) { + int pageNo = Math.max(findActorsQuery.pageNo() - 1, 0); + Sort sort = Sort.by( + findActorsQuery.sortDir().equalsIgnoreCase(Sort.Direction.ASC.name()) + ? Sort.Order.asc(findActorsQuery.sortBy()) + : Sort.Order.desc(findActorsQuery.sortBy())); + return PageRequest.of(pageNo, findActorsQuery.pageSize(), sort); + } + + public Optional findActorById(Long id) { + return actorRepository.findById(id).map(actorMapper::toResponse); + } + + @Transactional + public ActorResponse saveActor(ActorRequest actorRequest) { + Actor actor = actorMapper.toEntity(actorRequest); + Actor savedActor = actorRepository.save(actor); + return actorMapper.toResponse(savedActor); + } + + @Transactional + public ActorResponse updateActor(Long id, ActorRequest actorRequest) { + Actor actor = actorRepository.findById(id).orElseThrow(() -> new ActorNotFoundException(id)); + + // Update the actor object with data from actorRequest + actorMapper.mapActorWithRequest(actor, actorRequest); + + // Save the updated actor object + Actor updatedActor = actorRepository.save(actor); + + return actorMapper.toResponse(updatedActor); + } + + @Transactional + public void deleteActorById(Long id) { + actorRepository.deleteById(id); + } +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/utils/AppConstants.java b/aws-lambda-project/src/main/java/com/learning/awslambda/utils/AppConstants.java new file mode 100644 index 00000000..a45d6971 --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/utils/AppConstants.java @@ -0,0 +1,12 @@ +package com.learning.awslambda.utils; + +public final class AppConstants { + public static final String PROFILE_PROD = "prod"; + public static final String PROFILE_NOT_PROD = "!" + PROFILE_PROD; + public static final String PROFILE_TEST = "test"; + public static final String PROFILE_NOT_TEST = "!" + PROFILE_TEST; + public static final String DEFAULT_PAGE_NUMBER = "0"; + public static final String DEFAULT_PAGE_SIZE = "10"; + public static final String DEFAULT_SORT_BY = "id"; + public static final String DEFAULT_SORT_DIRECTION = "asc"; +} diff --git a/aws-lambda-project/src/main/java/com/learning/awslambda/web/controllers/ActorController.java b/aws-lambda-project/src/main/java/com/learning/awslambda/web/controllers/ActorController.java new file mode 100644 index 00000000..0123671d --- /dev/null +++ b/aws-lambda-project/src/main/java/com/learning/awslambda/web/controllers/ActorController.java @@ -0,0 +1,80 @@ +package com.learning.awslambda.web.controllers; + +import com.learning.awslambda.exception.ActorNotFoundException; +import com.learning.awslambda.model.query.FindActorsQuery; +import com.learning.awslambda.model.request.ActorRequest; +import com.learning.awslambda.model.response.ActorResponse; +import com.learning.awslambda.model.response.PagedResult; +import com.learning.awslambda.services.ActorService; +import com.learning.awslambda.utils.AppConstants; +import jakarta.validation.Valid; +import java.net.URI; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +@RestController +@RequestMapping("/api/actors") +@Slf4j +@RequiredArgsConstructor +public class ActorController { + + private final ActorService actorService; + + @GetMapping + public PagedResult getAllActors( + @RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) + int pageNo, + @RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) + int pageSize, + @RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) + String sortBy, + @RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) + String sortDir) { + FindActorsQuery findActorsQuery = new FindActorsQuery(pageNo, pageSize, sortBy, sortDir); + return actorService.findAllActors(findActorsQuery); + } + + @GetMapping("/{id}") + public ResponseEntity getActorById(@PathVariable Long id) { + return actorService.findActorById(id).map(ResponseEntity::ok).orElseThrow(() -> new ActorNotFoundException(id)); + } + + @PostMapping + public ResponseEntity createActor(@RequestBody @Validated ActorRequest actorRequest) { + ActorResponse response = actorService.saveActor(actorRequest); + URI location = ServletUriComponentsBuilder.fromCurrentRequest() + .path("/api/actors/{id}") + .buildAndExpand(response.id()) + .toUri(); + return ResponseEntity.created(location).body(response); + } + + @PutMapping("/{id}") + public ResponseEntity updateActor( + @PathVariable Long id, @RequestBody @Valid ActorRequest actorRequest) { + return ResponseEntity.ok(actorService.updateActor(id, actorRequest)); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteActor(@PathVariable Long id) { + return actorService + .findActorById(id) + .map(actor -> { + actorService.deleteActorById(id); + return ResponseEntity.ok(actor); + }) + .orElseThrow(() -> new ActorNotFoundException(id)); + } +} diff --git a/aws-lambda-project/src/main/resources/application-local.properties b/aws-lambda-project/src/main/resources/application-local.properties index 83f68353..78778588 100644 --- a/aws-lambda-project/src/main/resources/application-local.properties +++ b/aws-lambda-project/src/main/resources/application-local.properties @@ -1,8 +1,11 @@ -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://localhost:5432/appdb -spring.datasource.username=appuser -spring.datasource.password=secret - -spring.cloud.aws.credentials.access-key=noop -spring.cloud.aws.credentials.secret-key=noop -spring.cloud.aws.region.static=us-east-1 \ No newline at end of file +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://localhost:5432/appdb +spring.datasource.username=appuser +spring.datasource.password=secret + +###AWS +spring.cloud.aws.endpoint=http://localhost:4566 + +spring.cloud.aws.credentials.access-key=noop +spring.cloud.aws.credentials.secret-key=noop +spring.cloud.aws.region.static=us-east-1 diff --git a/aws-lambda-project/src/main/resources/application.properties b/aws-lambda-project/src/main/resources/application.properties index 8f630fac..4fa85bf6 100644 --- a/aws-lambda-project/src/main/resources/application.properties +++ b/aws-lambda-project/src/main/resources/application.properties @@ -1,24 +1,28 @@ -spring.application.name=aws-lambda-project -server.port=8080 -server.shutdown=graceful -spring.main.allow-bean-definition-overriding=true -spring.jmx.enabled=false - -################ Database ##################### -spring.jpa.show-sql=true -spring.jpa.open-in-view=false -spring.data.jpa.repositories.bootstrap-mode=deferred -spring.datasource.hikari.auto-commit=false -spring.jpa.hibernate.ddl-auto=validate -#spring.jpa.properties.hibernate.format_sql=true -spring.jpa.properties.hibernate.jdbc.time_zone=UTC -spring.jpa.properties.hibernate.id.new_generator_mappings=true -spring.jpa.properties.hibernate.id.optimizer.pooled.preferred=pooled-lo -spring.jpa.properties.hibernate.generate_statistics=false -spring.jpa.properties.hibernate.jdbc.batch_size=25 -spring.jpa.properties.hibernate.order_inserts=true -spring.jpa.properties.hibernate.order_updates=true -spring.jpa.properties.hibernate.query.fail_on_pagination_over_collection_fetch=true -spring.jpa.properties.hibernate.query.in_clause_parameter_padding=true -spring.jpa.properties.hibernate.connection.provider_disables_autocommit=true -spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +spring.application.name=aws-lambda-project +server.port=8080 +server.shutdown=graceful +spring.main.allow-bean-definition-overriding=true +spring.jmx.enabled=false +spring.mvc.problemdetails.enabled=true + +################ Actuator ##################### +management.endpoints.web.exposure.include=configprops,env,health,info,logfile,loggers,metrics,prometheus +management.endpoint.health.show-details=always + +################ Database ##################### +spring.jpa.show-sql=false +spring.jpa.open-in-view=false +spring.data.jpa.repositories.bootstrap-mode=deferred +spring.datasource.hikari.auto-commit=false +spring.jpa.hibernate.ddl-auto=none +#spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.jdbc.time_zone=UTC +spring.jpa.properties.hibernate.generate_statistics=false +spring.jpa.properties.hibernate.jdbc.batch_size=25 +spring.jpa.properties.hibernate.order_inserts=true +spring.jpa.properties.hibernate.order_updates=true +spring.jpa.properties.hibernate.query.fail_on_pagination_over_collection_fetch=true +spring.jpa.properties.hibernate.query.in_clause_parameter_padding=true +spring.jpa.properties.hibernate.query.plan_cache_max_size=4096 +spring.jpa.properties.hibernate.connection.provider_disables_autocommit=true +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true diff --git a/aws-lambda-project/src/main/resources/db/changelog/db.changelog-master.yaml b/aws-lambda-project/src/main/resources/db/changelog/db.changelog-master.yaml new file mode 100644 index 00000000..7e9e64aa --- /dev/null +++ b/aws-lambda-project/src/main/resources/db/changelog/db.changelog-master.yaml @@ -0,0 +1,5 @@ +databaseChangeLog: + - includeAll: + path: migration/ + errorIfMissingOrEmpty: true + relativeToChangelogFile: true \ No newline at end of file diff --git a/aws-lambda-project/src/main/resources/db/changelog/migration/01-init.xml b/aws-lambda-project/src/main/resources/db/changelog/migration/01-init.xml new file mode 100644 index 00000000..9d3b8b9b --- /dev/null +++ b/aws-lambda-project/src/main/resources/db/changelog/migration/01-init.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/aws-lambda-project/src/main/resources/db/changelog/migration/02-create_actors_table.xml b/aws-lambda-project/src/main/resources/db/changelog/migration/02-create_actors_table.xml new file mode 100644 index 00000000..565644f9 --- /dev/null +++ b/aws-lambda-project/src/main/resources/db/changelog/migration/02-create_actors_table.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + diff --git a/aws-lambda-project/src/main/resources/db/migration/V1__create_populate_table.sql b/aws-lambda-project/src/main/resources/db/migration/V1__create_populate_table.sql deleted file mode 100644 index a9976acb..00000000 --- a/aws-lambda-project/src/main/resources/db/migration/V1__create_populate_table.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE IF NOT EXISTS profile(id serial primary key, name varchar(255) not null); - -INSERT INTO profile (name) VALUES ('profile-1'); -INSERT INTO profile (name) VALUES ('profile-2'); -INSERT INTO profile (name) VALUES ('profile-3'); -INSERT INTO profile (name) VALUES ('profile-4'); \ No newline at end of file diff --git a/aws-lambda-project/src/main/resources/logback-spring.xml b/aws-lambda-project/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..6250ea71 --- /dev/null +++ b/aws-lambda-project/src/main/resources/logback-spring.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aws-lambda-project/src/test/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplicationTests.java b/aws-lambda-project/src/test/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplicationTests.java deleted file mode 100644 index 8e8c846d..00000000 --- a/aws-lambda-project/src/test/java/com/example/springcloudfunctionaws/SpringCloudFunctionAwsApplicationTests.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.example.springcloudfunctionaws; - -import io.restassured.RestAssured; -import org.apache.commons.io.FileUtils; -import org.apache.maven.shared.invoker.DefaultInvocationRequest; -import org.apache.maven.shared.invoker.DefaultInvoker; -import org.apache.maven.shared.invoker.MavenInvocationException; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.StringUtils; -import org.testcontainers.DockerClientFactory; -import org.testcontainers.containers.Network; -import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.localstack.LocalStackContainer; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.utility.DockerImageName; -import org.testcontainers.utility.ResourceReaper; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.core.SdkBytes; -import software.amazon.awssdk.core.waiters.WaiterResponse; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.lambda.LambdaClient; -import software.amazon.awssdk.services.lambda.model.CreateFunctionRequest; -import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse; -import software.amazon.awssdk.services.lambda.model.CreateFunctionUrlConfigRequest; -import software.amazon.awssdk.services.lambda.model.CreateFunctionUrlConfigResponse; -import software.amazon.awssdk.services.lambda.model.Environment; -import software.amazon.awssdk.services.lambda.model.FunctionCode; -import software.amazon.awssdk.services.lambda.model.FunctionUrlAuthType; -import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationRequest; -import software.amazon.awssdk.services.lambda.model.GetFunctionConfigurationResponse; -import software.amazon.awssdk.services.lambda.model.PackageType; -import software.amazon.awssdk.services.lambda.model.Runtime; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.assertj.core.api.Assertions.assertThat; - -@Testcontainers(parallel = true) -class SpringCloudFunctionAwsApplicationTests { - - private static final Logger LOGGER = LoggerFactory.getLogger(SpringCloudFunctionAwsApplicationTests.class); - static String jar = buildJar(); - - static Network network = Network.newNetwork(); - - @Container - static PostgreSQLContainer postgres = new PostgreSQLContainer<>("postgres:16.1-alpine").withNetwork(network) - .withNetworkAliases("postgres"); - - @Container - static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.0.0")) - .withNetwork(network) - .withEnv("LOCALSTACK_HOST", "localhost.localstack.cloud") - .withEnv("LAMBDA_DOCKER_NETWORK", ((Network.NetworkImpl) network).getName()) - .withNetworkAliases("localstack") - .withEnv("LAMBDA_DOCKER_FLAGS", testContainersLabels()); - - static String testContainersLabels() { - return Stream - .of(DockerClientFactory.DEFAULT_LABELS.entrySet().stream(), - ResourceReaper.instance().getLabels().entrySet().stream()) - .flatMap(Function.identity()) - .map(entry -> String.format("-l %s=%s", entry.getKey(), entry.getValue())) - .collect(Collectors.joining(" ")); - } - - static String buildJar() { - try { - var properties = new Properties(); - properties.setProperty("skipTests", "true"); - - var defaultInvocationRequest = new DefaultInvocationRequest(); - if (StringUtils.hasText(System.getenv("MAVEN_HOME"))) { - defaultInvocationRequest.setMavenHome(new File(System.getenv("MAVEN_HOME"))); - } - defaultInvocationRequest.setJavaHome(new File(System.getenv("JAVA_HOME"))); - defaultInvocationRequest.setPomFile(Paths.get("pom.xml").toFile()); - defaultInvocationRequest.setGoals(List.of("package")); - defaultInvocationRequest.setProperties(properties); - var appInvoker = new DefaultInvoker(); - appInvoker.execute(defaultInvocationRequest); - } catch (MavenInvocationException e) { - throw new RuntimeException("Could not build jar", e); - } - return "target/aws-lambda-project-0.0.1-SNAPSHOT-aws.jar"; - } - - @Test - void contextLoads() throws IOException { - Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER); - localstack.followOutput(logConsumer); - - String fnName = "fetchByName-fn"; - var envVars = Map.ofEntries(Map.entry("SPRING_DATASOURCE_URL", "jdbc:postgresql://postgres:5432/test"), - Map.entry("SPRING_DATASOURCE_USERNAME", postgres.getUsername()), Map.entry("SPRING_DATASOURCE_PASSWORD", postgres.getPassword())); - CreateFunctionRequest createFunctionRequest = CreateFunctionRequest.builder() - .functionName(fnName) - .runtime(Runtime.JAVA17) - .role("arn:aws:iam::123456789012:role/irrelevant") - .packageType(PackageType.ZIP) - .code(FunctionCode.builder() - .zipFile(SdkBytes.fromByteArray(FileUtils.readFileToByteArray(new File(jar)))) - .build()) - .timeout(10) - .handler("org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest") - .environment(Environment.builder().variables(envVars).build()) - .build(); - - LambdaClient lambdaClient = LambdaClient.builder() - .region(Region.of(localstack.getRegion())) - .credentialsProvider(StaticCredentialsProvider - .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey()))) - .endpointOverride(localstack.getEndpoint()) - .build(); - - CreateFunctionResponse createFunctionResponse = lambdaClient.createFunction(createFunctionRequest); - LOGGER.info("createFunctionResponse :{}", createFunctionResponse); - WaiterResponse waiterResponse = lambdaClient.waiter() - .waitUntilFunctionActive(GetFunctionConfigurationRequest.builder().functionName(fnName).build()); - LOGGER.info("waiterResponse :{}", waiterResponse); - - CreateFunctionUrlConfigRequest createFunctionUrlConfigRequest = CreateFunctionUrlConfigRequest.builder() - .functionName(fnName) - .authType(FunctionUrlAuthType.NONE) - .build(); - CreateFunctionUrlConfigResponse createFunctionUrlConfigResponse = lambdaClient.createFunctionUrlConfig(createFunctionUrlConfigRequest); - - String functionUrl = createFunctionUrlConfigResponse.functionUrl() - .replace("" + 4566, "" + localstack.getMappedPort(4566)); - LOGGER.info("functionURL :{}", functionUrl); - var responseBody = RestAssured.given().body(""" - {"name": "profile"} - """).get(functionUrl).prettyPeek().andReturn().body(); - assertThat(responseBody.asString()).isEqualTo("4"); - responseBody = RestAssured.given().body(""" - {"name": "junit"} - """).get(functionUrl).prettyPeek().andReturn().body(); - assertThat(responseBody.asString()).isEqualTo("0"); - } - -} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/ApplicationIntegrationTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/ApplicationIntegrationTest.java new file mode 100644 index 00000000..2746b6ea --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/ApplicationIntegrationTest.java @@ -0,0 +1,10 @@ +package com.learning.awslambda; + +import com.learning.awslambda.common.AbstractIntegrationTest; +import org.junit.jupiter.api.Test; + +class ApplicationIntegrationTest extends AbstractIntegrationTest { + + @Test + void contextLoads() {} +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/SchemaValidationTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/SchemaValidationTest.java new file mode 100644 index 00000000..762f5098 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/SchemaValidationTest.java @@ -0,0 +1,16 @@ +package com.learning.awslambda; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +@DataJpaTest( + properties = { + "spring.jpa.hibernate.ddl-auto=validate", + "spring.test.database.replace=none", + "spring.datasource.url=jdbc:tc:postgresql:16.0-alpine:///db" + }) +class SchemaValidationTest { + + @Test + void validateJpaMappingsWithDbSchema() {} +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/SqsListenerIntegrationTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/SqsListenerIntegrationTest.java new file mode 100644 index 00000000..096f5065 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/SqsListenerIntegrationTest.java @@ -0,0 +1,60 @@ +package com.learning.awslambda; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.learning.awslambda.common.AbstractIntegrationTest; +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import lombok.extern.slf4j.Slf4j; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import software.amazon.awssdk.services.sqs.SqsAsyncClient; +import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; +import software.amazon.awssdk.services.sqs.model.CreateQueueResponse; +import software.amazon.awssdk.services.sqs.model.Message; +import software.amazon.awssdk.services.sqs.model.QueueAttributeName; +import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse; + +@Slf4j +class SqsListenerIntegrationTest extends AbstractIntegrationTest { + + @Autowired + private SqsAsyncClient sqsAsyncClient; + + @Test + void shouldSendAndReceiveSqsMessage() throws ExecutionException, InterruptedException { + String queueName = "test_queue"; + String queueURL = this.createQueue(queueName) + .thenApply(CreateQueueResponse::queueUrl) + .get(); + + this.sqsAsyncClient + .sendMessage(request -> request.messageBody("test message").queueUrl(queueURL)) + .thenRun(() -> log.info("Message sent successfully to the Amazon sqs.")); + + Awaitility.given() + .atMost(Duration.ofSeconds(30)) + .pollInterval(Duration.ofSeconds(3)) + .await() + .untilAsserted(() -> { + List messages = sqsAsyncClient + .receiveMessage(builder -> builder.queueUrl(queueURL)) + .thenApply(ReceiveMessageResponse::messages) + .get(); + assertThat(messages).isNotEmpty(); + }); + } + + private CompletableFuture createQueue(String queueName) { + CreateQueueRequest createQueueRequest = CreateQueueRequest.builder() + .queueName(queueName) + .attributes(Map.of(QueueAttributeName.MESSAGE_RETENTION_PERIOD, "86400")) + .build(); + + return sqsAsyncClient.createQueue(createQueueRequest); + } +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/TestApplication.java b/aws-lambda-project/src/test/java/com/learning/awslambda/TestApplication.java new file mode 100644 index 00000000..576466c2 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/TestApplication.java @@ -0,0 +1,12 @@ +package com.learning.awslambda; + +import com.learning.awslambda.common.ContainersConfig; +import org.springframework.boot.SpringApplication; + +public class TestApplication { + + public static void main(String[] args) { + System.setProperty("spring.profiles.active", "local"); + SpringApplication.from(Application::main).with(ContainersConfig.class).run(args); + } +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/common/AbstractIntegrationTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/common/AbstractIntegrationTest.java new file mode 100644 index 00000000..0a7e80b7 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/common/AbstractIntegrationTest.java @@ -0,0 +1,25 @@ +package com.learning.awslambda.common; + +import static com.learning.awslambda.utils.AppConstants.PROFILE_TEST; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; + +@ActiveProfiles({PROFILE_TEST}) +@SpringBootTest( + webEnvironment = RANDOM_PORT, + classes = {ContainersConfig.class}) +@AutoConfigureMockMvc +public abstract class AbstractIntegrationTest { + + @Autowired + protected MockMvc mockMvc; + + @Autowired + protected ObjectMapper objectMapper; +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/common/ContainersConfig.java b/aws-lambda-project/src/test/java/com/learning/awslambda/common/ContainersConfig.java new file mode 100644 index 00000000..71f8ffc6 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/common/ContainersConfig.java @@ -0,0 +1,30 @@ +package com.learning.awslambda.common; + +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.context.annotation.Bean; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.containers.localstack.LocalStackContainer; +import org.testcontainers.utility.DockerImageName; + +@TestConfiguration(proxyBeanMethods = false) +public class ContainersConfig { + + @Bean + @ServiceConnection + PostgreSQLContainer postgreSQLContainer() { + return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.0-alpine")); + } + + @Bean + LocalStackContainer localstackContainer(DynamicPropertyRegistry registry) { + LocalStackContainer localStackContainer = + new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.3.2")); + registry.add("spring.cloud.aws.credentials.access-key", localStackContainer::getAccessKey); + registry.add("spring.cloud.aws.credentials.secret-key", localStackContainer::getSecretKey); + registry.add("spring.cloud.aws.region.static", localStackContainer::getRegion); + registry.add("spring.cloud.aws.endpoint", localStackContainer::getEndpoint); + return localStackContainer; + } +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/services/ActorServiceTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/services/ActorServiceTest.java new file mode 100644 index 00000000..7375c572 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/services/ActorServiceTest.java @@ -0,0 +1,67 @@ +package com.learning.awslambda.services; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.times; +import static org.mockito.BDDMockito.verify; +import static org.mockito.BDDMockito.willDoNothing; + +import com.learning.awslambda.entities.Actor; +import com.learning.awslambda.mapper.ActorMapper; +import com.learning.awslambda.model.response.ActorResponse; +import com.learning.awslambda.repositories.ActorRepository; +import java.util.Optional; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +class ActorServiceTest { + + @Mock + private ActorRepository actorRepository; + + @Mock + private ActorMapper actorMapper; + + @InjectMocks + private ActorService actorService; + + @Test + void findActorById() { + // given + given(actorRepository.findById(1L)).willReturn(Optional.of(getActor())); + given(actorMapper.toResponse(any(Actor.class))).willReturn(getActorResponse()); + // when + Optional optionalActor = actorService.findActorById(1L); + // then + assertThat(optionalActor).isPresent(); + ActorResponse actor = optionalActor.get(); + assertThat(actor.id()).isEqualTo(1L); + assertThat(actor.text()).isEqualTo("junitTest"); + } + + @Test + void deleteActorById() { + // given + willDoNothing().given(actorRepository).deleteById(1L); + // when + actorService.deleteActorById(1L); + // then + verify(actorRepository, times(1)).deleteById(1L); + } + + private Actor getActor() { + Actor actor = new Actor(); + actor.setId(1L); + actor.setText("junitTest"); + return actor; + } + + private ActorResponse getActorResponse() { + return new ActorResponse(1L, "junitTest"); + } +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerIT.java b/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerIT.java new file mode 100644 index 00000000..10cde700 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerIT.java @@ -0,0 +1,129 @@ +package com.learning.awslambda.web.controllers; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.Matchers.hasSize; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import com.learning.awslambda.common.AbstractIntegrationTest; +import com.learning.awslambda.entities.Actor; +import com.learning.awslambda.model.request.ActorRequest; +import com.learning.awslambda.repositories.ActorRepository; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; + +class ActorControllerIT extends AbstractIntegrationTest { + + @Autowired + private ActorRepository actorRepository; + + private List actorList = null; + + @BeforeEach + void setUp() { + actorRepository.deleteAllInBatch(); + + actorList = new ArrayList<>(); + actorList.add(new Actor(null, "First Actor")); + actorList.add(new Actor(null, "Second Actor")); + actorList.add(new Actor(null, "Third Actor")); + actorList = actorRepository.saveAll(actorList); + } + + @Test + void shouldFetchAllActors() throws Exception { + this.mockMvc + .perform(get("/api/actors")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.size()", is(actorList.size()))) + .andExpect(jsonPath("$.totalElements", is(3))) + .andExpect(jsonPath("$.pageNumber", is(1))) + .andExpect(jsonPath("$.totalPages", is(1))) + .andExpect(jsonPath("$.isFirst", is(true))) + .andExpect(jsonPath("$.isLast", is(true))) + .andExpect(jsonPath("$.hasNext", is(false))) + .andExpect(jsonPath("$.hasPrevious", is(false))); + } + + @Test + void shouldFindActorById() throws Exception { + Actor actor = actorList.get(0); + Long actorId = actor.getId(); + + this.mockMvc + .perform(get("/api/actors/{id}", actorId)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(actor.getId()), Long.class)) + .andExpect(jsonPath("$.text", is(actor.getText()))); + } + + @Test + void shouldCreateNewActor() throws Exception { + ActorRequest actorRequest = new ActorRequest("New Actor"); + this.mockMvc + .perform(post("/api/actors") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isCreated()) + .andExpect(header().exists(HttpHeaders.LOCATION)) + .andExpect(jsonPath("$.id", notNullValue())) + .andExpect(jsonPath("$.text", is(actorRequest.text()))); + } + + @Test + void shouldReturn400WhenCreateNewActorWithoutText() throws Exception { + ActorRequest actorRequest = new ActorRequest(null); + + this.mockMvc + .perform(post("/api/actors") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isBadRequest()) + .andExpect(header().string("Content-Type", is("application/problem+json"))) + .andExpect(jsonPath("$.type", is("about:blank"))) + .andExpect(jsonPath("$.title", is("Constraint Violation"))) + .andExpect(jsonPath("$.status", is(400))) + .andExpect(jsonPath("$.detail", is("Invalid request content."))) + .andExpect(jsonPath("$.instance", is("/api/actors"))) + .andExpect(jsonPath("$.violations", hasSize(1))) + .andExpect(jsonPath("$.violations[0].field", is("text"))) + .andExpect(jsonPath("$.violations[0].message", is("Text cannot be empty"))) + .andReturn(); + } + + @Test + void shouldUpdateActor() throws Exception { + Long actorId = actorList.get(0).getId(); + ActorRequest actorRequest = new ActorRequest("Updated Actor"); + + this.mockMvc + .perform(put("/api/actors/{id}", actorId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(actorId), Long.class)) + .andExpect(jsonPath("$.text", is(actorRequest.text()))); + } + + @Test + void shouldDeleteActor() throws Exception { + Actor actor = actorList.get(0); + + this.mockMvc + .perform(delete("/api/actors/{id}", actor.getId())) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(actor.getId()), Long.class)) + .andExpect(jsonPath("$.text", is(actor.getText()))); + } +} diff --git a/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerTest.java b/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerTest.java new file mode 100644 index 00000000..a9401a58 --- /dev/null +++ b/aws-lambda-project/src/test/java/com/learning/awslambda/web/controllers/ActorControllerTest.java @@ -0,0 +1,218 @@ +package com.learning.awslambda.web.controllers; + +import static com.learning.awslambda.utils.AppConstants.PROFILE_TEST; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.Matchers.hasSize; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doNothing; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.learning.awslambda.entities.Actor; +import com.learning.awslambda.exception.ActorNotFoundException; +import com.learning.awslambda.model.query.FindActorsQuery; +import com.learning.awslambda.model.request.ActorRequest; +import com.learning.awslambda.model.response.ActorResponse; +import com.learning.awslambda.model.response.PagedResult; +import com.learning.awslambda.services.ActorService; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; + +@WebMvcTest(controllers = ActorController.class) +@ActiveProfiles(PROFILE_TEST) +class ActorControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private ActorService actorService; + + @Autowired + private ObjectMapper objectMapper; + + private List actorList; + + @BeforeEach + void setUp() { + this.actorList = new ArrayList<>(); + this.actorList.add(new Actor(1L, "text 1")); + this.actorList.add(new Actor(2L, "text 2")); + this.actorList.add(new Actor(3L, "text 3")); + } + + @Test + void shouldFetchAllActors() throws Exception { + + Page page = new PageImpl<>(actorList); + PagedResult actorPagedResult = new PagedResult<>(page, getActorResponseList()); + FindActorsQuery findActorsQuery = new FindActorsQuery(0, 10, "id", "asc"); + given(actorService.findAllActors(findActorsQuery)).willReturn(actorPagedResult); + + this.mockMvc + .perform(get("/api/actors")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.size()", is(actorList.size()))) + .andExpect(jsonPath("$.totalElements", is(3))) + .andExpect(jsonPath("$.pageNumber", is(1))) + .andExpect(jsonPath("$.totalPages", is(1))) + .andExpect(jsonPath("$.isFirst", is(true))) + .andExpect(jsonPath("$.isLast", is(true))) + .andExpect(jsonPath("$.hasNext", is(false))) + .andExpect(jsonPath("$.hasPrevious", is(false))); + } + + @Test + void shouldFindActorById() throws Exception { + Long actorId = 1L; + ActorResponse actor = new ActorResponse(actorId, "text 1"); + given(actorService.findActorById(actorId)).willReturn(Optional.of(actor)); + + this.mockMvc + .perform(get("/api/actors/{id}", actorId)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.text", is(actor.text()))); + } + + @Test + void shouldReturn404WhenFetchingNonExistingActor() throws Exception { + Long actorId = 1L; + given(actorService.findActorById(actorId)).willReturn(Optional.empty()); + + this.mockMvc + .perform(get("/api/actors/{id}", actorId)) + .andExpect(status().isNotFound()) + .andExpect(header().string("Content-Type", is(MediaType.APPLICATION_PROBLEM_JSON_VALUE))) + .andExpect(jsonPath("$.type", is("http://api.aws-lambda-project.com/errors/not-found"))) + .andExpect(jsonPath("$.title", is("Not Found"))) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.detail").value("Actor with Id '%d' not found".formatted(actorId))); + } + + @Test + void shouldCreateNewActor() throws Exception { + + ActorResponse actor = new ActorResponse(1L, "some text"); + ActorRequest actorRequest = new ActorRequest("some text"); + given(actorService.saveActor(any(ActorRequest.class))).willReturn(actor); + + this.mockMvc + .perform(post("/api/actors") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isCreated()) + .andExpect(header().exists(HttpHeaders.LOCATION)) + .andExpect(jsonPath("$.id", notNullValue())) + .andExpect(jsonPath("$.text", is(actor.text()))); + } + + @Test + void shouldReturn400WhenCreateNewActorWithoutText() throws Exception { + ActorRequest actorRequest = new ActorRequest(null); + + this.mockMvc + .perform(post("/api/actors") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isBadRequest()) + .andExpect(header().string("Content-Type", is("application/problem+json"))) + .andExpect(jsonPath("$.type", is("about:blank"))) + .andExpect(jsonPath("$.title", is("Constraint Violation"))) + .andExpect(jsonPath("$.status", is(400))) + .andExpect(jsonPath("$.detail", is("Invalid request content."))) + .andExpect(jsonPath("$.instance", is("/api/actors"))) + .andExpect(jsonPath("$.violations", hasSize(1))) + .andExpect(jsonPath("$.violations[0].field", is("text"))) + .andExpect(jsonPath("$.violations[0].message", is("Text cannot be empty"))) + .andReturn(); + } + + @Test + void shouldUpdateActor() throws Exception { + Long actorId = 1L; + ActorResponse actor = new ActorResponse(actorId, "Updated text"); + ActorRequest actorRequest = new ActorRequest("Updated text"); + given(actorService.updateActor(eq(actorId), any(ActorRequest.class))).willReturn(actor); + + this.mockMvc + .perform(put("/api/actors/{id}", actorId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(actorId), Long.class)) + .andExpect(jsonPath("$.text", is(actor.text()))); + } + + @Test + void shouldReturn404WhenUpdatingNonExistingActor() throws Exception { + Long actorId = 1L; + ActorRequest actorRequest = new ActorRequest("Updated text"); + given(actorService.updateActor(eq(actorId), any(ActorRequest.class))) + .willThrow(new ActorNotFoundException(actorId)); + + this.mockMvc + .perform(put("/api/actors/{id}", actorId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(actorRequest))) + .andExpect(status().isNotFound()) + .andExpect(header().string("Content-Type", is(MediaType.APPLICATION_PROBLEM_JSON_VALUE))) + .andExpect(jsonPath("$.type", is("http://api.aws-lambda-project.com/errors/not-found"))) + .andExpect(jsonPath("$.title", is("Not Found"))) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.detail").value("Actor with Id '%d' not found".formatted(actorId))); + } + + @Test + void shouldDeleteActor() throws Exception { + Long actorId = 1L; + ActorResponse actor = new ActorResponse(actorId, "Some text"); + given(actorService.findActorById(actorId)).willReturn(Optional.of(actor)); + doNothing().when(actorService).deleteActorById(actorId); + + this.mockMvc + .perform(delete("/api/actors/{id}", actorId)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.text", is(actor.text()))); + } + + @Test + void shouldReturn404WhenDeletingNonExistingActor() throws Exception { + Long actorId = 1L; + given(actorService.findActorById(actorId)).willReturn(Optional.empty()); + + this.mockMvc + .perform(delete("/api/actors/{id}", actorId)) + .andExpect(header().string("Content-Type", is(MediaType.APPLICATION_PROBLEM_JSON_VALUE))) + .andExpect(jsonPath("$.type", is("http://api.aws-lambda-project.com/errors/not-found"))) + .andExpect(jsonPath("$.title", is("Not Found"))) + .andExpect(jsonPath("$.status", is(404))) + .andExpect(jsonPath("$.detail").value("Actor with Id '%d' not found".formatted(actorId))); + } + + List getActorResponseList() { + return actorList.stream() + .map(actor -> new ActorResponse(actor.getId(), actor.getText())) + .toList(); + } +} diff --git a/aws-lambda-project/src/test/resources/application-test.properties b/aws-lambda-project/src/test/resources/application-test.properties new file mode 100644 index 00000000..1cbc70be --- /dev/null +++ b/aws-lambda-project/src/test/resources/application-test.properties @@ -0,0 +1,5 @@ +spring.cloud.aws.endpoint=http://localhost:4566 + +spring.cloud.aws.credentials.access-key=noop +spring.cloud.aws.credentials.secret-key=noop +spring.cloud.aws.region.static=us-east-1 diff --git a/aws-lambda-project/src/test/resources/logback-test.xml b/aws-lambda-project/src/test/resources/logback-test.xml new file mode 100644 index 00000000..1378a823 --- /dev/null +++ b/aws-lambda-project/src/test/resources/logback-test.xml @@ -0,0 +1,14 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + +