Merge pull request #36 from YOU54F/main

chore(deps): main - Java17 / Pact 4.6.5

Author: YOU54F

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+name: CI
+on:
+    push:
+        branches:
+            - main
+    pull_request:
+        branches:
+            - main
+jobs:
+    test:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Set up JDK 17
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 17
+                  distribution: 'temurin'
+
+            - name: Test consumer tests
+              run: ./gradlew consumer:test
+            - name: Test consumer pact tests
+              run: ./gradlew consumer:test --tests '*Pact*Test'
+            - uses: KengoTODA/actions-setup-docker-compose@v1
+              if: ${{ env.ACT }}
+              name: Install `docker-compose` for use with act
+              with:
+                version: '2.24.1'
+            - name: Start broker
+              run: docker-compose up -d
+            - name: Publish consumer pacts
+              run: ./gradlew consumer:test --tests '*PactTest*' pactPublish
+            - name: Test provider pact tests
+              run: ./gradlew provider:test --tests '*Pact*Test'

.gitignore

@@ -3,7 +3,8 @@ build/
 !../gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-
+consumer/bin
+provider/bin
 provider/src/test/resources/pacts
 
 ### STS ###
@@ -47,3 +48,7 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
+
+## MacOS
+
+.DS_Store

.java-version

@@ -0,0 +1 @@
+17.0

README.md

@@ -317,14 +317,14 @@ This test starts a mock server on a random port that acts as our provider servic
 To run only the Pact tests:
 
 ```console
-> ./gradlew consumer:test --tests *PactTest
+> ./gradlew consumer:test --tests '*PactTest'
 
 ```
 
 Running this test still passes, but it creates a pact file which we can use to validate our assumptions on the provider side, and have conversation around.
 
 ```console
-❯ ./gradlew consumer:test --tests *PactTest
+❯ ./gradlew consumer:test --tests '*PactTest'
   
   BUILD SUCCESSFUL in 6s
 ```
@@ -386,13 +386,13 @@ public class ProductPactProviderTest {
 To run only the verification tests:
 
 ```console
-> ./gradlew provider:test --tests *Pact*Test
+> ./gradlew provider:test --tests '*Pact*Test'
 ```
 
 We now need to validate the pact generated by the consumer is valid, by executing it against the running service provider, which should fail:
 
 ```console
-❯ ./gradlew provider:test --tests *Pact*Test
+❯ ./gradlew provider:test --tests '*Pact*Test'
 
 ...
 ...
@@ -476,7 +476,7 @@ Copy the updated contract located in `consumer/build/pacts/FrontendApplication-P
 Run the command:
 
 ```console
-❯ ./gradlew provider:test --tests *Pact*Test
+❯ ./gradlew provider:test --tests '*Pact*Test'
 
 ...
 ...
@@ -545,14 +545,14 @@ In `consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPact
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("11"));
-        assertEquals(404, e.getRawStatusCode());
+        assertEquals(404, e.getStatusCode().value());
     }
 ```
 
 Notice that our new tests look almost identical to our previous tests, and only differ on the expectations of the _response_ - the HTTP request expectations are exactly the same.
 
 ```console
-❯ ./gradlew consumer:test --tests *PactTest
+❯ ./gradlew consumer:test --tests '*PactTest'
   
   BUILD SUCCESSFUL in 1s
 ```
@@ -568,7 +568,7 @@ What does our provider have to say about this new test. Again, copy the updated
 and run the command:
 
 ```console
-❯ ./gradlew provider:test --tests *Pact*Test
+❯ ./gradlew provider:test --tests '*Pact*Test'
 
 ...
 ...
@@ -818,7 +818,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getAllProducts());
-    assertEquals(401, e.getRawStatusCode());
+    assertEquals(401, e.getStatusCode().value());
   }
 
   @Test
@@ -846,7 +846,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getProduct("11"));
-    assertEquals(404, e.getRawStatusCode());
+    assertEquals(404, e.getStatusCode().value());
   }
 
   @Test
@@ -858,7 +858,7 @@ public class ProductConsumerPactTest {
 
     HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
       () -> new ProductService(restTemplate).getProduct("10"));
-    assertEquals(401, e.getRawStatusCode());
+    assertEquals(401, e.getStatusCode().value());
   }
 
   private Map<String, String> headers() {
@@ -1084,7 +1084,7 @@ pact {
 		pactBrokerUrl = 'http://localhost:8000/'
 		pactBrokerUsername = getOrDefault('PACT_BROKER_USERNAME', 'pact_workshop')
 		pactBrokerPassword = getOrDefault('PACT_BROKER_PASSWORD', 'pact_workshop')
-		tags = [getGitBranch(), 'test', 'prod']
+		consumerBranch = getGitBranch()
 		consumerVersion = getGitHash()
 	}
 }
