update to Java 13, fixing build

Testcontainers

.gitignore

@@ -0,0 +1,3 @@
+**/.idea/
+**/*.iml
+

.idea/libraries/Gradle__org_projectlombok_lombok_1_16_20.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.projectlombok:lombok:1.16.20">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.20/ac76d9b956045631d1561a09289cbf472e077c01/lombok-1.16.20.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.20/69ebf81bb97bdb3c9581c171762bb4929cb5289c/lombok-1.16.20-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/modules/spring-boot-testing.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":spring-boot:spring-boot-testing" external.linked.project.path="$MODULE_DIR$/../../spring-boot/spring-boot-testing" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="reflectoring.io" external.system.module.version="0.0.1-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../spring-boot/spring-boot-testing">
-      <excludeFolder url="file://$MODULE_DIR$/../../spring-boot/spring-boot-testing/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../spring-boot/spring-boot-testing/build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../spring-boot/spring-boot-testing/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.travis.yml

@@ -1,5 +1,5 @@
 before_install:
- - chmod +x gradlew
+ - chmod +x build-all.sh
  - |
    if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.md)|^(LICENSE)'
    then
@@ -7,7 +7,12 @@ before_install:
      exit
    fi
 
+install: skip
+
+script:
+  - ./build-all.sh
+
 language: java
 
 jdk:
-  - oraclejdk8
+  - oraclejdk11

README.md

@@ -2,7 +2,20 @@
 
 [![Travis CI Status](https://travis-ci.org/thombergs/code-examples.svg?branch=master)](https://travis-ci.org/thombergs/code-examples)
 
-This repo contains example projects which show how to use different java technologies.
+This repo contains example projects which show how to use different (not only) Java technologies.
 The examples are usually accompanied by a blog post on [https://reflectoring.io](https://reflectoring.io).
 
-See the READMEs in each subdirectory of this repo for more information. 
+See the READMEs in each subdirectory of this repo for more information on each module.
+
+## Java Modules
+All Java modules require **Java 11** to compile and run.
+
+### Building with Gradle
+
+Each module should be an independent build and can be built by calling `./gradlew clean build` in the module directory. 
+
+All modules are listed in [build-all.sh](build-all.sh) to run in the CI pipeline.
+
+### Non-Java Modules
+
+Some folders contain non-Java projects. For those, refer to the README within the module folder.

aws/aws-hello-world/.gitignore

@@ -0,0 +1,32 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

aws/aws-hello-world/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
+EXPOSE 8080

aws/aws-hello-world/build.gradle

@@ -0,0 +1,24 @@
+plugins {
+	id 'org.springframework.boot' version '2.2.4.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'java'
+}
+
+group = 'io.reflectoring'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '1.8'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	testImplementation('org.springframework.boot:spring-boot-starter-test') {
+		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+	}
+}
+
+test {
+	useJUnitPlatform()
+}

aws/aws-hello-world/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jul 30 16:58:54 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip

aws/aws-hello-world/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

aws/aws-hello-world/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'aws-hello-world'

aws/aws-hello-world/src/main/java/io/reflectoring/awshelloworld/AwsHelloWorldApplication.java

@@ -0,0 +1,13 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AwsHelloWorldApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AwsHelloWorldApplication.class, args);
+	}
+
+}

aws/aws-hello-world/src/main/java/io/reflectoring/awshelloworld/HelloWorldController.java

@@ -0,0 +1,14 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloWorldController {
+
+  @GetMapping("/hello")
+  public String helloWorld(){
+    return "Hello AWS!";
+  }
+
+}

aws/aws-hello-world/src/main/resources/application.properties

@@ -0,0 +1 @@
+

aws/aws-hello-world/src/test/java/io/reflectoring/awshelloworld/AwsHelloWorldApplicationTests.java

@@ -0,0 +1,13 @@
+package io.reflectoring.awshelloworld;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class AwsHelloWorldApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

aws/aws-rds-hello-world/.gitignore

@@ -0,0 +1,32 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

aws/aws-rds-hello-world/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
+EXPOSE 8080

aws/aws-rds-hello-world/README.md

@@ -0,0 +1,25 @@
+# RDS Hello World Application
+
+This is a simple Spring Boot application which requires access to a PostgreSQL database.
+
+The application has a single endpoint `/hello` which prints out if the database connection was successful.
+
+Get it in a Docker image via `docker pull reflectoring/aws-rds-hello-world`.
+
+Use the image instead of your real application to test AWS CloudFormation stacks which need access to a database.
+
+## Testing AWS RDS connectivity with this application
+
+1. Create an RDS PostgreSQL database with the AWS console.
+2. Note the endpoint of your RDS database in the AWS console.
+3. Deploy the Docker container `reflectoring/aws-rds-hello-world` into AWS instead of your real application (this could be via a CloudFormation stack, manually, or however you are deploying your app).
+4. Configure your deployment in a way that Docker will pass the coordinates to your RDS database as environment variables, equivalent to this command:
+    ``` 
+    docker run \
+      -e SPRING_DATASOURCE_URL=':'<RDS-ENDPOINT>:5432/postgres \
+      -e SPRING_DATASOURCE_USERNAME=<USERNAME> \
+      -e SPRING_DATASOURCE_PASSWORD=<PASSWORD> \
+      -p 8080:8080 reflectoring/aws-rds-hello-world
+    ```
+5. If the Spring Boot application can connect to the database, it will start up sucessfully and serve a message on the endpoint `/hello`.
+

aws/aws-rds-hello-world/build.gradle

@@ -0,0 +1,31 @@
+plugins {
+	id 'org.springframework.boot' version '2.2.4.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'java'
+}
+
+group = 'io.reflectoring'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '1.8'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+
+	// database
+	implementation 'org.flywaydb:flyway-core'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
+	runtimeOnly 'org.postgresql:postgresql'
+	testRuntimeOnly 'org.postgresql:postgresql'
+
+	testImplementation('org.springframework.boot:spring-boot-starter-test') {
+		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+	}
+}
+
+test {
+	useJUnitPlatform()
+}

aws/aws-rds-hello-world/docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.7'
+
+services:
+
+  postgres:
+    container_name: "rds-hello-world"
+    image: postgres
+    volumes:
+      - rds-hello-world:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    environment:
+      - POSTGRES_USER=hello
+      - POSTGRES_PASSWORD=hello
+
+volumes:
+  rds-hello-world:
+    driver: local

aws/aws-rds-hello-world/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

aws/aws-rds-hello-world/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

aws/aws-rds-hello-world/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'aws-rds-hello-world'

aws/aws-rds-hello-world/src/main/java/io/reflectoring/awshelloworld/AwsHelloWorldApplication.java

@@ -0,0 +1,13 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AwsHelloWorldApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AwsHelloWorldApplication.class, args);
+	}
+
+}

aws/aws-rds-hello-world/src/main/java/io/reflectoring/awshelloworld/HelloWorldController.java

@@ -0,0 +1,23 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+class HelloWorldController {
+
+  private final UserRepository userRepository;
+
+  HelloWorldController(UserRepository userRepository) {
+    this.userRepository = userRepository;
+  }
+
+  @GetMapping("/hello")
+  String helloWorld(){
+
+    Iterable<User> users = userRepository.findAll();
+
+    return "Hello AWS! Successfully connected to the database!";
+  }
+
+}

aws/aws-rds-hello-world/src/main/java/io/reflectoring/awshelloworld/User.java

@@ -0,0 +1,38 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("hello_user")
+public class User {
+
+    @Id
+    private Long id;
+
+    private String name;
+
+    public User(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public User() {
+
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

aws/aws-rds-hello-world/src/main/java/io/reflectoring/awshelloworld/UserRepository.java

@@ -0,0 +1,6 @@
+package io.reflectoring.awshelloworld;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface UserRepository extends CrudRepository<User, Long> {
+}

aws/aws-rds-hello-world/src/main/resources/application.yml

@@ -0,0 +1,5 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:5432/hello
+    username: hello
+    password: hello

aws/aws-rds-hello-world/src/main/resources/db/migration/V001__create_table_user.sql

@@ -0,0 +1,5 @@
+create table hello_user (
+    id varchar(36) not null unique,
+    name varchar(100) not null,
+    primary key(id)
+);

aws/cloudformation/ecs-in-two-public-subnets/README.md

@@ -0,0 +1,8 @@
+# Overview
+
+![ECS in two public subnets](ecs-in-two-public-subnets.svg)
+
+# Companion Blog Post
+
+[The AWS Journey Part 2: Deploying a Docker image from the Command Line with CloudFormation](https://reflectoring.io/aws-cloudformation-deploy-docker-image/)
+

aws/cloudformation/ecs-in-two-public-subnets/ecs-in-two-public-subnets.drawio

@@ -0,0 +1 @@
+<mxfile modified="2020-04-30T21:28:18.347Z" host="app.diagrams.net" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36" etag="X9Eef2gSXNvxkCnmY-_0" version="13.0.4" type="device"><diagram id="Ht1M8jgEwFfnCIfOTk4-" name="Page-1">7Vpbb+o4EP41PC7K/fLIrWcr9UiVWO05+4RM4garIc4aU6C/fseJc7ND6ekB9nQXVKmZsTMez3yf7TEM7Ml6/4WhfPWVxjgdWEa8H9jTgWWZphXCP6E5lBrPcEpFwkgsOzWKOXnFUmlI7ZbEeNPpyClNOcm7yohmGY54R4cYo7tutyeadkfNUYI1xTxCqa79RmK+qublhU3D75gkKzl0YPllwxpVneVMNisU011LZc8G9oRRysun9X6CUxG8Ki7le3dHWmvHGM74e15Y4cjav97736avy2fP+Rr/vVj+Vjn3gtKtnPGfjxPpMD9UUcgpyXgRSXcMf/DSxBi40DIR0tByFYUq+12FqUvCRlehyn5XYarmTWV8U3WwpdCkjnlDGd9oOQh/9phueUoyPKkxZ4AyYSgmkIsJTSkDXUYziN54xdcpSCY87laE43mOIhHVHfAFdE804xL1plXJMvDiHUBNLp7X+0QQbIh2G2eYMLrNiyHvAfe9rYuXPBKvc0afceXSwLItJwhMRwxE0lRx9QUzTgD6o5QkwiqnYhAkpRQ/cWER/CdZ8lBIU9uQPreGGI3G/jgAfYw2KxzL8EicwRB4fxTBZs0LWFAwXWPODtClesGTaJVrSQXeXUNMO5S6VYuTjiGVSC4GSW264Qs8SMr8AH3MUKPP43aZkkjQZ7vMML9R6fNTaYOjLSP8sGg6zwteSXffRzLQz8I7e+adj2n1OOdmmm0pTLPCoR1obKsZ2Gab6ZkFSC5COPvGtxvf/vt8c4Buftj6uL8A90xfI99sMgfFHLMXAshQqddzxNBS5468SeC1Q2oezZcKMCU7talzJMTvJsTvXf9MuycHVnip04arxX9geamA7hIeEvEwynNYDREnwK2qjVWNDxTFuhZogLIIs6oFXKvNaSntXT46bKhS94CWOH2kG1L4Yk+XlHO6PsnFCBIEvnQWn56FxB6iZqaLFCa2WFbz0JaBOzdwbef4OncGvMAZs4MX0w+GgQ6Yqmps48W3LgSX4DRc7kWwi13TQ2uRhmy5yYuIqCj5gjjeocMnAwmR81sk0v1+bHgXxUa9SrSw4esL+lWxodct5VL+B9o8vy+f6tZoW3difC2OIsZ+MDPa/JsSBobKlGeUiQioeZka7gQ2nJ4d46n4XAFRp843aJOX4Xgie+FH/4GH4Q3dsgiXx50xiH0HHxxtzgO2utatwGb07lx+z8blX6xKdm5o+3+gzXL/fbRZeo2oYQzHCa6CKxBBE5qhdNZo25nBWTwSN8kivymNnoUqXRZyleYCOYjxqp/cPODNO5LWO5R29nXcsSeQCmVOFtfggtizw/e28JcQoKqT4nTfbpwe2tIjZgTiKNDVKk7EfN9OMYSnAM5bgZWbBkw0wfzUwUPHTPvgXOGG4RSOcC9d5/ogIc09imq+wV+owM9Uap9yTvKl9t24YsdU6i9bvTEs56wZKgBaT/EnMOvdMPsRzJ6Eons1KFrqUvhhLAYKFs0rY1Ev8z8ZFveEf6/GhucWEkFqgCiEQ0u44NLpvhOu5UnpKng1TfXKyfgYXq1Tho7gFXIt6sm6m7yoPeqw7fYT7JhfWv/QUehSenBe8vQV3TfyXIU84dW4Y1ff+9VfjzjDIDDqj2LwvUxyHLdr1hOn6aNmfxFemc41eKVfWLx1mfUp76isH7+dqn9T0nwtUv1KxT7TxaaS7MDvu7vyw6FUtks81zlOrCMlHojNL2JK8DS/K7Jn/wA=</diagram></mxfile>

aws/cloudformation/ecs-in-two-public-subnets/network.yml

@@ -0,0 +1,247 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: A network stack for deploying containers in AWS ECS.
+  This stack creates a VPC with two public subnets and a loadbalancer to balance traffic between those subnets.
+  Derived from a template at https://github.com/nathanpeck/aws-cloudformation-fargate.
+Resources:
+
+  VPC:
+    Type: AWS::EC2::VPC
+    Properties:
+      CidrBlock: '10.0.0.0/16'
+
+  PublicSubnetOne:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 0
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.1.0/24'
+      MapPublicIpOnLaunch: true
+
+  PublicSubnetTwo:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 1
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.2.0/24'
+      MapPublicIpOnLaunch: true
+
+  InternetGateway:
+    Type: AWS::EC2::InternetGateway
+
+  GatewayAttachement:
+    Type: AWS::EC2::VPCGatewayAttachment
+    Properties:
+      VpcId: !Ref 'VPC'
+      InternetGatewayId: !Ref 'InternetGateway'
+
+  PublicRouteTable:
+    Type: AWS::EC2::RouteTable
+    Properties:
+      VpcId: !Ref 'VPC'
+
+  PublicSubnetOneRouteTableAssociation:
+    Type: AWS::EC2::SubnetRouteTableAssociation
+    Properties:
+      SubnetId: !Ref PublicSubnetOne
+      RouteTableId: !Ref PublicRouteTable
+
+  PublicSubnetTwoRouteTableAssociation:
+    Type: AWS::EC2::SubnetRouteTableAssociation
+    Properties:
+      SubnetId: !Ref PublicSubnetTwo
+      RouteTableId: !Ref PublicRouteTable
+
+  PublicRoute:
+    Type: AWS::EC2::Route
+    DependsOn: GatewayAttachement
+    Properties:
+      RouteTableId: !Ref 'PublicRouteTable'
+      DestinationCidrBlock: '0.0.0.0/0'
+      GatewayId: !Ref 'InternetGateway'
+
+  PublicLoadBalancerSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Access to the public facing load balancer
+      VpcId: !Ref 'VPC'
+      SecurityGroupIngress:
+        # Allow access to ALB from anywhere on the internet
+        - CidrIp: 0.0.0.0/0
+          IpProtocol: -1
+
+  PublicLoadBalancer:
+    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
+    Properties:
+      Scheme: internet-facing
+      Subnets:
+        # The load balancer is placed into the public subnets, so that traffic
+        # from the internet can reach the load balancer directly via the internet gateway
+        - !Ref PublicSubnetOne
+        - !Ref PublicSubnetTwo
+      SecurityGroups: [!Ref 'PublicLoadBalancerSecurityGroup']
+
+  DummyTargetGroupPublic:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    Properties:
+      HealthCheckIntervalSeconds: 6
+      HealthCheckPath: /
+      HealthCheckProtocol: HTTP
+      HealthCheckTimeoutSeconds: 5
+      HealthyThresholdCount: 2
+      Name: "no-op"
+      Port: 80
+      Protocol: HTTP
+      UnhealthyThresholdCount: 2
+      VpcId: !Ref 'VPC'
+
+  PublicLoadBalancerListener:
+    Type: AWS::ElasticLoadBalancingV2::Listener
+    DependsOn:
+      - PublicLoadBalancer
+    Properties:
+      DefaultActions:
+        - TargetGroupArn: !Ref 'DummyTargetGroupPublic'
+          Type: 'forward'
+      LoadBalancerArn: !Ref 'PublicLoadBalancer'
+      Port: 80
+      Protocol: HTTP
+
+  ECSCluster:
+    Type: AWS::ECS::Cluster
+
+  ECSSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Access to the ECS containers
+      VpcId: !Ref 'VPC'
+
+  ECSSecurityGroupIngressFromPublicALB:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      Description: Ingress from the public ALB
+      GroupId: !Ref 'ECSSecurityGroup'
+      IpProtocol: -1
+      SourceSecurityGroupId: !Ref 'PublicLoadBalancerSecurityGroup'
+
+  ECSSecurityGroupIngressFromSelf:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      Description: Ingress from other containers in the same security group
+      GroupId: !Ref 'ECSSecurityGroup'
+      IpProtocol: -1
+      SourceSecurityGroupId: !Ref 'ECSSecurityGroup'
+
+  ECSRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: [ecs.amazonaws.com]
+            Action: ['sts:AssumeRole']
+      Path: /
+      Policies:
+        - PolicyName: ecs-service
+          PolicyDocument:
+            Statement:
+              - Effect: Allow
+                Action:
+                  # Rules which allow ECS to attach network interfaces to instances
+                  # on your behalf in order for awsvpc networking mode to work right
+                  - 'ec2:AttachNetworkInterface'
+                  - 'ec2:CreateNetworkInterface'
+                  - 'ec2:CreateNetworkInterfacePermission'
+                  - 'ec2:DeleteNetworkInterface'
+                  - 'ec2:DeleteNetworkInterfacePermission'
+                  - 'ec2:Describe*'
+                  - 'ec2:DetachNetworkInterface'
+
+                  # Rules which allow ECS to update load balancers on your behalf
+                  # with the information sabout how to send traffic to your containers
+                  - 'elasticloadbalancing:DeregisterInstancesFromLoadBalancer'
+                  - 'elasticloadbalancing:DeregisterTargets'
+                  - 'elasticloadbalancing:Describe*'
+                  - 'elasticloadbalancing:RegisterInstancesWithLoadBalancer'
+                  - 'elasticloadbalancing:RegisterTargets'
+                Resource: '*'
+
+  ECSTaskExecutionRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: [ecs-tasks.amazonaws.com]
+            Action: ['sts:AssumeRole']
+      Path: /
+      Policies:
+        - PolicyName: AmazonECSTaskExecutionRolePolicy
+          PolicyDocument:
+            Statement:
+              - Effect: Allow
+                Action:
+                  # Allow the ECS Tasks to download images from ECR
+                  - 'ecr:GetAuthorizationToken'
+                  - 'ecr:BatchCheckLayerAvailability'
+                  - 'ecr:GetDownloadUrlForLayer'
+                  - 'ecr:BatchGetImage'
+
+                  # Allow the ECS tasks to upload logs to CloudWatch
+                  - 'logs:CreateLogStream'
+                  - 'logs:PutLogEvents'
+                Resource: '*'
+
+Outputs:
+  ClusterName:
+    Description: The name of the ECS cluster
+    Value: !Ref 'ECSCluster'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ClusterName' ] ]
+  ExternalUrl:
+    Description: The url of the external load balancer
+    Value: !Join ['', ['http://', !GetAtt 'PublicLoadBalancer.DNSName']]
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ExternalUrl' ] ]
+  ECSRole:
+    Description: The ARN of the ECS role
+    Value: !GetAtt 'ECSRole.Arn'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSRole' ] ]
+  ECSTaskExecutionRole:
+    Description: The ARN of the ECS role
+    Value: !GetAtt 'ECSTaskExecutionRole.Arn'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSTaskExecutionRole' ] ]
+  PublicListener:
+    Description: The ARN of the public load balancer's Listener
+    Value: !Ref PublicLoadBalancerListener
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicListener' ] ]
+  VPCId:
+    Description: The ID of the VPC that this stack is deployed in
+    Value: !Ref 'VPC'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'VPCId' ] ]
+  PublicSubnetOne:
+    Description: Public subnet one
+    Value: !Ref 'PublicSubnetOne'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicSubnetOne' ] ]
+  PublicSubnetTwo:
+    Description: Public subnet two
+    Value: !Ref 'PublicSubnetTwo'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicSubnetTwo' ] ]
+  ECSSecurityGroup:
+    Description: A security group used to allow ECS containers to receive traffic
+    Value: !Ref 'ECSSecurityGroup'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSSecurityGroup' ] ]

aws/cloudformation/ecs-in-two-public-subnets/service.yml

@@ -0,0 +1,139 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: Deploy a service on AWS Fargate, hosted in two public subnets and accessible via a public load balancer.
+  Derived from a template at https://github.com/nathanpeck/aws-cloudformation-fargate.
+Parameters:
+  StackName:
+    Type: String
+    Description: The name of the networking stack that
+      these resources are put into.
+  ServiceName:
+    Type: String
+    Description: A human-readable name for the service.
+  HealthCheckPath:
+    Type: String
+    Default: /health
+    Description: Path to perform the healthcheck on each instance.
+  HealthCheckIntervalSeconds:
+    Type: Number
+    Default: 5
+    Description: Number of seconds to wait between each health check.
+  ImageUrl:
+    Type: String
+    Description: The url of a docker image that will handle incoming traffic.
+  ContainerPort:
+    Type: Number
+    Default: 80
+    Description: The port number the application inside the docker container
+      is binding to.
+  ContainerCpu:
+    Type: Number
+    Default: 256
+    Description: How much CPU to give the container. 1024 is 1 CPU.
+  ContainerMemory:
+    Type: Number
+    Default: 512
+    Description: How much memory in megabytes to give the container.
+  Path:
+    Type: String
+    Default: "*"
+    Description: A path on the public load balancer that this service
+      should be connected to.
+  DesiredCount:
+    Type: Number
+    Default: 2
+    Description: How many copies of the service task to run.
+
+Resources:
+
+  TargetGroup:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    Properties:
+      HealthCheckIntervalSeconds: !Ref 'HealthCheckIntervalSeconds'
+      HealthCheckPath: !Ref 'HealthCheckPath'
+      HealthCheckProtocol: HTTP
+      HealthCheckTimeoutSeconds: 5
+      HealthyThresholdCount: 2
+      TargetType: ip
+      Name: !Ref 'ServiceName'
+      Port: !Ref 'ContainerPort'
+      Protocol: HTTP
+      UnhealthyThresholdCount: 2
+      VpcId:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'StackName', 'VPCId']]
+
+  LoadBalancerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - TargetGroupArn: !Ref 'TargetGroup'
+          Type: 'forward'
+      Conditions:
+        - Field: path-pattern
+          Values: [!Ref 'Path']
+      ListenerArn:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'StackName', 'PublicListener']]
+      Priority: 1
+
+  LogGroup:
+    Type: AWS::Logs::LogGroup
+    Properties:
+      LogGroupName: !Ref 'ServiceName'
+      RetentionInDays: 1
+
+  TaskDefinition:
+    Type: AWS::ECS::TaskDefinition
+    Properties:
+      Family: !Ref 'ServiceName'
+      Cpu: !Ref 'ContainerCpu'
+      Memory: !Ref 'ContainerMemory'
+      NetworkMode: awsvpc
+      RequiresCompatibilities:
+        - FARGATE
+      ExecutionRoleArn:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'StackName', 'ECSTaskExecutionRole']]
+      ContainerDefinitions:
+        - Name: !Ref 'ServiceName'
+          Cpu: !Ref 'ContainerCpu'
+          Memory: !Ref 'ContainerMemory'
+          Image: !Ref 'ImageUrl'
+          PortMappings:
+            - ContainerPort: !Ref 'ContainerPort'
+          LogConfiguration:
+            LogDriver: 'awslogs'
+            Options:
+              awslogs-group: !Ref 'ServiceName'
+              awslogs-region: !Ref AWS::Region
+              awslogs-stream-prefix: !Ref 'ServiceName'
+
+  Service:
+    Type: AWS::ECS::Service
+    DependsOn: LoadBalancerRule
+    Properties:
+      ServiceName: !Ref 'ServiceName'
+      Cluster:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'StackName', 'ClusterName']]
+      LaunchType: FARGATE
+      DeploymentConfiguration:
+        MaximumPercent: 200
+        MinimumHealthyPercent: 50
+      DesiredCount: !Ref 'DesiredCount'
+      NetworkConfiguration:
+        AwsvpcConfiguration:
+          AssignPublicIp: ENABLED
+          SecurityGroups:
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'StackName', 'ECSSecurityGroup']]
+          Subnets:
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'StackName', 'PublicSubnetOne']]
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'StackName', 'PublicSubnetTwo']]
+      TaskDefinition: !Ref 'TaskDefinition'
+      LoadBalancers:
+        - ContainerName: !Ref 'ServiceName'
+          ContainerPort: !Ref 'ContainerPort'
+          TargetGroupArn: !Ref 'TargetGroup'

aws/cloudformation/rds-in-private-subnet/README.md

@@ -0,0 +1,7 @@
+# Overview
+
+![RDS in private subnet](rds-in-private-subnet.svg)
+
+# Companion Blog Post
+
+TO DO

aws/cloudformation/rds-in-private-subnet/database.yml

@@ -0,0 +1,88 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: A stack that creates an RDS instance and places it into two subnets
+Parameters:
+  NetworkStackName:
+    Type: String
+    Description: The name of the networking stack that this stack will build upon.
+  DBInstanceClass:
+    Type: String
+    Description: The ID of the second subnet to place the RDS instance into.
+    Default: 'db.t2.micro'
+  DBName:
+    Type: String
+    Description: The name of the database that is created within the PostgreSQL instance.
+  DBUsername:
+    Type: String
+    Description: The master user name for the PostgreSQL instance.
+Resources:
+
+  Secret:
+    Type: "AWS::SecretsManager::Secret"
+    Properties:
+      Name: !Ref 'DBUsername'
+      GenerateSecretString:
+        # This will generate a JSON object with the keys "username" and password.
+        SecretStringTemplate: !Join ['', ['{"username": "', !Ref 'DBUsername' ,'"}']]
+        GenerateStringKey: "password"
+        PasswordLength: 32
+        ExcludeCharacters: '"@/\'
+
+  DBSubnetGroup:
+    Type: AWS::RDS::DBSubnetGroup
+    Properties:
+      DBSubnetGroupDescription: Subnet group for the RDS instance
+      DBSubnetGroupName: DBSubnetGroup
+      SubnetIds:
+        - Fn::ImportValue:
+            !Join [':', [!Ref 'NetworkStackName', 'PrivateSubnetOne']]
+        - Fn::ImportValue:
+            !Join [':', [!Ref 'NetworkStackName', 'PrivateSubnetTwo']]
+
+  PostgresInstance:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      AllocatedStorage: 20
+      AvailabilityZone:
+        Fn::Select:
+          - 0
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      DBInstanceClass: !Ref 'DBInstanceClass'
+      DBName: !Ref 'DBName'
+      DBSubnetGroupName: !Ref 'DBSubnetGroup'
+      Engine: postgres
+      EngineVersion: 11.5
+      MasterUsername: !Ref 'DBUsername'
+      MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref Secret, ':SecretString:password}}' ]]
+      PubliclyAccessible: false
+      VPCSecurityGroups:
+        - Fn::ImportValue:
+            !Join [':', [!Ref 'NetworkStackName', 'DBSecurityGroupId']]
+
+  SecretRDSInstanceAttachment:
+    Type: "AWS::SecretsManager::SecretTargetAttachment"
+    Properties:
+      SecretId: !Ref Secret
+      TargetId: !Ref PostgresInstance
+      TargetType: AWS::RDS::DBInstance
+
+Outputs:
+  EndpointAddress:
+    Description: Address of the RDS endpoint.
+    Value: !GetAtt 'PostgresInstance.Endpoint.Address'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'EndpointAddress' ] ]
+  EndpointPort:
+    Description: Port of the RDS endpoint.
+    Value: !GetAtt 'PostgresInstance.Endpoint.Port'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'EndpointPort' ] ]
+  DBName:
+    Description: The name of the database that is created within the PostgreSQL instance.
+    Value: !Ref DBName
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'DBName' ] ]
+  Secret:
+    Description: Reference to the secret containing the password to the database.
+    Value: !Ref 'Secret'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'Secret' ] ]

aws/cloudformation/rds-in-private-subnet/network.yml

@@ -0,0 +1,298 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: A network stack for deploying containers in AWS ECS.
+  This stack creates a VPC with two public subnets and a loadbalancer to balance traffic between those subnets.
+  Derived from a template at https://github.com/nathanpeck/aws-cloudformation-fargate.
+Resources:
+
+  VPC:
+    Type: AWS::EC2::VPC
+    Properties:
+      CidrBlock: '10.0.0.0/16'
+
+  PublicSubnetOne:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 0
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.1.0/24'
+      MapPublicIpOnLaunch: true
+
+  PublicSubnetTwo:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 1
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.2.0/24'
+      MapPublicIpOnLaunch: true
+
+  InternetGateway:
+    Type: AWS::EC2::InternetGateway
+
+  GatewayAttachement:
+    Type: AWS::EC2::VPCGatewayAttachment
+    Properties:
+      VpcId: !Ref 'VPC'
+      InternetGatewayId: !Ref 'InternetGateway'
+
+  PublicRouteTable:
+    Type: AWS::EC2::RouteTable
+    Properties:
+      VpcId: !Ref 'VPC'
+
+  PublicSubnetOneRouteTableAssociation:
+    Type: AWS::EC2::SubnetRouteTableAssociation
+    Properties:
+      SubnetId: !Ref PublicSubnetOne
+      RouteTableId: !Ref PublicRouteTable
+
+  PublicSubnetTwoRouteTableAssociation:
+    Type: AWS::EC2::SubnetRouteTableAssociation
+    Properties:
+      SubnetId: !Ref PublicSubnetTwo
+      RouteTableId: !Ref PublicRouteTable
+
+  PublicRoute:
+    Type: AWS::EC2::Route
+    DependsOn: GatewayAttachement
+    Properties:
+      RouteTableId: !Ref 'PublicRouteTable'
+      DestinationCidrBlock: '0.0.0.0/0'
+      GatewayId: !Ref 'InternetGateway'
+
+  PublicLoadBalancerSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Access to the public facing load balancer
+      VpcId: !Ref 'VPC'
+      SecurityGroupIngress:
+        # Allow access to ALB from anywhere on the internet
+        - CidrIp: 0.0.0.0/0
+          IpProtocol: -1
+
+  PublicLoadBalancer:
+    Type: AWS::ElasticLoadBalancingV2::LoadBalancer
+    Properties:
+      Scheme: internet-facing
+      Subnets:
+        # The load balancer is placed into the public subnets, so that traffic
+        # from the internet can reach the load balancer directly via the internet gateway
+        - !Ref PublicSubnetOne
+        - !Ref PublicSubnetTwo
+      SecurityGroups: [!Ref 'PublicLoadBalancerSecurityGroup']
+
+  DummyTargetGroupPublic:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    Properties:
+      HealthCheckIntervalSeconds: 6
+      HealthCheckPath: /
+      HealthCheckProtocol: HTTP
+      HealthCheckTimeoutSeconds: 5
+      HealthyThresholdCount: 2
+      Name: "no-op"
+      Port: 80
+      Protocol: HTTP
+      UnhealthyThresholdCount: 2
+      VpcId: !Ref 'VPC'
+
+  PublicLoadBalancerListener:
+    Type: AWS::ElasticLoadBalancingV2::Listener
+    DependsOn:
+      - PublicLoadBalancer
+    Properties:
+      DefaultActions:
+        - TargetGroupArn: !Ref 'DummyTargetGroupPublic'
+          Type: 'forward'
+      LoadBalancerArn: !Ref 'PublicLoadBalancer'
+      Port: 80
+      Protocol: HTTP
+
+  ECSCluster:
+    Type: AWS::ECS::Cluster
+
+  ECSSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Access to the ECS containers
+      VpcId: !Ref 'VPC'
+
+  ECSSecurityGroupIngressFromPublicALB:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      Description: Ingress from the public ALB
+      GroupId: !Ref 'ECSSecurityGroup'
+      IpProtocol: -1
+      SourceSecurityGroupId: !Ref 'PublicLoadBalancerSecurityGroup'
+
+  ECSSecurityGroupIngressFromSelf:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      Description: Ingress from other containers in the same security group
+      GroupId: !Ref 'ECSSecurityGroup'
+      IpProtocol: -1
+      SourceSecurityGroupId: !Ref 'ECSSecurityGroup'
+
+  ECSRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: [ecs.amazonaws.com]
+            Action: ['sts:AssumeRole']
+      Path: /
+      Policies:
+        - PolicyName: ecs-service
+          PolicyDocument:
+            Statement:
+              - Effect: Allow
+                Action:
+                  # Rules which allow ECS to attach network interfaces to instances
+                  # on your behalf in order for awsvpc networking mode to work right
+                  - 'ec2:AttachNetworkInterface'
+                  - 'ec2:CreateNetworkInterface'
+                  - 'ec2:CreateNetworkInterfacePermission'
+                  - 'ec2:DeleteNetworkInterface'
+                  - 'ec2:DeleteNetworkInterfacePermission'
+                  - 'ec2:Describe*'
+                  - 'ec2:DetachNetworkInterface'
+
+                  # Rules which allow ECS to update load balancers on your behalf
+                  # with the information sabout how to send traffic to your containers
+                  - 'elasticloadbalancing:DeregisterInstancesFromLoadBalancer'
+                  - 'elasticloadbalancing:DeregisterTargets'
+                  - 'elasticloadbalancing:Describe*'
+                  - 'elasticloadbalancing:RegisterInstancesWithLoadBalancer'
+                  - 'elasticloadbalancing:RegisterTargets'
+                Resource: '*'
+
+  ECSTaskExecutionRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: [ecs-tasks.amazonaws.com]
+            Action: ['sts:AssumeRole']
+      Path: /
+      Policies:
+        - PolicyName: AmazonECSTaskExecutionRolePolicy
+          PolicyDocument:
+            Statement:
+              - Effect: Allow
+                Action:
+                  # Allow the ECS Tasks to download images from ECR
+                  - 'ecr:GetAuthorizationToken'
+                  - 'ecr:BatchCheckLayerAvailability'
+                  - 'ecr:GetDownloadUrlForLayer'
+                  - 'ecr:BatchGetImage'
+
+                  # Allow the ECS tasks to upload logs to CloudWatch
+                  - 'logs:CreateLogStream'
+                  - 'logs:PutLogEvents'
+                Resource: '*'
+
+  PrivateSubnetOne:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 0
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.101.0/24'
+      MapPublicIpOnLaunch: false
+
+  PrivateSubnetTwo:
+    Type: AWS::EC2::Subnet
+    Properties:
+      AvailabilityZone:
+        Fn::Select:
+          - 1
+          - Fn::GetAZs: {Ref: 'AWS::Region'}
+      VpcId: !Ref 'VPC'
+      CidrBlock: '10.0.102.0/24'
+      MapPublicIpOnLaunch: false
+
+  DBSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Access to the RDS instance
+      VpcId: !Ref 'VPC'
+
+  DBSecurityGroupIngressFromECS:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      Description: Ingress from the ECS containers to the RDS instance
+      GroupId: !Ref 'DBSecurityGroup'
+      IpProtocol: -1
+      SourceSecurityGroupId: !Ref 'ECSSecurityGroup'
+
+Outputs:
+  PrivateSubnetOne:
+    Description: Private subnet one
+    Value: !Ref 'PrivateSubnetOne'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PrivateSubnetOne' ] ]
+  PrivateSubnetTwo:
+    Description: Private subnet two
+    Value: !Ref 'PrivateSubnetTwo'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PrivateSubnetTwo' ] ]
+  DBSecurityGroupId:
+    Description: ID of the security group that an RDS instance can be placed into.
+    Value: !Ref 'DBSecurityGroup'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'DBSecurityGroupId' ] ]
+  ClusterName:
+    Description: The name of the ECS cluster
+    Value: !Ref 'ECSCluster'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ClusterName' ] ]
+  ExternalUrl:
+    Description: The url of the external load balancer
+    Value: !Join ['', ['http://', !GetAtt 'PublicLoadBalancer.DNSName']]
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ExternalUrl' ] ]
+  ECSRole:
+    Description: The ARN of the ECS role
+    Value: !GetAtt 'ECSRole.Arn'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSRole' ] ]
+  ECSTaskExecutionRole:
+    Description: The ARN of the ECS role
+    Value: !GetAtt 'ECSTaskExecutionRole.Arn'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSTaskExecutionRole' ] ]
+  PublicListener:
+    Description: The ARN of the public load balancer's Listener
+    Value: !Ref PublicLoadBalancerListener
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicListener' ] ]
+  VPCId:
+    Description: The ID of the VPC that this stack is deployed in
+    Value: !Ref 'VPC'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'VPCId' ] ]
+  PublicSubnetOne:
+    Description: Public subnet one
+    Value: !Ref 'PublicSubnetOne'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicSubnetOne' ] ]
+  PublicSubnetTwo:
+    Description: Public subnet two
+    Value: !Ref 'PublicSubnetTwo'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'PublicSubnetTwo' ] ]
+  ECSSecurityGroup:
+    Description: A security group used to allow ECS containers to receive traffic
+    Value: !Ref 'ECSSecurityGroup'
+    Export:
+      Name: !Join [ ':', [ !Ref 'AWS::StackName', 'ECSSecurityGroup' ] ]

aws/cloudformation/rds-in-private-subnet/rds-in-private-subnet.drawio

@@ -0,0 +1 @@
+<mxfile modified="2020-05-11T21:18:00.281Z" host="app.diagrams.net" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36" etag="d22WT4Cb11cg7E6o-Mdr" version="13.0.9" type="device"><diagram id="Ht1M8jgEwFfnCIfOTk4-" name="Page-1">7VvZcuI4FP0aHpuyJK+PYUk6VemaTNHTyxNlsGI8MRYtiy1fP5KRwZbEkkBI00OKqljXspZ7z7mLDA3UHi/uaDgZfSERThvQihYN1GlACJDj8H9CslxJPM9eCWKaRLLTRtBLXrAUWlI6TSKc1zoyQlKWTOrCIckyPGQ1WUgpmde7PZG0PuskjLEm6A3DVJd+TyI2klLgBpsbn3ESj+TUPvRWN8Zh2VnuJB+FEZlXRKjbQG1KCFtdjRdtnArllXpZPXe75e56YRRn7JAHHuJp6+UXX9i3PB/cv7TDr5/+/SRHmYXpVG74cTpIk6FY73SQYSbXzpalQiYkyVihVKfFP3zOttVw+J22aDWhowjUtlcXAL0lxqgL1LZXFwB1eKDMD9QFVgRaqza8pcxvVRbIP6hFpixNMtxew8/iwpiGUcLN0iYpoVyWkYxrrzVi45S3AL+cjxKGe5NwKLQ659ThsieSMUkAAMu2VLx4hgNoIq7Hi1hwrRnOc7sZUzKdFFPecwoY7/ZzPJzShC37m849RskzlsvNi0a52AZE0PZ9YIslJGlakXeDW9R1uXyGKUs4SW7SJBaTMiKGDWUrxU9MDMu3l2TxQ9HqIEtuyTRPFOYjHMnlSEjyKfBiK9bBmkHc9WAyxowueRf5AHIk6aTXQaU7mVc47EvZqEJf4IICIYX7kK4jXg+/YRe/kAQzk22Eh3Dxcu9977wMnl37S/SrP/hUeoIK2749tq8Mu3yGzSbDg3kkl3oiCt3ctLyWb6aQxhcDq7ZSCLh1CgFLp5BrGyiEAut4/hiDla0HK5rMQoav0eoP4tL/L1o5wQdHq0U6ve3jv2af7eXPX2zwzwu+m5pSwyvbrmz7Hdh2VGBT2QbgmdlmjG2OxrYO36zVk0Sz7grzqIQz5BWawZwbt+27VUWCrVZSYaXYZD2UYs0T+EAXKlZxDFYptV9LN8AJ0g1juo6utfHV//15/k+tjc/u/4xkA57Gtm67JzwgprOEQ+G3dn3HGcQ/wPUhU6X1bq5Pj0YN6KZivwN+EYuLm8mE+8KQJZxZ5T1a3nwgYaRLue7CbIhpeYcvbT2cZl+j86hxobTjQzjA6SPJk2ItqDMgjJHxXiYOucX4Wmqux+BGUDPc7LSf8o31B+U+NCdw6/gOsrd7uROgBdp1tEDXagKkl+aBjhcPvhNc/P1wuRfKLmKmG46FGbJBPik0oqLkjpcY83B5YSBJ5P76sVy+GRvuu2Jj7SU22PhYYARbnPrXMH8+zJhqVETwVsyvKVEo2PO7VpV8nYTygVb2zggVGlCN0rGcNg89htjxVPydAU77Upswn6zU8ZQsxDrMuQ7FOZnSIV5lOi3eNOU8eJifBmk2UGKWryPNM4Qs770iFtSzdQ1gOIpxqVkBBxKTLEy7G2nVLDiLbsT7Q2HclAyfhSgdFO3SxgVsQsrKfpLI/MnbJF17Cy0psZ2WK2DKE84sWiOL24Iuf1QbP0WD59ey2VlUb3aW1dYjpgnXo4DW7jRxBZJdepSU5fuKMdvv84VOdwKmmsSUR8gUpzyczuqvWE2QkMM9irpqAz6lgIeBq+Wlq33K56ovRZWhgFJ2Il/PcVeq0MYqYLre6BHIda/IPQC5ewHpfBwgoXVCRCrVAArOj0hTPndJiHw7iIKPAxGyAhVEb0OQXX7npkSQbTWtyh84CEzcECIJX3eTZ1vblw81DuxcpdYfOAqWVys4LbL1hHRXpXKRBQh8femx/mrS5sSr/LITOlHVqhYmgZ4uBk3D8a5jH58wGl9vwf1I4NZiMcW9vx94x/uM+6dMHERdFCxolOt4gF0PFV8aeL9S1LXtmsWBZ6/DWNXoUDe5v8N1HmXySy8Rtpplb1ZvSOp3keJDwh9Qwh+0m77/tgjoAnNsOXXMc3bHsNf2PzrmGd8s6qi/nsH8LmcwR70yVc9gkGs3TXH1nY5hjGC7+Fp2kbAf5dz8ulLJ8tamkBWNZaVhLmMVP/o23+3ovns7zz/EVSPrrZWK6g8PLHTPXZvY1hn8tP4C9MKoc/pjoNfyZ1f8Oyz3OQt/7KBekEOVBE0L2bYPPcd3oeW9MQdybGVYHh38wHUc4PHQgdR3PqdKidz6bhTq7O2/L4VS64ojUyje3PwCZ9V98zsm1P0P</diagram></mxfile>

aws/cloudformation/rds-in-private-subnet/service.yml

@@ -0,0 +1,164 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: Deploy a service on AWS Fargate, hosted in two public subnets and accessible via a public load balancer.
+  Derived from a template at https://github.com/nathanpeck/aws-cloudformation-fargate.
+Parameters:
+  NetworkStackName:
+    Type: String
+    Description: The name of the networking stack that
+      these resources are put into.
+  DatabaseStackName:
+    Type: String
+    Description: The name of the database stack with the database this service should connect to.
+  ServiceName:
+    Type: String
+    Description: A human-readable name for the service.
+  HealthCheckPath:
+    Type: String
+    Default: /health
+    Description: Path to perform the healthcheck on each instance.
+  HealthCheckIntervalSeconds:
+    Type: Number
+    Default: 5
+    Description: Number of seconds to wait between each health check.
+  ImageUrl:
+    Type: String
+    Description: The url of a docker image that will handle incoming traffic.
+  ContainerPort:
+    Type: Number
+    Default: 80
+    Description: The port number the application inside the docker container
+      is binding to.
+  ContainerCpu:
+    Type: Number
+    Default: 256
+    Description: How much CPU to give the container. 1024 is 1 CPU.
+  ContainerMemory:
+    Type: Number
+    Default: 512
+    Description: How much memory in megabytes to give the container.
+  Path:
+    Type: String
+    Default: "*"
+    Description: A path on the public load balancer that this service
+      should be connected to.
+  DesiredCount:
+    Type: Number
+    Default: 2
+    Description: How many copies of the service task to run.
+
+Resources:
+
+  TargetGroup:
+    Type: AWS::ElasticLoadBalancingV2::TargetGroup
+    Properties:
+      HealthCheckIntervalSeconds: !Ref 'HealthCheckIntervalSeconds'
+      HealthCheckPath: !Ref 'HealthCheckPath'
+      HealthCheckProtocol: HTTP
+      HealthCheckTimeoutSeconds: 5
+      HealthyThresholdCount: 2
+      TargetType: ip
+      Name: !Ref 'ServiceName'
+      Port: !Ref 'ContainerPort'
+      Protocol: HTTP
+      UnhealthyThresholdCount: 2
+      VpcId:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'NetworkStackName', 'VPCId']]
+
+  LoadBalancerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - TargetGroupArn: !Ref 'TargetGroup'
+          Type: 'forward'
+      Conditions:
+        - Field: path-pattern
+          Values: [!Ref 'Path']
+      ListenerArn:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'NetworkStackName', 'PublicListener']]
+      Priority: 1
+
+  LogGroup:
+    Type: AWS::Logs::LogGroup
+    Properties:
+      LogGroupName: !Ref 'ServiceName'
+      RetentionInDays: 1
+
+  TaskDefinition:
+    Type: AWS::ECS::TaskDefinition
+    Properties:
+      Family: !Ref 'ServiceName'
+      Cpu: !Ref 'ContainerCpu'
+      Memory: !Ref 'ContainerMemory'
+      NetworkMode: awsvpc
+      RequiresCompatibilities:
+        - FARGATE
+      ExecutionRoleArn:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'NetworkStackName', 'ECSTaskExecutionRole']]
+      ContainerDefinitions:
+        - Name: !Ref 'ServiceName'
+          Cpu: !Ref 'ContainerCpu'
+          Memory: !Ref 'ContainerMemory'
+          Image: !Ref 'ImageUrl'
+          Environment:
+            - Name: SPRING_DATASOURCE_URL
+              Value: !Join
+                - ''
+                - - 'jdbc:postgresql://'
+                  - Fn::ImportValue: !Join [':', [!Ref 'DatabaseStackName', 'EndpointAddress']]
+                  - ':'
+                  - Fn::ImportValue: !Join [':', [!Ref 'DatabaseStackName', 'EndpointPort']]
+                  - '/'
+                  - Fn::ImportValue: !Join [':', [!Ref 'DatabaseStackName', 'DBName']]
+            - Name: SPRING_DATASOURCE_USERNAME
+              Value: !Join
+                - ''
+                - - '{{resolve:secretsmanager:'
+                  - Fn::ImportValue: !Join [':', [!Ref 'DatabaseStackName', 'Secret']]
+                  - ':SecretString:username}}'
+            - Name: SPRING_DATASOURCE_PASSWORD
+              Value: !Join
+                - ''
+                - - '{{resolve:secretsmanager:'
+                  - Fn::ImportValue: !Join [':', [!Ref 'DatabaseStackName', 'Secret']]
+                  - ':SecretString:password}}'
+          PortMappings:
+            - ContainerPort: !Ref 'ContainerPort'
+          LogConfiguration:
+            LogDriver: 'awslogs'
+            Options:
+              awslogs-group: !Ref 'ServiceName'
+              awslogs-region: !Ref AWS::Region
+              awslogs-stream-prefix: !Ref 'ServiceName'
+
+  Service:
+    Type: AWS::ECS::Service
+    DependsOn: LoadBalancerRule
+    Properties:
+      ServiceName: !Ref 'ServiceName'
+      Cluster:
+        Fn::ImportValue:
+          !Join [':', [!Ref 'NetworkStackName', 'ClusterName']]
+      LaunchType: FARGATE
+      DeploymentConfiguration:
+        MaximumPercent: 200
+        MinimumHealthyPercent: 50
+      DesiredCount: !Ref 'DesiredCount'
+      NetworkConfiguration:
+        AwsvpcConfiguration:
+          AssignPublicIp: ENABLED
+          SecurityGroups:
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'NetworkStackName', 'ECSSecurityGroup']]
+          Subnets:
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'NetworkStackName', 'PublicSubnetOne']]
+            - Fn::ImportValue:
+                !Join [':', [!Ref 'NetworkStackName', 'PublicSubnetTwo']]
+      TaskDefinition: !Ref 'TaskDefinition'
+      LoadBalancers:
+        - ContainerName: !Ref 'ServiceName'
+          ContainerPort: !Ref 'ContainerPort'
+          TargetGroupArn: !Ref 'TargetGroup'

build-all.sh

@@ -0,0 +1,101 @@
+#!/bin/bash
+
+MAIN_DIR=$PWD
+
+build_gradle_module() {
+  MODULE_PATH=$1
+  echo ""
+  echo "+++"
+  echo "+++ BUILDING MODULE $MODULE_PATH"
+  echo "+++"
+  cd $MODULE_PATH && {
+    chmod +x gradlew
+    ./gradlew clean build
+    if [ $? -ne 0 ]
+    then
+      echo ""
+      echo "+++"
+      echo "+++ BUILDING MODULE $MODULE_PATH FAILED"
+      echo "+++"
+      exit 1
+    else
+      echo ""
+      echo "+++"
+      echo "+++ BUILDING MODULE $MODULE_PATH SUCCESSFUL"
+      echo "+++"
+    fi
+    cd $MAIN_DIR
+  }
+}
+
+build_maven_module() {
+  MODULE_PATH=$1
+  echo ""
+  echo "+++"
+  echo "+++ BUILDING MODULE $MODULE_PATH"
+  echo "+++"
+  cd $MODULE_PATH && {
+    chmod +x mvnw
+    ./mvnw clean package
+    if [ $? -ne 0 ]
+    then
+      echo ""
+      echo "+++"
+      echo "+++ BUILDING MODULE $MODULE_PATH FAILED"
+      echo "+++"
+      exit 1
+    else
+      echo ""
+      echo "+++"
+      echo "+++ BUILDING MODULE $MODULE_PATH SUCCESSFUL"
+      echo "+++"
+    fi
+    cd $MAIN_DIR
+  }
+}
+
+build_maven_module "spring-boot/dependency-injection"
+build_maven_module "spring-boot/spring-boot-openapi"
+build_maven_module "spring-boot/data-migration/liquibase"
+build_gradle_module "spring-boot/boundaries"
+build_gradle_module "spring-boot/argumentresolver"
+build_gradle_module "spring-data/spring-data-jdbc-converter"
+build_gradle_module "solid"
+build_gradle_module "spring-boot/data-migration/flyway"
+build_gradle_module "reactive"
+build_gradle_module "junit/assumptions"
+build_gradle_module "logging"
+build_gradle_module "pact/pact-feign-consumer"
+# currently disabled since the consumer build won't run
+# build_gradle_module "pact/pact-message-consumer"
+# build_gradle_module "pact/pact-message-producer"
+build_gradle_module "pact/pact-spring-provider"
+build_gradle_module "patterns"
+build_gradle_module "spring-boot/conditionals"
+build_gradle_module "spring-boot/configuration"
+build_gradle_module "spring-boot/mocking"
+build_gradle_module "spring-boot/modular"
+build_gradle_module "spring-boot/paging"
+build_gradle_module "spring-boot/rabbitmq-event-brokering"
+build_gradle_module "spring-boot/spring-boot-logging"
+build_gradle_module "spring-boot/spring-boot-testing"
+build_gradle_module "spring-boot/starter"
+build_gradle_module "spring-boot/startup"
+build_gradle_module "spring-boot/static"
+build_gradle_module "spring-boot/validation"
+build_gradle_module "spring-boot/profiles"
+build_gradle_module "spring-boot/password-encoding"
+build_gradle_module "spring-boot/testcontainers"
+build_gradle_module "spring-cloud/feign-with-spring-data-rest"
+build_gradle_module "spring-cloud/sleuth-downstream-service"
+build_gradle_module "spring-cloud/sleuth-upstream-service"
+build_gradle_module "spring-cloud/spring-cloud-contract-consumer"
+build_gradle_module "spring-cloud/spring-cloud-contract-provider"
+build_gradle_module "spring-data/spring-data-rest-associations"
+build_gradle_module "spring-data/spring-data-rest-springfox"
+build_gradle_module "tools/jacoco"
+
+echo ""
+echo "+++"
+echo "+++ ALL MODULES SUCCESSFUL"
+echo "+++"

junit/assumptions/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 apply plugin: 'java'
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
 	mavenLocal()
@@ -23,3 +23,6 @@ dependencies {
 	testCompile 'junit:junit:4.12'
 }
 
+test {
+	useJUnitPlatform()
+}

junit/assumptions/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

logging/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip

pact/pact-angular/README.md

@@ -4,6 +4,9 @@ This example project shows how to setup an Angular application to use [Pact](htt
 in order to create Pact files from a consumer test and validate the
 a consumer against the Pact.
 
+## Relevant Blog Post
+[Creating a Consumer-Driven Contract with Angular and Pact](https://reflectoring.io/consumer-driven-contracts-with-angular-and-pact/)
+
 ## Key Files
 
 * [`user.service.ts`](src/app/user.service.ts): Angular service that calls a REST

pact/pact-feign-consumer/application.yml

@@ -1,5 +0,0 @@
-userservice:
-  ribbon:
-    eureka:
-      enabled: false
-    listOfServers: localhost:8080

pact/pact-feign-consumer/build.gradle

@@ -35,16 +35,29 @@ dependencies {
     compile('org.springframework.cloud:spring-cloud-starter-openfeign')
     compile('org.springframework.cloud:spring-cloud-starter-netflix-ribbon')
     compile('com.h2database:h2:1.4.196')
+
+    // add jaxb since it's no longer available in Java 11
+    runtime('javax.xml.bind:jaxb-api:2.3.1')
+
+    // add javassist >= 3.23.1-GA since earlier versions are broken in Java 11
+    // see https://github.com/jboss-javassist/javassist/issues/194
+    runtime('org.javassist:javassist:3.23.1-GA')
+
     testCompile('org.codehaus.groovy:groovy-all:2.4.6')
     testCompile("au.com.dius:pact-jvm-consumer-junit5_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
+    testRuntimeOnly( 'org.junit.jupiter:junit-jupiter-engine:5.1.0')
 }
 
 pact {
     publish {
         pactDirectory = 'target/pacts'
-        pactBrokerUrl = 'URL'
-        pactBrokerUsername = 'USERNAME'
-        pactBrokerPassword = 'PASSWORD'
+        pactBrokerUrl = 'TODO'
+        pactBrokerUsername = 'TODO'
+        pactBrokerPassword = 'TODO'
     }
+}
+
+test {
+    useJUnitPlatform()
 }

pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip

pact/pact-feign-consumer/src/test/java/io/reflectoring/UserServiceConsumerTest.java

@@ -11,6 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.RestTemplate;
+
 import static org.assertj.core.api.Assertions.*;
 
 @ExtendWith(PactConsumerTestExt.class)
@@ -27,6 +29,7 @@ class UserServiceConsumerTest {
 
 	@Pact(state = "provider accepts a new person", provider = "userservice", consumer = "userclient")
 	RequestResponsePact createPersonPact(PactDslWithProvider builder) {
+
 		// @formatter:off
 		return builder
 						.given("provider accepts a new person")

pact/pact-message-consumer/README.md

@@ -1,15 +1,7 @@
-# Consumer-Driven-Contract Test for a Spring Boot Provider
- 
-This repo contains an example of consumer-driven-contract testing for a Spring
-Boot API provider. The corresponding consumer to the contract is
-implemented in the module `pact-angular`.
+# Consumer-Driven-Contract Test for a Spring Boot Message Consumer
 
-The contract is created and verified with [Pact](https://docs.pact.io/).
+This module shows how to use Pact to implement a contract test for a message provider.
 
-Before running the build, you need to follow the instructions on the [consumer-side](../pact-angular/)
-to create the consumer-driven contract file (pact file).
+## Companion Articles
+[Testing a Spring Message Producer and Consumer against a Contract with Pact](https://reflectoring.io/cdc-pact-messages/)
 
-## Running the application
-
-The interesting part in this code base is the class `UserControllerProviderTest`.
-You can run the tests with `gradlew test` on Windows or `./gradlew test` on Unix.

pact/pact-message-consumer/application.yml

@@ -1,11 +1 @@
-spring:
-  datasource:
-    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    driverClassName: org.h2.Driver
-    username: sa
-    password:
-  h2:
-    console:
-      enabled: true
-
-logging.level.org.hibernate.SQL: OFF
+spring.rabbitmq.connection-timeout=10

pact/pact-message-consumer/build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
     mavenLocal()
@@ -21,11 +21,18 @@ repositories {
 }
 
 dependencies {
-    compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-amqp')
     compile('com.h2database:h2:1.4.196')
-    compileOnly('org.projectlombok:lombok')
+    compileOnly('org.projectlombok:lombok:1.18.2')
+
+    // add jaxb since it's no longer available in Java 11
+    runtime('javax.xml.bind:jaxb-api:2.3.1')
+
+    // add javassist >= 3.23.1-GA since earlier versions are broken in Java 11
+    // see https://github.com/jboss-javassist/javassist/issues/194
+    runtime('org.javassist:javassist:3.23.1-GA')
+    
     testCompile("au.com.dius:pact-jvm-consumer-junit_2.12:${pact_version}")
     testCompile("au.com.dius:pact-jvm-consumer-groovy_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')

pact/pact-message-consumer/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

pact/pact-message-consumer/src/main/java/io/reflectoring/MessageConsumer.java

@@ -13,13 +13,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UserCreatedMessageConsumer {
+public class MessageConsumer {
 
-  private Logger logger = LoggerFactory.getLogger(UserCreatedMessageConsumer.class);
+  private Logger logger = LoggerFactory.getLogger(MessageConsumer.class);
 
   private ObjectMapper objectMapper;
 
-  public UserCreatedMessageConsumer(ObjectMapper objectMapper) {
+  public MessageConsumer(ObjectMapper objectMapper) {
     this.objectMapper = objectMapper;
   }
 

pact/pact-message-consumer/src/main/java/io/reflectoring/MessageConsumerConfiguration.java

@@ -40,6 +40,7 @@ public class MessageConsumerConfiguration {
 	public SimpleMessageListenerContainer container(ConnectionFactory connectionFactory,
 																									MessageListenerAdapter listenerAdapter) {
 		SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
+		container.setConsumerStartTimeout(1000); // we don't want to wait in this example project
 		container.setConnectionFactory(connectionFactory);
 		container.setQueueNames(QUEUE_NAME);
 		container.setMessageListener(listenerAdapter);
@@ -47,13 +48,13 @@ public class MessageConsumerConfiguration {
 	}
 
 	@Bean
-	public MessageListenerAdapter listenerAdapter(UserCreatedMessageConsumer userCreatedMessageConsumer) {
-		return new MessageListenerAdapter(userCreatedMessageConsumer, "consumeStringMessage");
+	public MessageListenerAdapter listenerAdapter(MessageConsumer messageConsumer) {
+		return new MessageListenerAdapter(messageConsumer, "consumeStringMessage");
 	}
 
 	@Bean
-	public UserCreatedMessageConsumer eventReceiver(ObjectMapper objectMapper) {
-		return new UserCreatedMessageConsumer(objectMapper);
+	public MessageConsumer eventReceiver(ObjectMapper objectMapper) {
+		return new MessageConsumer(objectMapper);
 	}
 
 }

pact/pact-message-consumer/src/test/java/io/reflectoring/MessageConsumerTest.java

@@ -17,14 +17,14 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class UserCreatedMessageConsumerTest {
+public class MessageConsumerTest {
 
 	@Rule
 	public MessagePactProviderRule mockProvider = new MessagePactProviderRule(this);
 	private byte[] currentMessage;
 
 	@Autowired
-	private UserCreatedMessageConsumer userCreatedMessageConsumer;
+	private MessageConsumer messageConsumer;
 
 	@Pact(provider = "userservice", consumer = "userclient")
 	public MessagePact userCreatedMessagePact(MessagePactBuilder builder) {
@@ -46,7 +46,7 @@ public class UserCreatedMessageConsumerTest {
 	@Test
 	@PactVerification("userCreatedMessagePact")
 	public void verifyCreatePersonPact() throws IOException {
-		userCreatedMessageConsumer.consumeStringMessage(new String(this.currentMessage));
+		messageConsumer.consumeStringMessage(new String(this.currentMessage));
 	}
 
 	/**

pact/pact-message-consumer/target/pacts/userclient-userservice.json

@@ -14,8 +14,8 @@
             "contents": {
                 "messageUuid": "string",
                 "user": {
-                    "name": "Zaphod Beeblebrox",
-                    "id": 42
+                    "id": 42,
+                    "name": "Zaphod Beeblebrox"
                 }
             },
             "matchingRules": {

pact/pact-message-producer/README.md

@@ -0,0 +1,3 @@
+# Consumer-Driven-Contract Test for a Spring Boot Message Provider
+
+This module shows how to use Pact to implement a contract test for a message provider.

pact/pact-message-producer/build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
     mavenLocal()
@@ -21,11 +21,22 @@ repositories {
 }
 
 dependencies {
-    compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-amqp')
     compile('com.h2database:h2:1.4.196')
-    compileOnly('org.projectlombok:lombok')
+    compileOnly('org.projectlombok:lombok:1.18.2')
+
+    // add jaxb since it's no longer available in Java 11
+    runtime('javax.xml.bind:jaxb-api:2.3.1')
+
+    // add javassist >= 3.23.1-GA since earlier versions are broken in Java 11
+    // see https://github.com/jboss-javassist/javassist/issues/194
+    runtime('org.javassist:javassist:3.23.1-GA')
+
+    // overriding bytebuddy to newer version that supports Java 11
+    // see https://github.com/raphw/byte-buddy/issues/428
+    testCompile('net.bytebuddy:byte-buddy:1.9.12')
+
     testCompile("au.com.dius:pact-jvm-provider-junit_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }

pact/pact-message-producer/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip

pact/pact-message-producer/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pact/pact-message-producer/src/main/java/io/reflectoring/MessageProducer.java

@@ -0,0 +1,31 @@
+package io.reflectoring;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Takes a {@link UserCreatedMessage}, converts it to a {@link String} and sends it to be published.
+ */
+class MessageProducer {
+
+	private Logger logger = LoggerFactory.getLogger(MessageProducer.class);
+
+	private ObjectMapper objectMapper;
+
+	private MessagePublisher messagePublisher;
+
+	MessageProducer(ObjectMapper objectMapper, MessagePublisher messagePublisher) {
+		this.objectMapper = objectMapper;
+		this.messagePublisher = messagePublisher;
+	}
+
+	void produceUserCreatedMessage(UserCreatedMessage message) throws IOException {
+		String stringMessage = objectMapper.writeValueAsString(message);
+		messagePublisher.publishMessage(stringMessage, "user.created");
+		logger.info("Published message '{}'", stringMessage);
+	}
+
+}

