Merge 934f016 into 69b23f4

HLTech · Jun 17, 2020 · 324cb38 · 324cb38
2 parents 69b23f4 + 934f016
commit 324cb38
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 39 deletions.
diff --git a/judge-d-agent/src/test/groovy/com/hltech/judged/agent/ContractTestsGeneratorIT.groovy b/judge-d-agent/src/test/groovy/com/hltech/judged/agent/ContractTestsGeneratorIT.groovy
@@ -21,6 +21,6 @@ class ContractTestsGeneratorIT extends Specification {
 
     def "should generate pact file"() {
         expect:
-        pactGenerator.writePactFiles("com.hltech.contracts.judged.agent", "judge-d-agent", objectMapper, new File("target/pacts"))
+        pactGenerator.writePactFiles("com.hltech.judged.agent", "judge-d-agent", objectMapper, new File("target/pacts"))
     }
 }
diff --git a/judge-d-core/pom.xml b/judge-d-core/pom.xml
@@ -14,11 +14,6 @@
     <name>Judge-D-Core</name>
 
     <dependencies>
-        <dependency>
-            <groupId>com.atlassian.oai</groupId>
-            <artifactId>swagger-request-validator-pact</artifactId>
-            <version>2.10.0</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/...main/java/com/hltech/judged/server/domain/validation/mq/MqInterfaceContractValidator.java b/...main/java/com/hltech/judged/server/domain/validation/mq/MqInterfaceContractValidator.java
diff --git a/...est/groovy/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy b/...est/groovy/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy
@@ -60,4 +60,18 @@ class RestContractValidatorUT extends Specification {
                 }
             }
     }
+
+    def 'should validate contracts specified in openapi v3'() {
+        given:
+            def swagger = new String(toByteArray(getClass().getResourceAsStream("/swagger-openapi3.json")))
+            def pact = (RequestResponsePact) loadPact(getClass().getResourceAsStream("/pact.json"))
+        when:
+            def validationResult = validator.validate(pact, swagger)
+        then:
+            for (report in validationResult) {
+                with(report) {
+                    status == OK
+                }
+            }
+    }
 }
diff --git a/judge-d-server/src/test/resources/pact.json b/judge-d-server/src/test/resources/pact.json
@@ -0,0 +1,34 @@
+{
+  "provider": {
+    "name": "judge-d-server"
+  },
+  "consumer": {
+    "name": "judge-d-agent"
+  },
+  "interactions": [
+    {
+      "description": "publish request; 200 OK response",
+      "request": {
+        "method": "PUT",
+        "path": "environments/nPUmfl0iF1",
+        "headers": {
+          "X-JUDGE-D-AGENT-SPACE": "dli0ONzhUW"
+        },
+        "query": "",
+        "body": [
+          {
+            "name": "_uss5_lSrR",
+            "version": "6PPZwQAg8G"
+          }
+        ]
+      },
+      "response": {
+        "status": "200",
+        "headers": {}
+      }
+    }
+  ],
+  "metadata": {
+    "pactSpecificationVersion": "1.0.0"
+  }
+}
diff --git a/judge-d-server/src/test/resources/swagger-openapi3.json b/judge-d-server/src/test/resources/swagger-openapi3.json
@@ -0,0 +1,142 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/environments/{name}": {
+      "get": {
+        "tags": [
+          "environment-controller"
+        ],
+        "operationId": "getEnvironment",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ServiceDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "environment-controller"
+        ],
+        "operationId": "overwriteEnvironment",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "X-JUDGE-D-AGENT-SPACE",
+            "in": "header",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "default": "default"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "uniqueItems": true,
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ServiceForm"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/environments": {
+      "get": {
+        "tags": [
+          "environment-controller"
+        ],
+        "operationId": "getEnvironmentNames",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "ServiceForm": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          }
+        }
+      },
+      "ServiceDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <groovyAllVersion>2.4.7</groovyAllVersion>
+        <groovyAllVersion>2.4.12</groovyAllVersion>
         <lombokVersion>1.18.12</lombokVersion>
         <spockVersion>1.1-groovy-2.4</spockVersion>
         <version.number>1.${git.total.commit.count}.0_${git.commit.id.abbrev}</version.number>