pact_broker 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d063090dbbc3a73389a38780a8fab42eb34c79ed
-  data.tar.gz: 3e8ad44036962e66ec75ab114fe67f650011a239
+  metadata.gz: e7427bd8d5ba4ffcaead942be481675c3a275774
+  data.tar.gz: 86b168d56a8937c4b4461fee9a21f6d4af626c33
 SHA512:
-  metadata.gz: 06ea287eb052baf4e753222b1c4424f944fa80efaba076cd123ff866a7f1a84d0bcd3b87ce1961fb6586058988b040ab7bd1013e7d0fa9fc78a36dca64fdcbdd
-  data.tar.gz: 34db45d125d6c0921bcfc23918aa6b173e0d3868e5b702511d460f0530e1374be0be185937120e35ac9f1851f3b30f47712a6b8bb83caa02ec624bec60fd8304
+  metadata.gz: ddd1b99c2162ab7d736f5680c779b1f733c34841959f8803e6289eabdfb9a8d2840188b9af7ab643cf57f86d29a5130ef490a09954db36c001f564c2d6edc10c
+  data.tar.gz: fec0eaa9e4d5f661e3962010cbe87a22db04de9fdd17bcf46adb8653286bd6f0a3e54c31b5e3be651a21acc40f15013c4ff549efd7b6ed0cc608456c7c1fe4f9

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+<a name="v2.13.0"></a>
+### v2.13.0 (2018-01-11)
+
+
+#### Features
+
+* ensure latest pact version is returned when searching by pact version sha	 ([1d2adc6](/../../commit/1d2adc6))
+* rename 'pact_publication' trigger type to 'publication'	 ([9fe0ff0](/../../commit/9fe0ff0))
+
+* **certificates**
+  * load webhook certificates from database	 ([c72ab28](/../../commit/c72ab28))
+
+* **matrix ui**
+  * add checkbox for latest version	 ([7743ecc](/../../commit/7743ecc))
+  * add limit and latestby to form	 ([c4136bd](/../../commit/c4136bd))
+  * do not log validation errors	 ([f201d1d](/../../commit/f201d1d))
+  * add form	 ([cbf0837](/../../commit/cbf0837))
+
+* **matrix badges**
+  * add badge for provider/tag and consumer/tag	 ([d69c8e6](/../../commit/d69c8e6))
+
+* **verification webhooks**
+  * update hal browser documentation	 ([c2b31b4](/../../commit/c2b31b4))
+  * invoke verification webhooks on publication of verification	 ([04ed1cc](/../../commit/04ed1cc))
+  * alter logic to select only the relevant webhooks when the pact has changed	 ([ec18943](/../../commit/ec18943))
+  * default to contract changed event when no events specified, for backwards compatibility	 ([9fe8d47](/../../commit/9fe8d47))
+  * add events to webhooks to allow differentiation between pact and verification webhooks	 ([356c023](/../../commit/356c023))
+
+* **publish test result**
+  * allow json test results to be published with the verification result	 ([528034c](/../../commit/528034c))
+
+
+#### Bug Fixes
+
+* create selector objects when viewing matrix URL with consumer and provider	 ([e733bae](/../../commit/e733bae))
+
+
 <a name="v2.12.0"></a>
 ### v2.12.0 (2017-11-29)
 
@@ -343,9 +380,9 @@
 * 7c17c62 - Required at least ruby-2.2.0 as we move along ruby release schedule. (Tan Le, Mon Apr 24 22:54:52 2017 +1000)
 
 #### 1.16.0 (2017-04-10)
-* 990575f - Added HTML content type for request to get a specific version of a pact. As per request in https://github.com/bethesque/pact_broker/issues/82 (Beth Skurrie, Mon Apr 10 15:34:28 2017 +1000)
+* 990575f - Added HTML content type for request to get a specific version of a pact. As per request in https://github.com/pact-foundation/pact_broker/issues/82 (Beth Skurrie, Mon Apr 10 15:34:28 2017 +1000)
 * b47b8d8 - Use /versions rather than /version in test endpoint. Singular will be deprecated. (Beth Skurrie, Fri Apr 7 16:03:19 2017 +1000)