pact/pact-message-producer/src/main/java/io/reflectoring/MessageProviderConfiguration.java

@@ -18,18 +18,18 @@ class MessageProviderConfiguration {
 
 
 	@Bean
-	UserCreatedMessageProvider messageProvider(ObjectMapper objectMapper, UserCreatedMessagePublisher publisher) {
-		return new UserCreatedMessageProvider(objectMapper, publisher);
+	MessageProducer messageProvider(ObjectMapper objectMapper, MessagePublisher publisher) {
+		return new MessageProducer(objectMapper, publisher);
 	}
 
 	@Bean
-	UserCreatedMessagePublisher messagePublisher(RabbitTemplate rabbitTemplate, TopicExchange topicExchange) {
-		return new UserCreatedMessagePublisher(rabbitTemplate, topicExchange);
+	MessagePublisher messagePublisher(RabbitTemplate rabbitTemplate, TopicExchange topicExchange) {
+		return new MessagePublisher(rabbitTemplate, topicExchange);
 	}
 
 	@Bean
-	SendMessageJob job(UserCreatedMessageProvider messageProvider) {
-		return new SendMessageJob(messageProvider);
+	SendMessageJob job(MessageProducer messageProducer) {
+		return new SendMessageJob(messageProducer);
 	}
 
 

pact/pact-message-producer/src/main/java/io/reflectoring/MessagePublisher.java

@@ -6,13 +6,13 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 /**
  * Publishes a String message to RabbitMQ.
  */
-class UserCreatedMessagePublisher {
+class MessagePublisher {
 
 	private RabbitTemplate rabbitTemplate;
 
 	private TopicExchange topicExchange;
 
-	UserCreatedMessagePublisher(RabbitTemplate rabbitTemplate, TopicExchange topicExchange) {
+	MessagePublisher(RabbitTemplate rabbitTemplate, TopicExchange topicExchange) {
 		this.rabbitTemplate = rabbitTemplate;
 		this.topicExchange = topicExchange;
 	}

pact/pact-message-producer/src/main/java/io/reflectoring/SendMessageJob.java

@@ -10,10 +10,10 @@ class SendMessageJob {
 
 	private Random random = new Random();
 
-	private UserCreatedMessageProvider messageProvider;
+	private MessageProducer messageProducer;
 
-	SendMessageJob(UserCreatedMessageProvider messageProvider) {
-		this.messageProvider = messageProvider;
+	SendMessageJob(MessageProducer messageProducer) {
+		this.messageProducer = messageProducer;
 	}
 
 	/**
@@ -29,7 +29,7 @@ class SendMessageJob {
 											.name("Zaphpod Beeblebrox")
 											.build())
 							.build();
-			messageProvider.sendUserCreatedMessage(userCreatedMessage);
+			messageProducer.produceUserCreatedMessage(userCreatedMessage);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}

pact/pact-message-producer/src/test/java/io/reflectoring/CustomAmqpTarget.java

@@ -10,6 +10,12 @@ import au.com.dius.pact.provider.ProviderVerifier;
 import au.com.dius.pact.provider.junit.target.AmqpTarget;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * Custom implementation of {@link AmqpTarget} since with {@link AmqpTarget}
+ * I had classpath troubles (see https://github.com/DiUS/pact-jvm/issues/763).
+ * Use at own risk, since the implementation is not complete and may behave
+ * a little different that the original class.
+ */
 public class CustomAmqpTarget extends AmqpTarget {
 
 	public CustomAmqpTarget(List<String> packagesToScan) {

pact/pact-message-producer/src/test/java/io/reflectoring/UserCreatedMessageProviderTest.java

@@ -8,16 +8,12 @@ import au.com.dius.pact.provider.PactVerifyProvider;
 import au.com.dius.pact.provider.junit.PactRunner;
 import au.com.dius.pact.provider.junit.Provider;
 import au.com.dius.pact.provider.junit.loader.PactFolder;
-import au.com.dius.pact.provider.junit.target.AmqpTarget;
 import au.com.dius.pact.provider.junit.target.Target;
 import au.com.dius.pact.provider.junit.target.TestTarget;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import static org.mockito.Mockito.*;
 
 @RunWith(PactRunner.class)
@@ -28,9 +24,9 @@ public class UserCreatedMessageProviderTest {
 	@TestTarget
 	public final Target target = new CustomAmqpTarget(Collections.singletonList("io.reflectoring"));
 
-	private UserCreatedMessagePublisher publisher = Mockito.mock(UserCreatedMessagePublisher.class);
+	private MessagePublisher publisher = Mockito.mock(MessagePublisher.class);
 
-	private UserCreatedMessageProvider messageProvider = new UserCreatedMessageProvider(new ObjectMapper(), publisher);
+	private MessageProducer messageProducer = new MessageProducer(new ObjectMapper(), publisher);
 
 	@PactVerifyProvider("a user created message")
 	public String verifyUserCreatedMessage() throws IOException {
@@ -45,7 +41,7 @@ public class UserCreatedMessageProviderTest {
 										.name("Zaphod Beeblebrox")
 										.build())
 						.build();
-		messageProvider.sendUserCreatedMessage(message);
+		messageProducer.produceUserCreatedMessage(message);
 
 		// then
 		ArgumentCaptor<String> messageCapture = ArgumentCaptor.forClass(String.class);

pact/pact-message-provider/README.md

@@ -1,15 +0,0 @@
-# Consumer-Driven-Contract Test for a Spring Boot Provider
- 
-This repo contains an example of consumer-driven-contract testing for a Spring
-Boot API provider. The corresponding consumer to the contract is
-implemented in the module `pact-angular`.
-
-The contract is created and verified with [Pact](https://docs.pact.io/).
-
-Before running the build, you need to follow the instructions on the [consumer-side](../pact-angular/)
-to create the consumer-driven contract file (pact file).
-
-## Running the application
-
-The interesting part in this code base is the class `UserControllerProviderTest`.
-You can run the tests with `gradlew test` on Windows or `./gradlew test` on Unix.

pact/pact-message-provider/src/main/java/io/reflectoring/UserCreatedMessageProvider.java

@@ -1,31 +0,0 @@
-package io.reflectoring;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Takes a {@link UserCreatedMessage}, converts it to a {@link String} and sends it to be published.
- */
-class UserCreatedMessageProvider {
-
-	private Logger logger = LoggerFactory.getLogger(UserCreatedMessageProvider.class);
-
-	private ObjectMapper objectMapper;
-
-	private UserCreatedMessagePublisher userCreatedMessagePublisher;
-
-	UserCreatedMessageProvider(ObjectMapper objectMapper, UserCreatedMessagePublisher userCreatedMessagePublisher) {
-		this.objectMapper = objectMapper;
-		this.userCreatedMessagePublisher = userCreatedMessagePublisher;
-	}
-
-	void sendUserCreatedMessage(UserCreatedMessage message) throws IOException {
-		String stringMessage = objectMapper.writeValueAsString(message);
-		userCreatedMessagePublisher.publishMessage(stringMessage, "user.created");
-		logger.info("Published message '{}'", stringMessage);
-	}
-
-}

pact/pact-message-provider/target/pacts/userclient-userservice.json

@@ -1,59 +0,0 @@
-{
-    "consumer": {
-        "name": "userclient"
-    },
-    "provider": {
-        "name": "userservice"
-    },
-    "messages": [
-        {
-            "description": "a user created message",
-            "metaData": {
-                "Content-Type": "application/json; charset=UTF-8"
-            },
-            "contents": {
-                "messageUuid": "string",
-                "user": {
-                    "name": "Zaphod Beeblebrox",
-                    "id": 42
-                }
-            },
-            "matchingRules": {
-                "body": {
-                    "$.messageUuid": {
-                        "matchers": [
-                            {
-                                "match": "type"
-                            }
-                        ],
-                        "combine": "AND"
-                    },
-                    "$.user.id": {
-                        "matchers": [
-                            {
-                                "match": "number"
-                            }
-                        ],
-                        "combine": "AND"
-                    },
-                    "$.user.name": {
-                        "matchers": [
-                            {
-                                "match": "type"
-                            }
-                        ],
-                        "combine": "AND"
-                    }
-                }
-            }
-        }
-    ],
-    "metadata": {
-        "pactSpecification": {
-            "version": "3.0.0"
-        },
-        "pact-jvm": {
-            "version": "3.5.20"
-        }
-    }
-}

pact/pact-node-messages/.gitignore

@@ -0,0 +1,24 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+.nyc_output/*
+coverage/*

pact/pact-node-messages/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "pact-node-messages",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test:pact:consumer": "mocha src/consumer/*.spec.js --exit",
+    "test:pact:provider": "mocha src/provider/*.spec.js --exit",
+    "publish:pact": "node pact/publish.js"
+  },
+  "author": "Tom Hombergs",
+  "license": "MIT",
+  "devDependencies": {
+    "@pact-foundation/pact": "^7.0.3",
+    "mocha": "^5.2.0"
+  }
+}

pact/pact-node-messages/pact/publish.js

@@ -0,0 +1,12 @@
+let publisher = require('@pact-foundation/pact-node');
+let path = require('path');
+
+let opts = {
+    pactFilesOrDirs: [path.resolve(process.cwd(), 'pacts')],
+    pactBroker: 'https://adesso.pact.dius.com.au/',
+    pactBrokerUsername: process.env.PACT_USERNAME,
+    pactBrokerPassword: process.env.PACT_PASSWORD,
+    consumerVersion: '2.0.0'
+};
+
+publisher.publishPacts(opts).then(() => console.log("Pacts successfully published"));

pact/pact-node-messages/pacts/node-message-consumer-node-message-provider.json

@@ -0,0 +1,63 @@
+{
+  "consumer": {
+    "name": "node-message-consumer"
+  },
+  "provider": {
+    "name": "node-message-provider"
+  },
+  "messages": [
+    {
+      "description": "a hero created message",
+      "providerStates": [
+
+      ],
+      "contents": {
+        "id": 42,
+        "name": "Superman",
+        "superpower": "flying",
+        "universe": "DC"
+      },
+      "matchingRules": {
+        "body": {
+          "$.id": {
+            "matchers": [
+              {
+                "match": "type"
+              }
+            ]
+          },
+          "$.name": {
+            "matchers": [
+              {
+                "match": "type"
+              }
+            ]
+          },
+          "$.superpower": {
+            "matchers": [
+              {
+                "match": "type"
+              }
+            ]
+          },
+          "$.universe": {
+            "matchers": [
+              {
+                "match": "regex",
+                "regex": "^(DC|Marvel)$"
+              }
+            ]
+          }
+        }
+      },
+      "metaData": {
+        "content-type": "application/json"
+      }
+    }
+  ],
+  "metadata": {
+    "pactSpecification": {
+      "version": "3.0.0"
+    }
+  }
+}

pact/pact-node-messages/src/common/hero-created-event.js

@@ -0,0 +1,35 @@
+class HeroCreatedEvent {
+
+    constructor(name, superpower, universe, id) {
+        this.id = id;
+        this.name = name;
+        this.superpower = superpower;
+        this.universe = universe;
+    }
+
+    static validateUniverse(event) {
+        if (typeof event.universe !== 'string') {
+            throw new Error(`Hero universe must be a string! Invalid value: ${event.universe}`)
+        }
+    }
+
+    static validateSuperpower(event) {
+        if (typeof event.superpower !== 'string') {
+            throw new Error(`Hero superpower must be a string! Invalid value: ${event.superpower}`)
+        }
+    }
+
+    static validateName(event) {
+        if (typeof event.name !== 'string') {
+            throw new Error(`Hero name must be a string! Invalid value: ${event.name}`);
+        }
+    }
+
+    static validateId(event) {
+        if (typeof event.id !== 'number') {
+            throw new Error(`Hero id must be a number! Invalid value: ${event.id}`)
+        }
+    }
+}
+
+module.exports = HeroCreatedEvent;

pact/pact-node-messages/src/consumer/hero-event-handler.js

@@ -0,0 +1,15 @@
+const HeroCreatedEvent = require('../common/hero-created-event');
+
+exports.HeroEventHandler = {
+    handleHeroCreatedEvent: (message) => {
+
+        HeroCreatedEvent.validateId(message);
+        HeroCreatedEvent.validateName(message);
+        HeroCreatedEvent.validateSuperpower(message);
+        HeroCreatedEvent.validateUniverse(message);
+
+        // pass message into business logic
+        // note that the business logic should be mocked away for the contract test
+
+    }
+};

pact/pact-node-messages/src/consumer/hero-event-handler.spec.js

@@ -0,0 +1,35 @@
+const {MessageConsumerPact, Matchers, synchronousBodyHandler} = require('@pact-foundation/pact');
+const {HeroEventHandler} = require('./hero-event-handler');
+const path = require('path');
+
+describe("message consumer", () => {
+
+    const messagePact = new MessageConsumerPact({
+        consumer: "node-message-consumer",
+        provider: "node-message-provider",
+        dir: path.resolve(process.cwd(), "pacts"),
+        pactfileWriteMode: "update",
+        logLevel: "info",
+    });
+
+    describe("'hero created' message Handler", () => {
+
+        it("should accept a valid hero created message", (done) => {
+            messagePact
+                .expectsToReceive("a hero created message")
+                .withContent({
+                    id: Matchers.like(42),
+                    name: Matchers.like("Superman"),
+                    superpower: Matchers.like("flying"),
+                    universe: Matchers.term({generate: "DC", matcher: "^(DC|Marvel)$"})
+                })
+                .withMetadata({
+                    "content-type": "application/json",
+                })
+                .verify(synchronousBodyHandler(HeroEventHandler.handleHeroCreatedEvent))
+                .then(() => done(), (error) => done(error));
+        }).timeout(5000);
+
+    });
+
+});

pact/pact-node-messages/src/provider/hero-event-producer.js

@@ -0,0 +1,9 @@
+const HeroCreatedEvent = require('../common/hero-created-event');
+
+exports.CreateHeroEventProducer = {
+    produceHeroCreatedEvent: () => {
+        return new Promise((resolve, reject) => {
+            resolve(new HeroCreatedEvent("Superman", "Flying", "DC", 42));
+        });
+    }
+};

pact/pact-node-messages/src/provider/hero-event-producer.spec.js

@@ -0,0 +1,37 @@
+const {MessageProviderPact} = require('@pact-foundation/pact');
+const {CreateHeroEventProducer} = require('./hero-event-producer');
+const path = require('path');
+
+describe("message producer", () => {
+
+    const messagePact = new MessageProviderPact({
+        messageProviders: {
+            "a hero created message": () => CreateHeroEventProducer.produceHeroCreatedEvent(),
+        },
+        log: path.resolve(process.cwd(), "logs", "pact.log"),
+        logLevel: "info",
+        provider: "node-message-provider",
+
+        pactUrls: [path.resolve(process.cwd(), "pacts", "node-message-consumer-node-message-provider.json")],
+
+        // Pact seems not to load a pact file from a pact broker, so we have to make do with the local pact file
+        // see https://github.com/pact-foundation/pact-js/issues/248
+        // pactBrokerUrl: "https://adesso.pact.dius.com.au",
+        // pactBrokerUsername: process.env.PACT_USERNAME,
+        // pactBrokerPassword: process.env.PACT_PASSWORD,
+        // publishVerificationResult: true,
+        // providerVersion: '1.0.0',
+        tags: ['latest']
+    });
+
+    describe("'hero created' message producer", () => {
+
+        it("should create a valid hero created message", (done) => {
+            messagePact
+                .verify()
+                .then(() => done(), (error) => done(error));
+        }).timeout(5000);
+
+    });
+
+});

pact/pact-node-provider/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

pact/pact-node-provider/README.md

@@ -0,0 +1,7 @@
+# Node Pact example
+
+This example project shows how to setup an Express server with Node and create
+a contract test for the provider side of a contract with Pact Node.   
+
+## Relevant Blog Post
+[Step By Step Tutorial for Implementing Consumer-Driven Contracts for a Node Express Server with Pact](https://reflectoring.io/pact-node-provider/)

pact/pact-node-provider/app.js

@@ -0,0 +1,29 @@
+const express = require('express');
+const path = require('path');
+const cookieParser = require('cookie-parser');
+const logger = require('morgan');
+
+const indexRouter = require('./routes/index');
+const usersRouter = require('./routes/users');
+const heroesRouter = require('./routes/heroes');
+const graphqlRouter = require('./routes/graphql');
+const providerStateRouter = require ('./routes/provider_state');
+
+const app = express();
+
+app.use(logger('dev'));
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(express.static(path.join(__dirname, 'public')));
+
+app.use('/', indexRouter);
+app.use('/users', usersRouter);
+app.use('/heroes', heroesRouter);
+app.use('/graphql', graphqlRouter);
+
+if (process.env.PACT_MODE === 'true') {
+    app.use('/provider-state', providerStateRouter);
+}
+
+module.exports = app;

pact/pact-node-provider/bin/www

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+var app = require('../app');
+var debug = require('debug')('test:server');
+var http = require('http');
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+var port = normalizePort(process.env.PORT || '3000');
+app.set('port', port);
+
+/**
+ * Create HTTP server.
+ */
+
+var server = http.createServer(app);
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on('error', onError);
+server.on('listening', onListening);
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+  var port = parseInt(val, 10);
+
+  if (isNaN(port)) {
+    // named pipe
+    return val;
+  }
+
+  if (port >= 0) {
+    // port number
+    return port;
+  }
+
+  return false;
+}
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+  if (error.syscall !== 'listen') {
+    throw error;
+  }
+
+  var bind = typeof port === 'string'
+    ? 'Pipe ' + port
+    : 'Port ' + port;
+
+  // handle specific listen errors with friendly messages
+  switch (error.code) {
+    case 'EACCES':
+      console.error(bind + ' requires elevated privileges');
+      process.exit(1);
+      break;
+    case 'EADDRINUSE':
+      console.error(bind + ' is already in use');
+      process.exit(1);
+      break;
+    default:
+      throw error;
+  }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+  var addr = server.address();
+  var bind = typeof addr === 'string'
+    ? 'pipe ' + addr
+    : 'port ' + addr.port;
+  debug('Listening on ' + bind);
+}