@@ -1093,10 +1093,11 @@ pact {
 Now run
 
 ```console
-❯ ./gradlew consumer:test --tests *PactTest* pactPublish
+❯ ./gradlew consumer:test --tests '*PactTest*' pactPublish
   
   > Task :consumer:pactPublish
-  Publishing 'FrontendApplication-ProductService.json' with tags step11, test, prod ... OK
+  Publishing 'FrontendApplication-ProductService.json'
+  OK
   
   BUILD SUCCESSFUL in 11s
 
@@ -1150,9 +1151,9 @@ def getGitBranch = { ->
 test {
     useJUnitPlatform()
 
+    systemProperty 'pact.provider.branch', getGitBranch()
     if (System.getProperty('pactPublishResults') == 'true') {
         systemProperty 'pact.provider.version', getGitHash()
-        systemProperty 'pact.provider.tag', getGitBranch()
         systemProperty 'pact.verifier.publishResults', 'true'
     }
 }

consumer/build.gradle

@@ -3,19 +3,21 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'au.com.dius.pact.provider:gradle:4.1.7'
+		classpath 'au.com.dius.pact.provider:gradle:4.6.5'
 	}
 }
 
 plugins {
-	id 'org.springframework.boot' version '2.3.4.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id 'au.com.dius.pact' version '4.1.7'
+	// Stopped from moving to 3.2.x due to wiremock issue
+	// https://github.com/wiremock/wiremock/issues/2395
+	id 'org.springframework.boot' version '3.1.8'
+	id 'io.spring.dependency-management' version '1.1.4'
+	id 'au.com.dius.pact' version '4.6.5'
 }
 
 group = 'au.com.dius.pactworkshop'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '8'
+sourceCompatibility = '17'
 
 
 
@@ -26,9 +28,8 @@ dependencies {
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
-	testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
-	testImplementation 'au.com.dius.pact.consumer:java8:4.1.7'
-	testImplementation 'au.com.dius.pact.consumer:junit5:4.1.7'
+	testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
+	testImplementation 'au.com.dius.pact.consumer:junit5:4.6.5'
 }
 
 test {
@@ -70,7 +71,7 @@ pact {
 		pactBrokerUrl = 'http://localhost:8000/'
 		pactBrokerUsername = 'pact_workshop'
 		pactBrokerPassword = 'pact_workshop'
-		tags = [getGitBranch(), 'test', 'prod']
+		consumerBranch = getGitBranch()
 		consumerVersion = getGitHash()
 	}
 }

consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java

@@ -11,15 +11,15 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
-
+import au.com.dius.pact.core.model.PactSpecVersion; // required for v4.6.x to set pactVersion
 import java.util.Collections;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static io.pactfoundation.consumer.dsl.LambdaDsl.newJsonArrayMinLike;
-import static io.pactfoundation.consumer.dsl.LambdaDsl.newJsonBody;
+import static au.com.dius.pact.consumer.dsl.LambdaDsl.newJsonArrayMinLike;
+import static au.com.dius.pact.consumer.dsl.LambdaDsl.newJsonBody;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -113,7 +113,7 @@ RequestResponsePact singleProductnoAuthToken(PactDslWithProvider builder) {
     }
 
     @Test
-    @PactTestFor(pactMethod = "getAllProducts")
+    @PactTestFor(pactMethod = "getAllProducts", pactVersion = PactSpecVersion.V3)
     void getAllProducts_whenProductsExist(MockServer mockServer) {
         Product product = new Product();
         product.setId("09");
@@ -130,7 +130,7 @@ void getAllProducts_whenProductsExist(MockServer mockServer) {
     }
 
     @Test
-    @PactTestFor(pactMethod = "noProductsExist")
+    @PactTestFor(pactMethod = "noProductsExist", pactVersion = PactSpecVersion.V3)
     void getAllProducts_whenNoProductsExist(MockServer mockServer) {
         RestTemplate restTemplate = new RestTemplateBuilder()
                 .rootUri(mockServer.getUrl())
@@ -141,19 +141,19 @@ void getAllProducts_whenNoProductsExist(MockServer mockServer) {
     }
 
     @Test
-    @PactTestFor(pactMethod = "allProductsNoAuthToken")
+    @PactTestFor(pactMethod = "allProductsNoAuthToken", pactVersion = PactSpecVersion.V3)
     void getAllProducts_whenNoAuth(MockServer mockServer) {
         RestTemplate restTemplate = new RestTemplateBuilder()
                 .rootUri(mockServer.getUrl())
                 .build();
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getAllProducts());
-        assertEquals(401, e.getRawStatusCode());
+        assertEquals(401, e.getStatusCode().value());
     }
 
     @Test
-    @PactTestFor(pactMethod = "getOneProduct")
+    @PactTestFor(pactMethod = "getOneProduct", pactVersion = PactSpecVersion.V3)
     void getProductById_whenProductWithId10Exists(MockServer mockServer) {
         Product expected = new Product();
         expected.setId("10");
@@ -169,27 +169,27 @@ void getProductById_whenProductWithId10Exists(MockServer mockServer) {
     }
 
     @Test
-    @PactTestFor(pactMethod = "productDoesNotExist")
+    @PactTestFor(pactMethod = "productDoesNotExist", pactVersion = PactSpecVersion.V3)
     void getProductById_whenProductWithId11DoesNotExist(MockServer mockServer) {
         RestTemplate restTemplate = new RestTemplateBuilder()
                 .rootUri(mockServer.getUrl())
                 .build();
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("11"));
-        assertEquals(404, e.getRawStatusCode());
+        assertEquals(404, e.getStatusCode().value());
     }
 
     @Test
-    @PactTestFor(pactMethod = "singleProductnoAuthToken")
+    @PactTestFor(pactMethod = "singleProductnoAuthToken", pactVersion = PactSpecVersion.V3)
     void getProductById_whenNoAuth(MockServer mockServer) {
         RestTemplate restTemplate = new RestTemplateBuilder()
                 .rootUri(mockServer.getUrl())
                 .build();
 
         HttpClientErrorException e = assertThrows(HttpClientErrorException.class,
                 () -> new ProductService(restTemplate).getProduct("10"));
-        assertEquals(401, e.getRawStatusCode());
+        assertEquals(401, e.getStatusCode().value());
     }
 
     private Map<String, String> headers() {

docker-compose.yaml

@@ -12,16 +12,21 @@ services:
       POSTGRES_PASSWORD: password
       POSTGRES_DB: postgres
 
-  broker_app:
-    image: pactfoundation/pact-broker
+  pact-broker:
+    image: pactfoundation/pact-broker:latest-multi
     links:
       - postgres
     ports:
       - 8000:9292
+    restart: always
     environment:
       PACT_BROKER_BASIC_AUTH_USERNAME: pact_workshop
       PACT_BROKER_BASIC_AUTH_PASSWORD: pact_workshop
       PACT_BROKER_DATABASE_USERNAME: postgres
       PACT_BROKER_DATABASE_PASSWORD: password
       PACT_BROKER_DATABASE_HOST: postgres
       PACT_BROKER_DATABASE_NAME: postgres
+      PACT_BROKER_DATABASE_CONNECT_MAX_RETRIES: "10"
+      PACT_BROKER_PUBLIC_HEARTBEAT: "true"
+      PACT_BROKER_WEBHOOK_SCHEME_WHITELIST: http
+      PACT_BROKER_WEBHOOK_HOST_WHITELIST: host.docker.internal

gradle/wrapper/gradle-wrapper.properties

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

provider/build.gradle

@@ -1,20 +1,21 @@
 plugins {
-    id 'org.springframework.boot' version '2.3.4.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+    id 'org.springframework.boot' version '3.2.2'
+    id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'au.com.dius.pactworkshop'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '8'
+sourceCompatibility = '17'
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-
+    implementation 'org.apache.httpcomponents:httpcore:4.4.1'
+    implementation 'org.apache.httpcomponents:httpclient:4.5'
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
-    testImplementation("au.com.dius.pact.provider:junit5:4.1.7")
+    testImplementation("au.com.dius.pact.provider:junit5:4.6.5")
 }
 
 def getGitHash = { ->
@@ -38,9 +39,9 @@ def getGitBranch = { ->
 test {
     useJUnitPlatform()
 
+    systemProperty 'pact.provider.branch', getGitBranch()
     if (System.getProperty('pactPublishResults') == 'true') {
         systemProperty 'pact.provider.version', getGitHash()
-        systemProperty 'pact.provider.tag', getGitBranch()
         systemProperty 'pact.verifier.publishResults', 'true'
     }
 }