-* dd4daee - Removed version restriction for pact_broker gem in the example Gemfile. This will avoid a repetition of the twisted dependencies fixed by https://github.com/bethesque/pact_broker/pull/84 (Beth Skurrie, Tue Apr 4 09:53:39 2017 +1000)
+* dd4daee - Removed version restriction for pact_broker gem in the example Gemfile. This will avoid a repetition of the twisted dependencies fixed by https://github.com/pact-foundation/pact_broker/pull/84 (Beth Skurrie, Tue Apr 4 09:53:39 2017 +1000)
 * e447b3f - Updated sqlite database. (Beth Skurrie, Mon Apr 3 08:25:41 2017 +1000)
 * 149efc0 - Update REAME to reflect 2.4 support. (Tan Le, Fri Mar 31 21:42:47 2017 +1100)
 
@@ -373,7 +410,7 @@
 * cdfa17b - upgrade default sqlite db to current migration level (Bo Daley, Wed Nov 30 14:37:54 2016 -0500)
 
 #### 1.11.2 (2016-11-25)
-* 43f2373 - Added require to hopefully fix broken build. https://travis-ci.org/bethesque/pact_broker/jobs/174397806 (Bethany Skurrie, Thu Nov 24 07:47:07 2016 +1100)
+* 43f2373 - Added require to hopefully fix broken build. https://travis-ci.org/pact-foundation/pact_broker/jobs/174397806 (Bethany Skurrie, Thu Nov 24 07:47:07 2016 +1100)
 * f747e09 - Removed ruby 2.1 build as it is failing (Beth Skurrie, Wed Nov 9 13:42:08 2016 +1100)
 * 2dd77a5 - Added extra pact version to example database so that the diff feature could be explored. (Beth, Wed Nov 9 10:07:33 2016 +1100)
 * 5c04c59 - Updated trailblazer gem to ~>0.3.0 and fixed pact diff spec. (Beth, Wed Nov 9 10:05:53 2016 +1100)
@@ -431,7 +468,7 @@
 * 7ea3e61 - Update pact_broker.gemspec (Beth Skurrie, Tue Jul 14 09:02:30 2015 +1000)
 * f299cfd - Added logging for publishing and deleting pacts (Beth Skurrie, Wed Jul 8 16:00:58 2015 +1000)
 * 67f0edb - Log error when contract cannot be parsed to a Pact (Beth Skurrie, Wed Jul 8 15:54:29 2015 +1000)
-* 57caf63 - Double ensure that tables are created with UTF-8 encoding https://github.com/bethesque/pact_broker/issues/24 (Beth Skurrie, Fri Jul 3 15:46:46 2015 +1000)
+* 57caf63 - Double ensure that tables are created with UTF-8 encoding https://github.com/pact-foundation/pact_broker/issues/24 (Beth Skurrie, Fri Jul 3 15:46:46 2015 +1000)
 
 #### 1.8.1 (2015-06-30)
 
@@ -481,7 +518,7 @@
 
 #### 1.3.2.rc1 (2014-12-03)
 
-* a2413f4 - Stop Padrino trying to create a log file in the gem directory https://github.com/bethesque/pact_broker/issues/13 (Beth, Wed Dec 3 13:16:06 2014 +1100)
+* a2413f4 - Stop Padrino trying to create a log file in the gem directory https://github.com/pact-foundation/pact_broker/issues/13 (Beth, Wed Dec 3 13:16:06 2014 +1100)
 * abf9459 - Added DELETE endpoint for pact resource (Beth, Wed Nov 19 17:45:34 2014 +1100)
 * 1d01937 - Set default encoding to utf-8 in example app. This is required for the sha foreign key to work between the pact table and the pact_version_content table. (Beth, Tue Nov 18 22:35:51 2014 +1100)
 * 9e3401e - Save all the space! Reuse the same pact_version_content when one with the same sha1 already exists in the database. (Beth, Tue Nov 18 20:27:59 2014 +1100)

data/README.md

@@ -111,13 +111,14 @@ Use the HAL browser to view documentation as you browse.
     * unix users just use your package manager
 * Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
 * Run `bundle install`
