pact_broker 2.73.0 → 2.76.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +8 -2
- data/.optic/.gitignore +2 -0
- data/.optic/api/specification.json +1 -0
- data/.optic/ignore +14 -0
- data/CHANGELOG.md +56 -0
- data/DEVELOPER_SETUP.md +9 -0
- data/Dockerfile +1 -0
- data/ISSUES.md +3 -3
- data/README.md +2 -2
- data/config/database.yml +1 -1
- data/db/migrations/20210115_add_webhook_foreign_key_indexes.rb +49 -0
- data/db/migrations/20210116_add_context_to_triggered_webhook.rb +11 -0
- data/db/migrations/migration_helper.rb +8 -0
- data/docker-compose-issue-repro-with-pact-broker-docker-image.yml +33 -0
- data/docker-compose-test.yml +4 -4
- data/lib/pact_broker/api.rb +13 -2
- data/lib/pact_broker/api/decorators.rb +3 -7
- data/lib/pact_broker/api/decorators/configuration.rb +33 -0
- data/lib/pact_broker/api/decorators/decorator_context_creator.rb +13 -0
- data/lib/pact_broker/api/decorators/matrix_decorator.rb +5 -1
- data/lib/pact_broker/api/decorators/pact_collection_decorator.rb +1 -0
- data/lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb +2 -3
- data/lib/pact_broker/api/decorators/reason_decorator.rb +4 -2
- data/lib/pact_broker/api/decorators/verifiable_pact_decorator.rb +3 -1
- data/lib/pact_broker/api/pact_broker_urls.rb +3 -3
- data/lib/pact_broker/api/paths.rb +5 -0
- data/lib/pact_broker/api/renderers/html_pact_renderer.rb +2 -2
- data/lib/pact_broker/api/resources/all_webhooks.rb +3 -3
- data/lib/pact_broker/api/resources/can_i_deploy_badge.rb +1 -1
- data/lib/pact_broker/api/resources/dashboard.rb +2 -2
- data/lib/pact_broker/api/resources/default_base_resource.rb +37 -12
- data/lib/pact_broker/api/resources/error_response_body_generator.rb +41 -0
- data/lib/pact_broker/api/resources/group.rb +1 -1
- data/lib/pact_broker/api/resources/integrations.rb +1 -1
- data/lib/pact_broker/api/resources/label.rb +1 -1
- data/lib/pact_broker/api/resources/latest_pact.rb +2 -2
- data/lib/pact_broker/api/resources/latest_pacts.rb +1 -1
- data/lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb +2 -2
- data/lib/pact_broker/api/resources/matrix.rb +2 -2
- data/lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb +1 -1
- data/lib/pact_broker/api/resources/metadata_resource_methods.rb +2 -1
- data/lib/pact_broker/api/resources/pact.rb +2 -2
- data/lib/pact_broker/api/resources/pact_triggered_webhooks.rb +1 -1
- data/lib/pact_broker/api/resources/pact_versions.rb +1 -1
- data/lib/pact_broker/api/resources/pact_webhooks.rb +3 -3
- data/lib/pact_broker/api/resources/pact_webhooks_status.rb +2 -2
- data/lib/pact_broker/api/resources/pacticipant.rb +1 -1
- data/lib/pact_broker/api/resources/pacticipants.rb +3 -3
- data/lib/pact_broker/api/resources/pacticipants_for_label.rb +1 -1
- data/lib/pact_broker/api/resources/previous_distinct_pact_version.rb +1 -1
- data/lib/pact_broker/api/resources/provider_pacts.rb +1 -7
- data/lib/pact_broker/api/resources/provider_pacts_for_verification.rb +2 -2
- data/lib/pact_broker/api/resources/relationships.rb +1 -1
- data/lib/pact_broker/api/resources/tag.rb +1 -1
- data/lib/pact_broker/api/resources/tagged_pact_versions.rb +1 -1
- data/lib/pact_broker/api/resources/verification.rb +2 -2
- data/lib/pact_broker/api/resources/verification_triggered_webhooks.rb +1 -1
- data/lib/pact_broker/api/resources/verifications.rb +1 -1
- data/lib/pact_broker/api/resources/version.rb +1 -1
- data/lib/pact_broker/api/resources/versions.rb +1 -1
- data/lib/pact_broker/api/resources/webhook.rb +2 -2
- data/lib/pact_broker/api/resources/webhook_execution.rb +4 -4
- data/lib/pact_broker/api/resources/webhook_execution_methods.rb +1 -3
- data/lib/pact_broker/api/resources/webhooks.rb +3 -3
- data/lib/pact_broker/app.rb +11 -3
- data/lib/pact_broker/application_context.rb +41 -0
- data/lib/pact_broker/doc/controllers/app.rb +3 -2
- data/lib/pact_broker/domain/version.rb +13 -6
- data/lib/pact_broker/domain/webhook_request.rb +1 -1
- data/lib/pact_broker/error.rb +0 -2
- data/lib/pact_broker/errors.rb +28 -0
- data/lib/pact_broker/errors/error_logger.rb +25 -0
- data/lib/pact_broker/pacts/metadata.rb +53 -6
- data/lib/pact_broker/pacts/repository.rb +20 -18
- data/lib/pact_broker/pacts/selector.rb +22 -0
- data/lib/pact_broker/pacts/selectors.rb +4 -0
- data/lib/pact_broker/pacts/verifiable_pact.rb +22 -0
- data/lib/pact_broker/pacts/verifiable_pact_messages.rb +1 -1
- data/lib/pact_broker/services.rb +106 -31
- data/lib/pact_broker/test/http_test_data_builder.rb +88 -21
- data/lib/pact_broker/test/test_data_builder.rb +3 -2
- data/lib/pact_broker/ui/app.rb +6 -0
- data/lib/pact_broker/ui/controllers/base_controller.rb +5 -1
- data/lib/pact_broker/ui/controllers/pacts.rb +18 -0
- data/lib/pact_broker/ui/views/index/_getting-started.haml +1 -1
- data/lib/pact_broker/ui/views/index/show-with-tags.haml +16 -16
- data/lib/pact_broker/ui/views/index/show.haml +6 -6
- data/lib/pact_broker/ui/views/layouts/main.haml +2 -2
- data/lib/pact_broker/ui/views/matrix/show.haml +32 -33
- data/lib/pact_broker/version.rb +1 -1
- data/lib/pact_broker/webhooks/execution_configuration.rb +4 -0
- data/lib/pact_broker/webhooks/execution_configuration_creator.rb +14 -0
- data/lib/pact_broker/webhooks/repository.rb +3 -2
- data/lib/pact_broker/webhooks/service.rb +2 -1
- data/lib/pact_broker/webhooks/triggered_webhook.rb +1 -0
- data/lib/rack/pact_broker/set_base_url.rb +22 -0
- data/optic.yml +5 -0
- data/pact_broker.gemspec +1 -1
- data/public/css/bootstrap-grid.css +3719 -0
- data/public/css/bootstrap-grid.css.map +1 -0
- data/public/css/bootstrap-grid.min.css +7 -0
- data/public/css/bootstrap-grid.min.css.map +1 -0
- data/public/css/bootstrap-reboot.css +331 -0
- data/public/css/bootstrap-reboot.css.map +1 -0
- data/public/css/bootstrap-reboot.min.css +8 -0
- data/public/css/bootstrap-reboot.min.css.map +1 -0
- data/public/css/bootstrap.css +8885 -5604
- data/public/css/bootstrap.css.map +1 -1
- data/public/css/bootstrap.min.css +4 -3
- data/public/css/bootstrap.min.css.map +1 -1
- data/public/images/alert.svg +1 -0
- data/public/images/arrow-switch.svg +1 -0
- data/public/images/check.svg +1 -0
- data/public/images/clock.svg +1 -0
- data/public/images/copy.svg +1 -0
- data/public/images/kebab-horizontal.svg +1 -0
- data/public/javascripts/clipboard.js +3 -3
- data/public/javascripts/{jquery-3.3.1.js → jquery-3.5.1.js} +1150 -642
- data/public/javascripts/jquery-3.5.1.min.js +2 -0
- data/public/javascripts/jquery-3.5.1.min.map +1 -0
- data/public/javascripts/matrix.js +2 -2
- data/public/js/bootstrap.bundle.js +7013 -0
- data/public/js/bootstrap.bundle.js.map +1 -0
- data/public/js/bootstrap.bundle.min.js +7 -0
- data/public/js/bootstrap.bundle.min.js.map +1 -0
- data/public/js/bootstrap.js +3862 -1804
- data/public/js/bootstrap.js.map +1 -0
- data/public/js/bootstrap.min.js +6 -6
- data/public/js/bootstrap.min.js.map +1 -0
- data/public/stylesheets/index.css +56 -3
- data/public/stylesheets/matrix.css +55 -5
- data/public/stylesheets/pact.css +14 -0
- data/regression/.gitignore +1 -0
- data/regression/can_i_deploy_spec.rb +42 -0
- data/regression/regression_helper.rb +37 -0
- data/regression/script/approval-all.sh +6 -0
- data/script/exercise-api-for-optic.sh +3 -0
- data/script/reproduce-issue.rb +16 -8
- data/spec/integration/ui/index_spec.rb +4 -4
- data/spec/lib/pact_broker/api/decorators/reason_decorator_spec.rb +6 -6
- data/spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb +5 -7
- data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb +2 -6
- data/spec/lib/pact_broker/api/resources/can_i_deploy_badge_spec.rb +1 -1
- data/spec/lib/pact_broker/api/resources/default_base_resource_spec.rb +59 -10
- data/spec/lib/pact_broker/api/resources/error_response_body_generator_spec.rb +69 -0
- data/spec/lib/pact_broker/db/log_quietener_spec.rb +1 -1
- data/spec/lib/pact_broker/doc/controllers/app_spec.rb +3 -5
- data/spec/lib/pact_broker/errors/error_logger_spec.rb +62 -0
- data/spec/lib/pact_broker/errors_spec.rb +55 -0
- data/spec/lib/pact_broker/pacts/metadata_spec.rb +73 -0
- data/spec/lib/pact_broker/pacts/repository_find_for_verification_fallback_spec.rb +2 -2
- data/spec/lib/pact_broker/pacts/repository_find_for_verification_spec.rb +33 -13
- data/spec/lib/pact_broker/pacts/repository_find_wip_pact_versions_for_provider_spec.rb +26 -0
- data/spec/lib/pact_broker/webhooks/repository_spec.rb +5 -2
- data/spec/lib/pact_broker/webhooks/service_spec.rb +2 -1
- data/tasks/rspec.rake +6 -0
- metadata +59 -17
- data/public/css/bootstrap-theme.css +0 -587
- data/public/css/bootstrap-theme.css.map +0 -1
- data/public/css/bootstrap-theme.min.css +0 -6
- data/public/css/bootstrap-theme.min.css.map +0 -1
- data/public/fonts/glyphicons-halflings-regular.svg +0 -288
- data/public/javascripts/jquery-3.3.1.min.js +0 -2
- data/public/javascripts/jquery-3.3.1.min.map +0 -1
- data/spec/lib/pact_broker/api/resources/error_handler_spec.rb +0 -211
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a1ab8b654502c5bbc4d263c4bd14fdb0e6dc3771173cfdf21a01118143528bd4
|
4
|
+
data.tar.gz: b1d929d7bfe56369c5985b94ad88f9adf3abdb27e9177b6249ba7cd68d03c85d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ca79f6928c69425d89d0fa179094d007f26d5f25f02ee7fc2be771bb4208d2ecaef136af5391feea4c92588876e7162d205774451d00f9175463f03b9f1cdcd9
|
7
|
+
data.tar.gz: febb82748bb5929d393af212797a3d9c484c9825a8c83bc44e4d52aa7cb6fbce93863decb305a7d6ed3160a3b447bed6368339a38322f6084fb34de97f3698cc
|
data/.github/workflows/test.yml
CHANGED
@@ -5,12 +5,18 @@ on: push
|
|
5
5
|
jobs:
|
6
6
|
sqlite:
|
7
7
|
runs-on: "ubuntu-latest"
|
8
|
+
continue-on-error: ${{ matrix.experimental }}
|
8
9
|
strategy:
|
10
|
+
fail-fast: false
|
9
11
|
matrix:
|
10
12
|
ruby_version: ["2.7"]
|
13
|
+
experimental: [false]
|
14
|
+
include:
|
15
|
+
- ruby_version: "3.0"
|
16
|
+
experimental: true
|
11
17
|
steps:
|
12
18
|
- uses: actions/checkout@v2
|
13
|
-
- uses:
|
19
|
+
- uses: ruby/setup-ruby@v1
|
14
20
|
with:
|
15
21
|
ruby-version: ${{ matrix.ruby_version }}
|
16
22
|
- run: "bundle install"
|
@@ -34,7 +40,7 @@ jobs:
|
|
34
40
|
- 5432:5432
|
35
41
|
steps:
|
36
42
|
- uses: actions/checkout@v2
|
37
|
-
- uses:
|
43
|
+
- uses: ruby/setup-ruby@v1
|
38
44
|
with:
|
39
45
|
ruby-version: ${{ matrix.ruby_version }}
|
40
46
|
- run: "gem install bundler && bundle install"
|
data/.optic/.gitignore
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
[]
|
data/.optic/ignore
ADDED
@@ -0,0 +1,14 @@
|
|
1
|
+
# Default Ignore Rules
|
2
|
+
# Learn to configure your own at https://useoptic.com/docs
|
3
|
+
OPTIONS *
|
4
|
+
HEAD *
|
5
|
+
GET (.*).htm
|
6
|
+
GET (.*).html
|
7
|
+
GET (.*).css
|
8
|
+
GET (.*).js
|
9
|
+
GET (.*).woff
|
10
|
+
GET (.*).png
|
11
|
+
GET (.*).jpg
|
12
|
+
GET (.*).jpeg
|
13
|
+
GET (.*).svg
|
14
|
+
GET (.*).gif
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,59 @@
|
|
1
|
+
<a name="v2.76.1"></a>
|
2
|
+
### v2.76.1 (2021-01-28)
|
3
|
+
|
4
|
+
#### Bug Fixes
|
5
|
+
|
6
|
+
* deduplicate wip pacts by content ([0af90776](/../../commit/0af90776))
|
7
|
+
* message when pending pact is verified successfully for the first time (#376) ([4fc69190](/../../commit/4fc69190))
|
8
|
+
* use base URL from rack env in UI ([5bf21324](/../../commit/5bf21324))
|
9
|
+
|
10
|
+
<a name="v2.76.0"></a>
|
11
|
+
### v2.76.0 (2021-01-21)
|
12
|
+
|
13
|
+
#### Features
|
14
|
+
|
15
|
+
* **verification results**
|
16
|
+
* redirect requests for verification results to the HAL browser if requested in a web browser ([0f948de5](/../../commit/0f948de5))
|
17
|
+
|
18
|
+
<a name="v2.75.0"></a>
|
19
|
+
### v2.75.0 (2021-01-18)
|
20
|
+
|
21
|
+
#### Features
|
22
|
+
|
23
|
+
* upgrade bootstrap (#370) ([a457c337](/../../commit/a457c337))
|
24
|
+
* add indexes to webhook_executions and triggered_webhooks tables ([b05e7dbe](/../../commit/b05e7dbe))
|
25
|
+
|
26
|
+
* **webhook**
|
27
|
+
* set read and open timeouts ([8b502c44](/../../commit/8b502c44))
|
28
|
+
|
29
|
+
#### Bug Fixes
|
30
|
+
|
31
|
+
* **ui**
|
32
|
+
* upgrade to jquery-3.5.1 to address vulnerabilities in jquery-3.3.1 ([de41b231](/../../commit/de41b231))
|
33
|
+
|
34
|
+
* **deps**
|
35
|
+
* upgrade redcarpet for CVE-2020-26298 ([b57aad32](/../../commit/b57aad32))
|
36
|
+
|
37
|
+
<a name="v2.74.1"></a>
|
38
|
+
### v2.74.1 (2021-01-05)
|
39
|
+
|
40
|
+
#### Bug Fixes
|
41
|
+
|
42
|
+
* **deps**
|
43
|
+
* remove manual specification for nokogiri now the fix for CVE-2020-26247 has been released in 1.11 ([771378a9](/../../commit/771378a9))
|
44
|
+
|
45
|
+
<a name="v2.74.0"></a>
|
46
|
+
### v2.74.0 (2021-01-04)
|
47
|
+
|
48
|
+
#### Features
|
49
|
+
|
50
|
+
* include the consumer version selectors in the metadata of the 'pact for verification' URL ([32bbe1c3](/../../commit/32bbe1c3))
|
51
|
+
|
52
|
+
#### Bug Fixes
|
53
|
+
|
54
|
+
* **deps**
|
55
|
+
* update nokogiri for CVE-2020-26247 ([336ec897](/../../commit/336ec897))
|
56
|
+
|
1
57
|
<a name="v2.73.0"></a>
|
2
58
|
### v2.73.0 (2020-12-16)
|
3
59
|
|
data/DEVELOPER_SETUP.md
CHANGED
@@ -68,6 +68,13 @@ bundle exec rake
|
|
68
68
|
# if you don't want to run the whole rake test suite, init the db first
|
69
69
|
/home/init-db.sh
|
70
70
|
```
|
71
|
+
|
72
|
+
Running a mysql client in the mysql-tests container:
|
73
|
+
|
74
|
+
```
|
75
|
+
mysql -hmysql -upact_broker -ppact_broker
|
76
|
+
```
|
77
|
+
|
71
78
|
## Running the tests
|
72
79
|
|
73
80
|
* To run everything (specs, pact verifications, vulnerability scan...):
|
@@ -87,5 +94,7 @@ bundle exec rake
|
|
87
94
|
bundle exec rspec path_to_your_spec.rb
|
88
95
|
```
|
89
96
|
|
97
|
+
NOTE: the spec tasks requires the `db:prepare:test` task to be executed at least once prior to running.
|
98
|
+
|
90
99
|
[chruby]: https://github.com/postmodern/chruby
|
91
100
|
[ruby-install]: https://github.com/postmodern/ruby-install
|
data/Dockerfile
CHANGED
data/ISSUES.md
CHANGED
@@ -8,16 +8,16 @@ You can use it to easily reproduce issues.
|
|
8
8
|
|
9
9
|
To use it:
|
10
10
|
|
11
|
-
* Run the Pact Broker using the
|
11
|
+
* Run the Pact Broker using a specific Pact Broker Docker image by setting the required tag for the pact-broker service in the docker-compose-issue-repro-with-pact-broker-docker-image.yml file.
|
12
12
|
|
13
13
|
```
|
14
|
-
docker-compose -f docker-compose-issue-repro.yml up --build pact-broker
|
14
|
+
docker-compose -f docker-compose-issue-repro-with-pact-broker-docker-image.yml up --build pact-broker
|
15
15
|
```
|
16
16
|
|
17
17
|
* Run the reproduction script.
|
18
18
|
|
19
19
|
```
|
20
|
-
docker-compose -f docker-compose-issue-repro.yml up repro-issue
|
20
|
+
docker-compose -f docker-compose-issue-repro-with-pact-broker-docker-image.yml up repro-issue
|
21
21
|
```
|
22
22
|
|
23
23
|
You can modify `script/reproduce-issue.rb` and then re-run it with the change applied.
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Pact Broker
|
2
2
|
[![Gem Version](https://badge.fury.io/rb/pact_broker.svg)](http://badge.fury.io/rb/pact_broker)
|
3
|
-
|
3
|
+
![Build status](https://github.com/pact-foundation/pact_broker/workflows/Test/badge.svg)
|
4
4
|
[![Join the chat at https://pact-foundation.slack.com/](https://img.shields.io/badge/chat-on%20slack-blue.svg?logo=slack)](https://slack.pact.io)
|
5
5
|
[![security](https://hakiri.io/github/pact-foundation/pact_broker/master.svg)](https://hakiri.io/github/pact-foundation/pact_broker/master)
|
6
6
|
[![Code Climate](https://codeclimate.com/github/pact-foundation/pact_broker/badges/gpa.svg)](https://codeclimate.com/github/pact-foundation/pact_broker)
|
@@ -116,7 +116,7 @@ Use the HAL browser to view documentation as you browse.
|
|
116
116
|
|
117
117
|
### To have a play around on your local machine
|
118
118
|
|
119
|
-
* Install
|
119
|
+
* Install Ruby and Bundler (check the automated tests to find the most recent version of Ruby and Bundler that are supported)
|
120
120
|
* Windows users: get a Rails/Ruby installer from [RailsInstaller](http://railsinstaller.org/) and run it
|
121
121
|
* unix users just use your package manager
|
122
122
|
* Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
|
data/config/database.yml
CHANGED
@@ -0,0 +1,49 @@
|
|
1
|
+
require_relative 'migration_helper'
|
2
|
+
|
3
|
+
include PactBroker::MigrationHelper
|
4
|
+
|
5
|
+
Sequel.migration do
|
6
|
+
up do
|
7
|
+
if !mysql?
|
8
|
+
alter_table(:webhook_executions) do
|
9
|
+
add_index([:triggered_webhook_id], name: "webhook_executions_triggered_webhook_id_index")
|
10
|
+
end
|
11
|
+
# MySQL automatically creates indexes for foreign keys then complains if you
|
12
|
+
# re-create it with a different name and try to drop it.
|
13
|
+
|
14
|
+
# https://stackoverflow.com/a/52274628/832671 - "When there is only one index that can be used
|
15
|
+
# for the foreign key, it can't be dropped. If you really wan't to drop it, you either have to drop
|
16
|
+
# the foreign key constraint or to create another index for it first."
|
17
|
+
|
18
|
+
alter_table(:triggered_webhooks) do
|
19
|
+
add_index([:webhook_id], name: "triggered_webhooks_webhook_id_index")
|
20
|
+
add_index([:consumer_id], name: "triggered_webhooks_consumer_id_index")
|
21
|
+
add_index([:provider_id], name: "triggered_webhooks_provider_id_index")
|
22
|
+
add_index([:verification_id], name: "triggered_webhooks_verification_id_index")
|
23
|
+
add_index([:pact_publication_id], name: "triggered_webhooks_pact_publication_id_index")
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
down do
|
29
|
+
if !mysql?
|
30
|
+
alter_table(:webhook_executions) do
|
31
|
+
drop_index([:triggered_webhook_id], name: "webhook_executions_triggered_webhook_id_index")
|
32
|
+
end
|
33
|
+
# MySQL automatically creates indexes for foreign keys then complains if you
|
34
|
+
# re-create it with a different name and try to drop it.
|
35
|
+
|
36
|
+
# https://stackoverflow.com/a/52274628/832671 - "When there is only one index that can be used
|
37
|
+
# for the foreign key, it can't be dropped. If you really wan't to drop it, you either have to drop
|
38
|
+
# the foreign key constraint or to create another index for it first."
|
39
|
+
|
40
|
+
alter_table(:triggered_webhooks) do
|
41
|
+
drop_index([:webhook_id], name: "triggered_webhooks_webhook_id_index")
|
42
|
+
drop_index([:consumer_id], name: "triggered_webhooks_consumer_id_index")
|
43
|
+
drop_index([:provider_id], name: "triggered_webhooks_provider_id_index")
|
44
|
+
drop_index([:verification_id], name: "triggered_webhooks_verification_id_index")
|
45
|
+
drop_index([:pact_publication_id], name: "triggered_webhooks_pact_publication_id_index")
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -30,6 +30,14 @@ module PactBroker
|
|
30
30
|
Sequel::Model.db.adapter_scheme.to_s
|
31
31
|
end
|
32
32
|
|
33
|
+
def with_type_hash_if_postgres(options)
|
34
|
+
if postgres?
|
35
|
+
options.merge(type: "hash")
|
36
|
+
else
|
37
|
+
options
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
33
41
|
def sqlite_safe string
|
34
42
|
if adapter == 'sqlite'
|
35
43
|
string.gsub(/(?:\b|")order(?:"|\b)/, '`order`')
|
@@ -0,0 +1,33 @@
|
|
1
|
+
version: "3"
|
2
|
+
|
3
|
+
services:
|
4
|
+
postgres:
|
5
|
+
image: postgres
|
6
|
+
healthcheck:
|
7
|
+
test: psql postgres --command "select 1" -U postgres
|
8
|
+
environment:
|
9
|
+
POSTGRES_USER: postgres
|
10
|
+
POSTGRES_PASSWORD: password
|
11
|
+
POSTGRES_DB: postgres
|
12
|
+
|
13
|
+
pact-broker:
|
14
|
+
image: pactfoundation/pact-broker:2.73.0.0
|
15
|
+
ports:
|
16
|
+
- "9292:9292"
|
17
|
+
depends_on:
|
18
|
+
- postgres
|
19
|
+
environment:
|
20
|
+
PACT_BROKER_PORT: '9292'
|
21
|
+
PACT_BROKER_DATABASE_URL: "postgres://postgres:password@postgres/postgres"
|
22
|
+
PACT_BROKER_LOG_LEVEL: INFO
|
23
|
+
PACT_BROKER_SQL_LOG_LEVEL: DEBUG
|
24
|
+
|
25
|
+
repro-issue:
|
26
|
+
build: .
|
27
|
+
depends_on:
|
28
|
+
- pact-broker
|
29
|
+
command: dockerize -wait http://pact-broker:9292 -timeout 30s /home/script/reproduce-issue.rb
|
30
|
+
environment:
|
31
|
+
- PACT_BROKER_BASE_URL=http://pact-broker:9292
|
32
|
+
volumes:
|
33
|
+
- $PWD:/home
|
data/docker-compose-test.yml
CHANGED
@@ -6,8 +6,8 @@ services:
|
|
6
6
|
image: postgres
|
7
7
|
healthcheck:
|
8
8
|
test: psql postgres --command "select 1" -U postgres
|
9
|
-
ports:
|
10
|
-
|
9
|
+
# ports:
|
10
|
+
# - "5432:5432"
|
11
11
|
environment:
|
12
12
|
POSTGRES_USER: postgres
|
13
13
|
POSTGRES_PASSWORD: postgres
|
@@ -58,8 +58,8 @@ services:
|
|
58
58
|
MYSQL_DATABASE: pact_broker
|
59
59
|
MYSQL_USER: pact_broker
|
60
60
|
MYSQL_PASSWORD: pact_broker
|
61
|
-
ports:
|
62
|
-
|
61
|
+
# ports:
|
62
|
+
# - "3306:3306"
|
63
63
|
|
64
64
|
init-mysql:
|
65
65
|
build: .
|
data/lib/pact_broker/api.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
require 'webmachine/adapters/rack_mapped'
|
2
2
|
require 'webmachine/rack_adapter_monkey_patch'
|
3
3
|
require 'pact_broker/api/resources'
|
4
|
+
require 'pact_broker/api/decorators'
|
5
|
+
require 'pact_broker/application_context'
|
4
6
|
require 'pact_broker/feature_toggle'
|
5
7
|
|
6
8
|
module Webmachine
|
@@ -12,8 +14,7 @@ module Webmachine
|
|
12
14
|
end
|
13
15
|
|
14
16
|
module PactBroker
|
15
|
-
|
16
|
-
API ||= begin
|
17
|
+
def self.build_api(application_context = PactBroker::ApplicationContext.default_application_context)
|
17
18
|
pact_api = Webmachine::Application.new do |app|
|
18
19
|
app.routes do
|
19
20
|
add(['trace', :*], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
|
@@ -111,10 +112,20 @@ module PactBroker
|
|
111
112
|
end
|
112
113
|
end
|
113
114
|
|
115
|
+
# naughty, but better than setting each route manually
|
116
|
+
pact_api.routes.each do | route |
|
117
|
+
route.instance_variable_get(:@bindings)[:application_context] = application_context
|
118
|
+
end
|
119
|
+
|
114
120
|
pact_api.configure do |config|
|
115
121
|
config.adapter = :RackMapped
|
116
122
|
end
|
117
123
|
|
118
124
|
pact_api.adapter
|
119
125
|
end
|
126
|
+
|
127
|
+
|
128
|
+
API ||= begin
|
129
|
+
build_api
|
130
|
+
end
|
120
131
|
end
|
@@ -1,7 +1,3 @@
|
|
1
|
-
|
2
|
-
require
|
3
|
-
|
4
|
-
require 'pact_broker/api/decorators/pact_collection_decorator'
|
5
|
-
require 'pact_broker/api/decorators/pact_pacticipant_decorator'
|
6
|
-
require 'pact_broker/api/decorators/pact_details_decorator'
|
7
|
-
require 'pact_broker/api/decorators/tag_decorator'
|
1
|
+
Dir.glob(File.expand_path(File.join(__FILE__, "..", "decorators", "*.rb"))).sort.each do | path |
|
2
|
+
require path
|
3
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
require 'pact_broker/string_refinements'
|
2
|
+
|
3
|
+
module PactBroker
|
4
|
+
module Api
|
5
|
+
module Decorators
|
6
|
+
class Configuration
|
7
|
+
using PactBroker::StringRefinements
|
8
|
+
|
9
|
+
def initialize(overrides = {})
|
10
|
+
@overrides = overrides
|
11
|
+
end
|
12
|
+
|
13
|
+
def class_for(name)
|
14
|
+
if overrides[name].is_a?(String)
|
15
|
+
Object.const_get(overrides[name])
|
16
|
+
elsif overrides[name].is_a?(Class)
|
17
|
+
overrides[name]
|
18
|
+
else
|
19
|
+
Object.const_get("PactBroker::Api::Decorators::#{name.to_s.camelcase(true)}")
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.default_configuration
|
24
|
+
Configuration.new
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
attr_reader :overrides
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
require 'pact_broker/api/decorators/decorator_context'
|
2
|
+
|
3
|
+
module PactBroker
|
4
|
+
module Api
|
5
|
+
module Decorators
|
6
|
+
class DecoratorContextCreator
|
7
|
+
def self.call(resource, options)
|
8
|
+
Decorators::DecoratorContext.new(resource.base_url, resource.resource_url, resource.request.env, options)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -39,7 +39,7 @@ module PactBroker
|
|
39
39
|
query_results_with_deployment_status_summary
|
40
40
|
.deployment_status_summary
|
41
41
|
.reasons
|
42
|
-
.collect{ | reason |
|
42
|
+
.collect{ | reason | reason_decorator_class.new(reason).to_s }
|
43
43
|
.join("\n")
|
44
44
|
end
|
45
45
|
|
@@ -47,6 +47,10 @@ module PactBroker
|
|
47
47
|
|
48
48
|
attr_reader :query_results_with_deployment_status_summary
|
49
49
|
|
50
|
+
def reason_decorator_class
|
51
|
+
ReasonDecorator
|
52
|
+
end
|
53
|
+
|
50
54
|
def matrix(base_url)
|
51
55
|
query_results_with_deployment_status_summary.rows.collect do | line |
|
52
56
|
provider = OpenStruct.new(name: line.provider_name)
|