Commit Graph

392 Commits

Author SHA1 Message Date
Marcin Grzejszczak
33c4c2a89d Trying to make the docs look nicer 2018-04-02 23:58:12 +02:00
Marcin Grzejszczak
6402e14f3c Added support for Stub Runner and Pact Broker
fixes gh-191
commit 533f1d3d0e8f6dcd37677bfef555fc2ea86bc1b1
Author: Tim Ysewyn <Tim.Ysewyn@me.com>
Date:   Wed Mar 7 15:56:48 2018 +0100

    Upgraded pact-jvm-model to 3.5.13
2018-04-02 22:50:40 +02:00
Tim Ysewyn
de529e222e Support for Pact v3 (#569)
* Upgraded pact-jvm-model to 3.5.13
* Enhanced the conversion of Spring Cloud contracts to Pact contracts using the v3 spec.
Introduces breaking change returning a list of `Pact`s instead of one.
* Enhanced the conversion of Pact contracts using the v3 spec tp Spring Cloud contracts.
* Implemented conversion of Pact v3 messaging to/from Spring Cloud contracts
* Updated code based on comments in the PR
* Added null matcher
* Added missing null matcher conversion from SCC to Pact
* Added number, integer and decimal matchers
* Added support for multiple matchers for the same json path.
Currently only the AND rule logic is supported.
* Added value generator functionality
* Refactored `stubMatchers` and `testMatchers` to support multiple types of "matcher groups", eg. header, path & query
* Refactored e37a8c5d82f96da6e1a698331afc62e6cf747bd6 in favor of a less invasive change using deprecation
* Added header matcher conversion
* Add/updated the ASF license header
* Fixed an issue with the header matchers while updating the documentation
* Updated the documentation
* Made some last minute changes to the `bodyMatchers`: `byNull()` isn't supported by WireMock

Closes #583
Fixes #595
2018-04-02 22:06:51 +02:00
Marcin Grzejszczak
0fe31ce3a5 Git Stub Downloader (#596)
when stubsMode is set to LOCAL or REMOTE, and repositoryRoot starts with git:// we can clone the provided git repository, and search for the folder with stubs for the given artifact. So if the git repo has a folder structure of groupid/artifactid/version (where group id is either dot or slash separated), then we will provide a path to that repository for the stub runner to harvest the stubs

- externalized versions
- added more debugging messages
- added ContractProjectUpdater that updates the project containing contracts from SCM. ATM supports only git
- added ResourceResolver that retrieves the ProtocolResolvers. It does it via spring.factories entries containing StubDownloaderBuilder. SDP extends ProtocolResovler.
added StubRunner.properties map, that will contain any properties that will be later used by any StubDownloader implementations
- added PUBLISH_STUBS_TO_SCM env var for Docker, so that publishStubsToScm task gets called
- updated docs

Breaking:

- StubDownloaderBuilder extends ProtocolResovler. By default the ProtocolResolver methods return null.
- stubRunnerOptions.stubRepositoryRoot is a Resource not a String
- generateWireMockClientStubs Gradle task got removed
- if folder with contracts has a subfolder called contracts, we will pick contracts from the subfolder

fixes #580
2018-03-31 09:35:00 +02:00
buildmaster
b9740e900d Going back to snapshots 2018-03-22 23:54:47 +00:00
buildmaster
501fefd389 Update SNAPSHOT to 2.0.0.M8 2018-03-22 23:52:03 +00:00
Marcin Grzejszczak
811a28deb1 Added documentation with a explicit mode sample and web app context sample; fixes gh-370 2018-03-21 16:26:42 +01:00
Marcin Grzejszczak
60d45b5ad3 Merge branch '1.2.x' 2018-03-19 16:32:15 +01:00
Marcin Grzejszczak
51564ab444 Discouraged users from using spring-cloud-contract-wiremock dependency directly
the preferred option is to use `spring-cloud-starter-stub-runner`

fixes gh-348
2018-03-19 16:31:12 +01:00
Marcin Grzejszczak
969cfe8573 Added an option to disable the wiremock rest tempalte customizer
with this change just set "wiremock.rest-template-ssl-enabled:false"  and the customizer will not be set up

fixes gh-413
2018-03-16 16:30:30 +01:00
Marcin Grzejszczak
7a38ab9867 Added the deleteStubsAfterTest flag to remove stubs after tests are finished
if `deleteStubsAfterTest` is set to false then stubs will NOT be deleted after tests are executed

fixes gh-512
2018-03-16 01:08:37 +01:00
Marcin Grzejszczak
b43204fb82 Merge branch '1.2.x' 2018-03-15 14:56:04 +01:00
Marcin Grzejszczak
c33ad02550 Added support for Docker and external contracts repo
These environment variables are used when contracts lay in an external repository. To enable
this feature you must set the `EXTERNAL_CONTRACTS_ARTIFACT_ID` environment variable.

- `EXTERNAL_CONTRACTS_GROUP_ID` - group id of the project with contracts. Defaults to `com.example`
- `EXTERNAL_CONTRACTS_ARTIFACT_ID`- artifact id of the project with contracts.
- `EXTERNAL_CONTRACTS_CLASSIFIER`- classifier of the project with contracts. Empty by default
- `EXTERNAL_CONTRACTS_VERSION` - version of the project with contracts. Defaults to `+`, equivalent to picking the latest
- `EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL` - URL of your Artifact Manager. Defaults to value of `REPO_WITH_BINARIES_URL` env var.
If that's not set, defaults to `http://localhost:8081/artifactory/libs-release-local`
which is the default URL of https://jfrog.com/artifactory/[Artifactory] running locally
- `EXTERNAL_CONTRACTS_PATH` - path to contracts for the given project, inside the project with contracts.
Defaults to slash separated `EXTERNAL_CONTRACTS_GROUP_ID` concatenated with `/` and `EXTERNAL_CONTRACTS_ARTIFACT_ID`. E.g.
for group id `foo.bar` and artifact id `baz`, would result in `foo/bar/baz` contracts path.
- `EXTERNAL_CONTRACTS_WORK_OFFLINE` - if set to `true` then will retrieve artifact with contracts
from the container's `.m2`. Mount your local `.m2` as a volume available at the container's `/root/.m2` path.
You must not set both `EXTERNAL_CONTRACTS_WORK_OFFLINE` and `EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL`.

fixes gh-576
2018-03-15 14:48:28 +01:00
Marcin Grzejszczak
8e4360535c Added HttpStatus delegate in the Groovy DSL Response
with this change there are numerous helper methods that should provide a more descriptive DSL for the response status. Instead of a numerical status you can now call a method e.g. instead of 200 call OK()

fixes gh-575
2018-03-15 10:00:45 +01:00
Marcin Grzejszczak
cd51d09ec4 Merge branch '1.2.x' 2018-03-13 18:07:16 +01:00
Marcin Grzejszczak
17c375a629 Updated docs to point to different branches 2018-03-13 17:51:08 +01:00
Marcin Grzejszczak
ab76b12edf Added one more ant pattern to gradle and maven plugins
The bug is related to the fact that initially, we were supporting slash-separated paths to projects. E.g. if the group id was `a.b.c` then we did checked for `a/b/c` folder. At certain point we've started building stubs with the `groupid` folder as such e.g. `a.b.c/artifact-id`. This is where the bug comes in. For Maven and Gradle we're using ant patterns for copying files. We're only providing the slash-separated ant pattern. With this fix, we're backward compatible (we're leaving the slash-separated one) and we're adding support for dot-delimited group id.

fixes gh-555
2018-03-13 17:51:08 +01:00
Marcin Grzejszczak
2740496d86 Added one more ant pattern to gradle and maven plugins
The bug is related to the fact that initially, we were supporting slash-separated paths to projects. E.g. if the group id was `a.b.c` then we did checked for `a/b/c` folder. At certain point we've started building stubs with the `groupid` folder as such e.g. `a.b.c/artifact-id`. This is where the bug comes in. For Maven and Gradle we're using ant patterns for copying files. We're only providing the slash-separated ant pattern. With this fix, we're backward compatible (we're leaving the slash-separated one) and we're adding support for dot-delimited group id.

fixes gh-555
2018-03-13 17:47:00 +01:00
Jay Bryant
399be7599c Editing pass for new content (#570)
Olga Maciaszek-Sharma added very nice content, in the form of a three-second and a three-minute introduction for the verifier. I edited her additions to conform to our usual standards and corporate voice.
2018-03-09 08:29:24 +01:00
Olga Maciaszek-Sharma
df76404095 Add short tours (#565)
* Fix links to contract-dsl section.
* Add three second tour.
* Add consumer side info in the three second tour.
* Add three-minute tour.
* Generate readme changes.
2018-03-07 15:00:37 -05:00
buildmaster
9c2d54453e Going back to snapshots 2018-02-27 01:35:53 +00:00
buildmaster
c0f773ecd3 Update SNAPSHOT to 2.0.0.M7 2018-02-27 01:30:18 +00:00
Oleksandr Nikytchuk
e69e43d8f4 [#500] Messaging contracts per topic (#536) 2018-02-19 14:21:39 +01:00
Marcin Grzejszczak
f6b6b43c9f Merge branch '1.2.x'
also accidentally fixed gh-507
2018-02-16 16:05:54 +01:00
Marcin Grzejszczak
c8ec61c1c2 Changed the snapshot skip test property 2018-02-16 14:06:33 +01:00
Marcin Grzejszczak
d87e669a23 Adding a mechanism to disable the local vs remote stub location
When fetching stubs / contracts in a CI, shared environment, what might happen is that
both the producer and the consumer reuse the same local Maven repository. Due to this,
the framework, responsible for downloading a stub JAR from remote location,
can't decide which JAR should be picked, local or remote one. That caused
the `"The artifact was found in the local repository but you have explicitly
stated that it should be downloaded from a remote one"` exception
and failed the build.

For such cases we're introducing the property mechanism:

- via `stubrunner.snapshot-check.skip` system property
- via `STUBRUNNER_SNAPSHOT_CHECK_SKIP` environment variable

if either of these values is set to `true`, then the stub downloader will not
verify the origin of the downloaded JAR.

fixes gh-545
2018-02-16 13:35:56 +01:00
buildmaster
a8e3b64fe6 Bumping versions to 1.2.4.BUILD-SNAPSHOT after release 2018-02-09 16:08:54 +00:00
buildmaster
ab660f8944 Going back to snapshots 2018-02-09 16:08:53 +00:00
buildmaster
c510a555b7 Update SNAPSHOT to 1.2.3.RELEASE 2018-02-09 15:54:44 +00:00
Marcin Grzejszczak
af463792ca Updated the docs 2018-01-29 15:19:06 +01:00
Marcin Grzejszczak
d80f31b72a Merge branch '1.2.x' 2018-01-25 12:50:49 +01:00
Marcin Grzejszczak
1808923b43 Fixed docker org name 2018-01-24 17:29:14 +01:00
Marcin Grzejszczak
37d7e8cfd3 Docker images (#527)
with this change we're adding generation of 2 docker images - verifier and stub runner
we also added a project `spring-cloud-contract-stub-runner-boot` which contains a far jar with stub runner boot

fixes gh-526, gh-516
2018-01-24 17:07:22 +01:00
Marcin Grzejszczak
65ee88aa23 Merge branch '1.2.x' 2018-01-19 01:18:33 +01:00
Marcin Grzejszczak
f486eeb85b Added 1.2.x to whitelist 2018-01-19 00:47:20 +01:00
Marcin Grzejszczak
b745d9a7e3 YAML contracts (#522)
with this change we allow the users to use YAML to define contracts

fixes gh-300 gh-508
helps with #501
2018-01-19 00:27:15 +01:00
buildmaster
b2428c5f13 Bumping versions to 1.2.3.BUILD-SNAPSHOT after release 2018-01-16 17:20:16 +00:00
buildmaster
f5561d3f9b Going back to snapshots 2018-01-16 17:20:15 +00:00
buildmaster
19deb01269 Update SNAPSHOT to 1.2.2.RELEASE 2018-01-16 17:09:51 +00:00
Dave Syer
92848125b9 Draft support for WebTestClient (#514)
* Draft support for WebTestClient
* Share some common code between MockMvc and WebTestClient
* Fix co-ordinates of server stubs
* Fix project names in Gradle
2018-01-12 15:12:31 +01:00
Marcin Grzejszczak
748e512f4d Introduces explicit mode of stub downloading (#503)
* Introduces explicit mode of stub downloading

you have to explicitly provide the mode [CLASSPATH, REMOTE, LOCAL] of how you want to fetch and register stubs

fixes gh-287
2018-01-03 08:25:29 +01:00
Marcin Grzejszczak
d6871beeb3 Added WireMockConfigurationCustomizer
with this change it's possible to customize the WireMockConfiguration set up by Spring Cloud Contract

fixes gh-502
2017-12-27 13:29:22 +01:00
Marcin Grzejszczak
6ed344e976 Added WireMockConfigurationCustomizer
with this change it's possible to customize the WireMockConfiguration set up by Spring Cloud Contract

fixes gh-502
2017-12-27 13:15:14 +01:00
Marcin Grzejszczak
80f0e66292 Revert "Revert "Merge branch 'master' into 2.0.x""
This reverts commit 822dd4b732.
2017-12-20 16:37:38 +01:00
Marcin Grzejszczak
822dd4b732 Revert "Merge branch 'master' into 2.0.x"
This reverts commit 63a1981f54, reversing
changes made to 0cca942e86.
2017-12-20 16:31:52 +01:00
buildmaster
2981b54b82 Going back to snapshots 2017-12-02 04:40:23 +00:00
buildmaster
9e5ac9020b Update SNAPSHOT to 2.0.0.M5 2017-12-02 04:37:52 +00:00
Spencer Gibb
07ed029919 Fix unresolved doc refs 2017-12-01 23:24:23 -05:00
Marcin Grzejszczak
8af7fb25c1 Merge branch 'master' into 2.0.x 2017-11-23 17:47:40 +01:00
Marcin Grzejszczak
786d504312 You can pass username & password explicitly to maven plugin
updated docs

fixes #462 #467
2017-11-23 17:47:31 +01:00