-* Run `bundle exec rackup -p 8080`
+* Run `bundle exec rackup -p 8080` (this will use a Sqlite database. If you want to try it out with a Postgres database, see the [README](https://github.com/pact-foundation/pact_broker/tree/master/example) in the example directory.)
 * Open [http://localhost:8080](http://localhost:8080) and you should see a list containing the pact between the Zoo App and the Animal Service.
 * Click on the arrow to see the generated HTML documentation.
 * Click on either service to see an autogenerated network diagram.
 * Click on the HAL Browser link to have a poke around the API.
 * Click on the book icon under "docs" to view documentation related to a given relation.
 
+
 ### For reals
 
 #### Hosted
@@ -126,17 +127,20 @@ In a hurry? Hate having to run your own infrastructure? Check out the [Hosted Pa
 
 #### Container solutions
 
-You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform]
+You can use the [Pact Broker Docker image][docker] or [Terraform on AWS][terraform]
 
 #### Rolling your own
 
+* Are you sure you don't just want to use the [Pact Broker Docker image][docker]? No Docker at your company yet? Ah well, keep reading.
 * Create a PostgreSQL (recommended) or MySQL (not recommended, see following note) database.
-* __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in the future, however MySQL the other [semi supported](https://github.com/pact-foundation/pact_broker/issues/33) database.
-* Install ruby 2.2.0 or later and bundler >= 1.12.0
-* Copy the [example](/example) directory to the location you want to install the application.
+ * __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in the future, however MySQL the other [semi supported](https://github.com/pact-foundation/pact_broker/issues/33) database.
+ * Check the [travis.yml][travisyml] file to make sure you're using the version of the database that we're currently running our tests against.
+* If you're using PostgreSQL (did we mention this was _recommended!_) you'll find the database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
+* Install ruby 2.2.0 or later and bundler >= 1.12.0 (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
+* Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up. 
 * Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres and the "mysql2" gem if using MySQL)
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.
-* For production usage, use a web application server like [Phusion Passenger](https://www.phusionpassenger.com) or [Nginx](http://nginx.org/) to serve the Pact Broker application.
+* For production usage, use a web application server like [Phusion Passenger](https://www.phusionpassenger.com) or [Nginx](http://nginx.org/) to serve the Pact Broker application. You'll need to read up on the documentation for these yourself as it is beyond the scope of this documentation.
 * Deploy to your location of choice.
 
 ## Upgrading
@@ -144,9 +148,9 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 Please read the [UPGRADING.md](UPGRADING.md) documentation before upgrading your Pact Broker, for information on the supported upgrade paths.
 
 [decouple]: http://techblog.realestate.com.au/enter-the-pact-matrix-or-how-to-decouple-the-release-cycles-of-your-microservices/
-[pact]: https://github.com/realestate-com-au/pact
+[pact]: https://github.com/pact-foundation/pact-ruby
 [nerf]: https://github.com/pact-foundation/pact_broker/wiki/pact-broker-ci-nerf-gun
-[different-teams]: https://github.com/realestate-com-au/pact/wiki/Using-pact-where-the-consumer-team-is-different-from-the-provider-team
+[different-teams]: https://github.com/pact-foundation/pact-ruby/wiki/Using-pact-where-the-consumer-team-is-different-from-the-provider-team
 [docker]: https://hub.docker.com/r/dius/pact-broker
 [terraform]: https://github.com/nadnerb/terraform-pact-broker
 [hosted]: https://pact.dius.com.au/?utm_source=github&utm_campaign=GITHUB_BROKER&utm_medium=github
@@ -157,3 +161,4 @@ Please read the [UPGRADING.md](UPGRADING.md) documentation before upgrading your
 [issues]: https://github.com/pact-foundation/pact_broker/issues
 [pact-docs]: http://docs.pact.io
 [cli]: https://github.com/pact-foundation/pact-ruby-standalone/releases
+[travisyml]: https://github.com/pact-foundation/pact_broker/blob/master/.travis.yml

data/bethtest.rb

@@ -1,103 +1,30 @@
-require 'set'
+require 'openssl'
+require 'uri'
+require 'net/http'
 
-class Link
-  def initialize from, to
-    @from = from
-    @to = to
-  end
+uri = URI('https://self-signed.badssl.com')
+downloaded_cert_path = '/tmp/downloaded_cert.pem'
 
-  def include? endpoint
-    @from == endpoint || @to == endpoint
-  end
+puts `openssl s_client -showcerts -servername #{uri.host} -connect #{uri.host}:#{uri.port} </dev/null 2>/dev/null|openssl x509 -text`
+command = "openssl s_client -showcerts -servername #{uri.host} -connect #{uri.host}:#{uri.port} </dev/null 2>/dev/null|openssl x509 -outform PEM > #{downloaded_cert_path}"
+puts command
+puts `#{command}`
 
-  def connected? other
-    (self.to_a & other.to_a).any?
-  end
 
-  def to_s
-    "#{@from} - #{@to}"
-  end
+cert_store = OpenSSL::X509::Store.new
+puts "Adding certificate #{downloaded_cert_path}"
+cert_store.add_file(downloaded_cert_path)
 
-  def to_a
-    [@from, @to]
-  end
+req = Net::HTTP::Get.new(uri)
 
-end
-
-def unique_nodes links
-  links.collect(&:to_a).flatten.uniq.sort
-end
-
-def nodes_connected_to_node node, links
-  unique_nodes links.select{|l|l.include?(node)}
-end
-
-def connected_links link, link_pool
-  link_pool.select{|l| l.connected?(link)}
-end
-
-def nodes_connected_to_nodes_within_pool nodes, links, node_pool
-  nodes.collect{ | node | nodes_connected_to_node(node, links) }.flatten & node_pool
-end
-
-def connected_links_still_within_pool links, link_pool
-  links.collect{ | link | connected_links(link, link_pool) }.flatten.uniq
-end
-
-def split_into_clusters_of_nodes links
-  node_pool =  unique_nodes links
-  groups = []
-
-  while node_pool.any?
-    group = []
-    groups << group
-    connected_nodes = [node_pool.first]
-
-    while connected_nodes.any?
-      group.concat(connected_nodes)
-      node_pool = node_pool - connected_nodes
-      connected_nodes = nodes_connected_to_nodes_within_pool connected_nodes, links, node_pool
-    end
-  end
+options = {
+  :use_ssl => uri.scheme == 'https',
+  verify_mode: OpenSSL::SSL::VERIFY_PEER,
+  cert_store: cert_store
+}
 
-  groups
+response = Net::HTTP.start(uri.hostname, uri.port, options) do |http|
+  http.request req
 end
 
-def recurse link, link_pool
-  connected_links = link_pool.select{ | candidate| candidate.connected?(link) }
-  if connected_links.empty?
-    [link]
-  else
-    ([link] + connected_links.map{| connected_link| recurse(connected_link, link_pool - connected_links)}.flatten).uniq
-  end
-end
-
-def recurse_groups groups, link_pool
-  if link_pool.empty?
-    groups
-  else
-    first, *rest = *link_pool
-    group = recurse first, rest
-    recurse_groups(groups + [group], link_pool - group)
-  end
-end
-
-def split_into_clusters_of_links links
-  recurse_groups [], links.dup
-end
-
-links = [Link.new('A', 'B'), Link.new('A', 'C'), Link.new('C', 'D'), Link.new('D', 'E'), Link.new('E','A'),
-  Link.new('Y', 'Z'), Link.new('X', 'Y'),
-  Link.new('M', 'N'), Link.new('N', 'O'), Link.new('O', 'P'), Link.new('P','Q')]
-
-
-groups = split_into_clusters_of_nodes links
-
-puts groups.collect{ | group| "group = #{group.join(" ")}"}
-
-groups = split_into_clusters_of_links links
-puts groups.collect{ | group| "group = #{group.join(", ")}"}
-
-
-
-
+puts response

data/db/migrations/20171112_add_test_results.rb

@@ -0,0 +1,7 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  change do
+    add_column(:verifications, :test_results, PactBroker::MigrationHelper.large_text_type)
+  end
+end

data/db/migrations/20171117_create_webhook_events.rb

@@ -0,0 +1,14 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  change do
+    create_table(:webhook_events, charset: 'utf8') do
+      primary_key :id
+      foreign_key :webhook_id, :webhooks, on_delete: :cascade
+      String :name
+      DateTime :created_at, null: false
+      DateTime :updated_at, null: false
+      index [:id, :name], unique: true, name: 'uq_webhook_id_name'
+    end
+  end
+end

data/db/migrations/20171118_create_webhook_events.rb

@@ -0,0 +1,18 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    from(:webhooks).each do | webhook |
+      from(:webhook_events).insert(
+        webhook_id: webhook[:id],
+        name: 'contract_content_changed',
+        created_at: DateTime.now,
+        updated_at: DateTime.now
+      )
+    end
+  end
+
+  down do
+
+  end
+end

data/db/migrations/20180108_create_certificates_table.rb

@@ -0,0 +1,14 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  change do
+    create_table(:certificates, charset: 'utf8') do
+      primary_key :id
+      String :uuid, null: false, unique: true, unique_constraint_name: 'uq_certificate_uuid'
+      String :description, null: true
+      String :content, null: false, type: PactBroker::MigrationHelper.large_text_type
+      DateTime :created_at, null: false
+      DateTime :updated_at, null: false
+    end
+  end
+end

data/db/migrations/20180109_migrate_trigger_type.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    from(:triggered_webhooks).where(trigger_type: 'pact_publication').update(trigger_type: 'resource_creation')
+  end
+
+  down do
+    from(:triggered_webhooks).where(trigger_type: 'resource_creation').update(trigger_type: 'pact_publication')
+  end
+end

data/db/test/backwards_compatibility/gemfiles/1.18.0.gemfile.lock

@@ -31,7 +31,7 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.3.4)
+    dry-core (0.4.2)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)
@@ -62,7 +62,7 @@ GEM
       url_mount (~> 0.2.1)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.1.0)
@@ -129,14 +129,14 @@ GEM
     rack (1.5.5)
     rack-protection (1.5.3)
       rack
-    rack-proxy (0.6.2)
+    rack-proxy (0.6.3)
       rack
     rack-reverse-proxy (0.12.0)
       rack (>= 1.0.0)
       rack-proxy (~> 0.6, >= 0.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (12.2.1)
+    rake (12.3.0)
     randexp (0.1.7)
     redcarpet (3.4.0)
     reform (2.2.4)
@@ -178,7 +178,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.15.0)
+    tins (1.16.3)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)

data/db/test/backwards_compatibility/gemfiles/2.0.0.gemfile.lock

@@ -30,7 +30,7 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.3.4)
+    dry-core (0.4.2)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)
@@ -61,7 +61,7 @@ GEM
       url_mount (~> 0.2.1)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.1.0)
@@ -128,14 +128,14 @@ GEM
     rack (1.5.5)
     rack-protection (1.5.3)
       rack
-    rack-proxy (0.6.2)
+    rack-proxy (0.6.3)
       rack
     rack-reverse-proxy (0.12.0)
       rack (>= 1.0.0)
       rack-proxy (~> 0.6, >= 0.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (12.2.1)
+    rake (12.3.0)
     randexp (0.1.7)
     redcarpet (3.4.0)
     reform (2.2.4)
@@ -178,7 +178,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.15.0)
+    tins (1.16.3)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)

data/db/test/backwards_compatibility/gemfiles/2.1.0.gemfile.lock

@@ -30,7 +30,7 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.3.4)
+    dry-core (0.4.2)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)
@@ -61,7 +61,7 @@ GEM
       url_mount (~> 0.2.1)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.1.0)
@@ -129,14 +129,14 @@ GEM
     rack (1.5.5)
     rack-protection (1.5.3)
       rack
-    rack-proxy (0.6.2)
+    rack-proxy (0.6.3)
       rack
     rack-reverse-proxy (0.12.0)
       rack (>= 1.0.0)
       rack-proxy (~> 0.6, >= 0.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (12.2.1)
+    rake (12.3.0)
     randexp (0.1.7)
     redcarpet (3.4.0)
     reform (2.2.4)
@@ -179,7 +179,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.15.0)
+    tins (1.16.3)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uber (0.1.0)