pact_broker 1.18.0 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef22c7934452713d713906de14fade4ecc2a2c8
-  data.tar.gz: e20f94e91cd30b71fde2c80393861342e989a33f
+  metadata.gz: f1868b3d1f43fe2ebee71e30e38088b70faa46c4
+  data.tar.gz: 6e0947382d1b455892c94b23b41b400ca2c8c7a6
 SHA512:
-  metadata.gz: b5be0a05dd839aef2b0da83d95f7ea58c0c9934ec6e59162a726fa21c3c9f7f795090f05071506df821ff2a930557a1649111f951ec7321a008faed5f59ea2de
-  data.tar.gz: 1fb67c57f5491571a02d096e0243bd20c43f64faf1a5245457743c71663a002ee3c91dd59355ea863164025ef22ca6840c38d226ec324b40d69c237da5bbddae
+  metadata.gz: 0d592dfd992c8de6271f6bfbc30292bd48aa772d2eb914f741882efe853b5677ff8d440ffd41fa30686074dfab7116e1a082dcd87c11870a13adb162cef08161
+  data.tar.gz: 9dfc13a55c1ea8a00ef5efeed880a81687460030d20ea32c95e639076d70fba98d5c76d6e4b1c90da6eea2fea4ad7c90236a4ba27243f8fbba253b7d9ec6fc81

data/CHANGELOG.md

@@ -2,17 +2,20 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
-#### 1.18.0 (2017-05-09)
-* 397060b - Display application versions in reverse order in the Versions resource. (Beth Skurrie, Tue May 9 13:59:54 2017 +1000)
-* 251c878 - Allow application versions to be ordered by creation date where no consistent orderable object can be extracted from the consumer application version. (Beth Skurrie, Tue May 9 13:22:36 2017 +1000)
-* 68bb6d9 - Execute webhooks using sucker punch. (Beth Skurrie, Mon May 8 10:32:45 2017 +1000)
+#### 2.0.0.beta.1 (2017-04-28)
 
-#### 1.17.2 (2017-05-04)
-* b8f45e1 - fix issue with pact document link not displaying #94 (Matt Fellows, Wed May 3 11:23:09 2017 +1000)
-
-#### 1.17.1 (2017-05-02)
-* 7576bc2 - Fix 500 error in webhooks endpoint. (Beth Skurrie, Tue May 2 14:35:06 2017 +1000)
+* 049bc5c - Added tooltip to verification date to show provider version. (Beth Skurrie, Fri Apr 28 10:05:13 2017 +1000)
+* 4287c99 - Add tooltip text to last verified date when pact has changed since last verification. (Beth Skurrie, Fri Apr 28 09:02:59 2017 +1000)
 * 7351ec8 - Add restrictions for all gem versions in gemspec. Fix formatting in haml file. (Beth Skurrie, Thu Apr 27 19:55:04 2017 +1000)
+* a836b56 - Add last verified date for each pact to landing page of application UI. (Beth Skurrie, Tue Apr 25 17:03:06 2017 +1000)
+* c7589c9 - Use latest ruby-2.3.4 for development. (Tan Le, Mon Apr 24 23:05:27 2017 +1000)
+* 46b87f9 - Use latest ruby patches for CI. (Tan Le, Mon Apr 24 23:00:12 2017 +1000)
+* 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)
+* 66a2f3b - Added pb:publish-verification HAL link to pact resource. (Beth Skurrie, Fri Apr 21 16:09:55 2017 +1000)
+* f2110ac - Replacing versionomy with semver2 for parsing version numbers according to semver 2.0.0 (http://semver.org) (Danilo Sato, Thu Apr 20 11:48:49 2017 -0400)
+* 1f6045a - Added DEVELOPER_DOCUMENTATION.md with information about the tables and views. (Beth Skurrie, Tue Apr 18 11:35:39 2017 +1000)
+* 77eaf7b - Added pb:latest-verifications link to version resource. (Beth Skurrie, Tue Apr 11 16:25:45 2017 +1000)
+* aaf44d9 - Added endpoint to view the latest verifications for a given consumer version. (Beth Skurrie, Tue Apr 11 11:16:03 2017 +1000)
 
 #### 1.17.0 (2017-04-26)
 * 5cbb9da - Added pb:publish-pact to HAL index (Beth Skurrie, Wed Apr 26 08:39:15 2017 +1000)

data/DEVELOPER_DOCUMENTATION.md

@@ -0,0 +1,53 @@
+# Developer Documentation
+
+## Domain and database design
+
+### Tables
+* `pact_version_contents` - the JSON content of each UNIQUE pact document is stored in this table. The same content is likely to be published over and over again by the CI builds, so deduplicating the content saves us a lot of disk space. Once created, a row is never modified.
+
+* `pact_revisions` - this table holds references to the:
+
+    * `provider` (in the pacticipants table)
+    * `consumer version` (in the versions table),
+    * `pact content` (in the pact_version_contents table)
+    * and a `revision number`
+
+ A row exists for every `PUT` or `PATCH` request made to create or update a given pact resource. Once created, a row is never modified. When a pact resource (defined by the `provider`, `consumer` and `consumer version number`) is modified via HTTP, a new `pact_revision` row is created with an incremented `revision_number`. The `revision_number` begins at 1 for each new `consumer_version`.
+
+* `versions` - this table consists of:
+
+    * a reference to the `pacticipant` that owns the version (the `consumer`)
+    * the version `number` (eg. 1.0.2)
+    * the version `order` - an integer calculated by the code when the row is created that allows us to sort versions in the database without it needing to understand how to order semantic version strings. The versions are ordered within the context of their owning `pacticipant`.
+
+ Currently only consumer versions are stored, as these are created when a pact resource is created. There is potential to create provider versions when we implement verifications.
+
+* `pacticipants` - this table consists of:
+
+    * a `name`
+
+* `tags` - this table consists of:
+
+    * a `name`
+    * a reference to the `pacticipant version`
+
+ Note that a `consumer version` is tagged, rather than a `pact_version`. This means that when a given version is marked as the "prod" one, all the pacts for that version are considered the "prod" pacts, rather than having to tag them individually.
+
+### Views
+
+* `all_pact_revisions` - A denormalised view the one-to-one attributes of a `pact_revision`, including:
+
+    * `provider name` and `provider id`
+    * `consumer name` and `consumer id`
+    * `consumer version number` and `consumer version order`
+    * `revision_number`
+
+* `all_pacts` - This view has the same columns as `all_pact_revisions`, but it only contains the latest (current) revision of the pact for each provider/consumer/version. It maps to what a user would consider the "pact" resource ie. `/pacts/provider/Provider/consumer/Consumer/version/1.2.3`
+
+ The AllPacts Sequel model in the code is what is used when querying data for displaying in a response, rather than the normalised separate PactRevision and PactVersionContent models.
+
+* `latest_pacts` - This view has the same columns as `all_pact_revisions`, but it only contains the latest revision of the pact for the latest consumer version for each consumer/provider pair. It is what a user would consider the "latest pact", and maps to the resource at `/pacts/provider/Provider/consumer/Consumer/latest`
+
+* `latest_tagged_pacts` - This view has the same columns as `all_pact_revisions`, plus a `tag_name` column. It is used to return the pact for the latest tagged version of a consumer.
+
+* `latest_verifications` - The most recent verification for each pact version.

data/README.md

@@ -1,6 +1,6 @@
 # Pact Broker
 
-[![Build Status](https://travis-ci.org/pact-foundation/pact_broker.svg?branch=master)](https://travis-ci.org/pact-foundation/pact_broker) [![Join the chat at https://gitter.im/pact-foundation/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pact-foundation/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/bethesque/pact_broker.svg?branch=master)](https://travis-ci.org/bethesque/pact_broker) [![Join the chat at https://gitter.im/bethesque/pact_broker](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bethesque/pact_broker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 The Pact Broker provides a repository for consumer driven contracts created using the pact gem.
 
@@ -23,7 +23,7 @@ Features:
 * Tracks changes between Pact versions so you can tell when a consumer has changed its expectations.
 * [Docker Pact Broker][docker]
 
-Travis CI Status: [![Build Status](https://travis-ci.org/pact-foundation/pact_broker.svg?branch=master)](https://travis-ci.org/pact-foundation/pact_broker)
+Travis CI Status: [![Build Status](https://travis-ci.org/bethesque/pact_broker.svg?branch=master)](https://travis-ci.org/bethesque/pact_broker)
 
 ### How would I use the Pact Broker?
 
@@ -41,47 +41,47 @@ If you don't have a [Pact Broker CI Nerf Gun][nerf], you'll probably want to rea
 
 ## Documentation
 
-See the [Pact Broker Client](https://github.com/pact-foundation/pact_broker-client) for documentation on how to publish a pact to the Pact Broker, and configure the URLs in the provider project.
+See the [Pact Broker Client](https://github.com/bethesque/pact_broker-client) for documentation on how to publish a pact to the Pact Broker, and configure the URLs in the provider project.
 
-See the [wiki](https://github.com/pact-foundation/pact_broker/wiki) for documentation related to the Pact Broker itself.
+See the [wiki](https://github.com/bethesque/pact_broker/wiki) for documentation related to the Pact Broker itself.
 
 ### Screenshots
 
 #### Index
 
 * * *
-<img src="https://raw.githubusercontent.com/wiki/pact-foundation/pact_broker/images/index.png"/>
+<img src="https://raw.githubusercontent.com/wiki/bethesque/pact_broker/images/index.png"/>
 
 #### Autogenerated documentation
 
 Paste the pact URL into a browser to view a HTML version of the pact.
 * * *
-<img src="https://raw.githubusercontent.com/wiki/pact-foundation/pact_broker/images/autogenerated_documentation.png"/>
+<img src="https://raw.githubusercontent.com/wiki/bethesque/pact_broker/images/autogenerated_documentation.png"/>
 
 
 #### Network diagram
 
 * * *
-<img src="https://raw.githubusercontent.com/wiki/pact-foundation/pact_broker/images/network_diagram.png"/>
+<img src="https://raw.githubusercontent.com/wiki/bethesque/pact_broker/images/network_diagram.png"/>
 
 #### HAL browser
 
 Use the embedded HAL browser to navigate the API.
 * * *
-<img src="https://raw.githubusercontent.com/wiki/pact-foundation/pact_broker/images/hal_browser.png"/>
+<img src="https://raw.githubusercontent.com/wiki/bethesque/pact_broker/images/hal_browser.png"/>
 
 #### HAL documentation
 
 Use the HAL browser to view documentation as you browse.
 * * *
-<img src="https://raw.githubusercontent.com/wiki/pact-foundation/pact_broker/images/hal_documentation.png"/>
+<img src="https://raw.githubusercontent.com/wiki/bethesque/pact_broker/images/hal_documentation.png"/>
 
 ## Usage
 
 ### To have a play around on your local machine
 
 * Install ruby 2.2.0 or later and bundler >= 1.12.0
-* Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
+* Run `git clone git@github.com:bethesque/pact_broker.git && cd pact_broker/example`
 * Run `bundle`
 * Run `bundle exec rackup -p 8080`
 * Open [http://localhost:8080](http://localhost:8080) and you should see a list containing the pact between the Zoo App and the Animal Service.
@@ -100,7 +100,7 @@ the [Hosted Pact Broker](https://pact.dius.com.au/?utm_source=github&utm_campaig
 You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][terraform] or to roll your own...
 
 * Create a database using a product that is supported by the Sequel gem (listed on this page http://sequel.jeremyevans.net/rdoc/files/README_rdoc.html). The migrations have been tested on MySQL and PostgreSQL - your mileage will vary on other databases.
-* __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in a future release, however MySQL the other [semi supported](https://github.com/pact-foundation/pact_broker/issues/33) database.
+* __Note:__ It is recommended to use __PostgreSQL__ as it will support JSON search features that are planned in a future release, however MySQL the other [semi supported](https://github.com/bethesque/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.
 * Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres.)
@@ -110,7 +110,7 @@ You can use the [Pact Broker Docker container][docker] or [Terraform on AWS][ter
 
 [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
-[nerf]: https://github.com/pact-foundation/pact_broker/wiki/pact-broker-ci-nerf-gun
+[nerf]: https://github.com/bethesque/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
-[docker]: https://hub.docker.com/r/dius/pact-broker
+[docker]: https://registry.hub.docker.com/u/dius/pact_broker/
 [terraform]: https://github.com/nadnerb/terraform-pact-broker

data/db/migrations/23_create_pact_contents_table.rb

@@ -0,0 +1,19 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    create_table(:pact_contents, charset: 'utf8') do
+      primary_key :id
+      foreign_key :consumer_id, :pacticipants
+      foreign_key :provider_id, :pacticipants
+      String :sha, null: false
+      String :content, type: PactBroker::MigrationHelper.large_text_type
+      index [:consumer_id, :provider_id, :sha], unique: true, name: 'unq_pvc_con_prov_sha'
+      DateTime :created_at, null: false
+    end
+  end
+
+  down do
+    drop_table(:pact_contents)
+  end
+end

data/db/migrations/24_populate_pact_contents.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    run("insert into pact_contents (sha, content, created_at) select sha, content, created_at from pact_version_contents")
+  end
+
+  down do
+    run("delete from pact_contents")
+  end
+end

data/db/migrations/25_populate_pact_contents_pacticipants.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  up do
+    run("update pact_contents set consumer_id = (select consumer_id from all_pacts where pact_version_content_sha = pact_contents.sha limit 1)")
+    run("update pact_contents set provider_id = (select provider_id from all_pacts where pact_version_content_sha = pact_contents.sha limit 1)")
+    run("delete from pact_contents where consumer_id is null")
+  end
+end

data/db/migrations/26_make_pc_pacticipants_mandatory.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  up do
+    alter_table(:pact_contents) do
+      set_column_not_null(:consumer_id)
+      set_column_not_null(:provider_id)
+    end
+  end
+end

data/db/migrations/27_create_pact_publications.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+  up do
+    create_table(:pact_publications, charset: 'utf8') do
+      primary_key :id
+      foreign_key :consumer_version_id, :versions, null: false
+      foreign_key :provider_id, :pacticipants, null: false
+      Integer :revision_number, null: false
+      foreign_key :pact_version_id, :pact_contents, null: false
+      DateTime :created_at, null: false
+      index [:consumer_version_id, :provider_id, :revision_number], unique: true, name: 'cv_prov_revision_unq'
+      index [:consumer_version_id, :provider_id, :id], name: 'cv_prov_id_ndx'
+    end
+  end
+
+  down do
+    drop_table(:pact_publications)
+  end
+end

data/db/migrations/28_populate_pact_publications.rb

@@ -0,0 +1,13 @@
+Sequel.migration do
+  up do
+    run("insert into pact_publications
+        (id, consumer_version_id, provider_id, revision_number, pact_version_id, created_at)
+      select ap.id, ap.consumer_version_id, ap.provider_id, 1, pc.id, ap.updated_at
+      from all_pacts ap inner join pact_contents pc
+      on pc.sha = ap.pact_version_content_sha")
+  end
+
+  down do
+    run("delete from pact_publications")
+  end
+end

data/db/migrations/29_recreate_all_pacts.rb

@@ -0,0 +1,16 @@
+Sequel.migration do
+  up do
+    create_or_replace_view(:all_pacts,
+      Sequel::Model.db[:pact_publications].select(:pact_publications__id,
+      :c__id___consumer_id, :c__name___consumer_name,
+      :cv__id___consumer_version_id, :cv__number___consumer_version_number, :cv__order___consumer_version_order,
+      :p__id___provider_id, :p__name___provider_name,
+      :pact_publications__revision_number, :pc__sha___pact_version_sha, :pact_publications__created_at).
+      join(:versions, {:id => :consumer_version_id}, {:table_alias => :cv, implicit_qualifier: :pact_publications}).
+      join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :c, implicit_qualifier: :cv}).
+      join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications}).
+      join(:pact_contents, {:id => :pact_version_id}, {:table_alias => :pc, implicit_qualifier: :pact_publications})
+    )
+  end
+end
+

data/db/migrations/30_drop_pacts.rb

@@ -0,0 +1,8 @@
+require 'digest/sha1'
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    drop_table(:pacts)
+  end
+end

data/db/migrations/31_drop_pact_version_contents.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  up do
+    drop_table(:pact_version_contents)
+  end
+end

data/db/migrations/32_rename_pact_contents.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  up do
+    rename_table(:pact_contents, :pact_versions)
+  end
+end

data/db/migrations/33_recreate_all_pacts.rb

@@ -0,0 +1,52 @@
+Sequel.migration do
+  up do
+    # The denormalised pact publication details for each publication
+    create_or_replace_view(:all_pact_publications,
+      Sequel::Model.db[:pact_publications].select(:pact_publications__id,
+      :c__id___consumer_id, :c__name___consumer_name,
+      :cv__id___consumer_version_id, :cv__number___consumer_version_number, :cv__order___consumer_version_order,
+      :p__id___provider_id, :p__name___provider_name,
+      :pact_publications__revision_number, :pv__id___pact_version_id, :pv__sha___pact_version_sha, :pact_publications__created_at).
+      join(:versions, {:id => :consumer_version_id}, {:table_alias => :cv, implicit_qualifier: :pact_publications}).
+      join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :c, implicit_qualifier: :cv}).
+      join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications}).
+      join(:pact_versions, {:id => :pact_version_id}, {:table_alias => :pv, implicit_qualifier: :pact_publications})
+    )
+
+    # Latest revision number for each consumer version order
+    create_or_replace_view(:latest_pact_publication_revision_numbers,
+      "select provider_id, consumer_id, consumer_version_order, max(revision_number) as latest_revision_number
+      from all_pact_publications
+      group by provider_id, consumer_id, consumer_version_order"
+    )
+
+    # Latest pact_publication details for each consumer version
+    create_or_replace_view(:latest_pact_publications_by_consumer_versions,
+      "select app.*
+      from all_pact_publications app
+      inner join latest_pact_publication_revision_numbers lr
+      on app.consumer_id = lr.consumer_id
+        and app.provider_id = lr.provider_id
+        and app.consumer_version_order = lr.consumer_version_order
+        and app.revision_number = lr.latest_revision_number"
+        )
+
+
+    create_or_replace_view(:latest_pact_consumer_version_orders,
+      "select provider_id, consumer_id, max(consumer_version_order) as latest_consumer_version_order
+      from all_pact_publications
+      group by provider_id, consumer_id"
+    )
+
+    # Latest pact publications by consumer/provider
+    create_or_replace_view(:latest_pact_publications,
+      "select lpcv.*
+      from latest_pact_publications_by_consumer_versions lpcv
+      inner join latest_pact_consumer_version_orders lp
+      on lpcv.consumer_id = lp.consumer_id
+           and lpcv.provider_id = lp.provider_id
+           and lpcv.consumer_version_order = latest_consumer_version_order"
+    )
+
+  end
+end

data/db/migrations/34_recreate_latest_tagged_pacts.rb

@@ -0,0 +1,23 @@
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_tagged_pact_consumer_version_orders,
+      "select provider_id, consumer_id, t.name as tag_name, max(consumer_version_order) as latest_consumer_version_order
+      from latest_pact_publications_by_consumer_versions ap
+      inner join tags t
+      on t.version_id = ap.consumer_version_id
+      group by provider_id, consumer_id, t.name"
+    )
+
+    create_or_replace_view(:latest_tagged_pact_publications,
+      "select lp.*, o.tag_name
+      from latest_pact_publications_by_consumer_versions lp
+      inner join latest_tagged_pact_consumer_version_orders o
+      on lp.consumer_id = o.consumer_id
+        and lp.provider_id = o.provider_id
+        and lp.consumer_version_order = latest_consumer_version_order"
+    )
+
+    drop_view(:all_pacts)
+    drop_view(:latest_pacts)
+  end
+end

data/db/migrations/35_create_verifications.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+  up do
+    create_table(:verifications, charset: 'utf8') do
+      primary_key :id
+      Integer :number
+      Boolean :success, null: false
+      String :provider_version, null: false
+      String :build_url
+      foreign_key :pact_version_id, :pact_versions, null: false
+      DateTime :execution_date, null: false
+      DateTime :created_at, null: false
+      index [:pact_version_id, :number], unique: true
+    end
+  end
+end

data/db/migrations/36_create_latest_verifications.rb

@@ -0,0 +1,14 @@
+Sequel.migration do
+  up do
+    # The most recent verification for each pact version
+    create_or_replace_view(:latest_verifications,
+      "SELECT v.id, v.number, v.success, v.provider_version, v.build_url, v.pact_version_id, v.execution_date, v.created_at
+        FROM verifications v
+        INNER JOIN (
+        SELECT pact_version_id, MAX(number) latest_number
+          FROM verifications
+          GROUP BY pact_version_id
+        ) lv ON v.pact_version_id = lv.pact_version_id AND v.number = lv.latest_number"
+    )
+  end
+end

data/lib/pact_broker/api.rb

@@ -23,6 +23,8 @@ require 'pact_broker/api/resources/versions'
 require 'pact_broker/api/resources/pact_content_diff'
 require 'pact_broker/api/resources/previous_distinct_pact_version'
 require 'pact_broker/api/resources/latest_provider_pacts'
+require 'pact_broker/api/resources/verifications'
+require 'pact_broker/api/resources/latest_verifications_for_consumer_version'
 
 require 'webmachine/adapters/rack_mapped'
 
@@ -32,33 +34,46 @@ module PactBroker
     pact_api = Webmachine::Application.new do |app|
       app.routes do
         add(['trace', :*], Webmachine::Trace::TraceResource) unless ENV['RACK_ENV'] == 'production'
-        # Support both /pact and /pacts
-        # /pact will be deprecated
-        # Todo, rename /version/ to /versions
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact
-        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions', :consumer_version_number], Api::Resources::Pact # Not the standard URL, but keep for backwards compatibility
+
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions'], Api::Resources::PactVersions
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'versions', :consumer_version_number], Api::Resources::Pact # Not the standard URL, but keep for backwards compatibility
+
+        # Pacts
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'previous-distinct'], Api::Resources::PreviousDistinctPactVersion
         add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number, 'diff', 'previous-distinct'], Api::Resources::PactContentDiff
+
+        # Verifications
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'pact-version', :pact_version_sha, 'verifications'], Api::Resources::Verifications
+        add ['pacts', 'consumer', :consumer_name, 'versions', :consumer_version_number, 'verifications', 'latest'], Api::Resources::LatestVerificationsForConsumerVersion
+
+        # Latest pacts
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
+        add ['pacts', 'provider', :provider_name, 'consumer', :consumer_name, 'latest', :tag], Api::Resources::LatestPact
         add ['pacts', 'provider', :provider_name, 'latest'], Api::Resources::LatestProviderPacts
         add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts
+        add ['pacts', 'latest'], Api::Resources::LatestPacts
 
+        # Deprecated pact
         add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact # Deprecate, singular /pact
         add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'latest'], Api::Resources::LatestPact
-        add ['pacts', 'latest'], Api::Resources::LatestPacts
+
+        # Pacticipants
         add ['pacticipants'], Api::Resources::Pacticipants
         add ['pacticipants', :name], Api::Resources::Pacticipant
         add ['pacticipants', :pacticipant_name, 'versions'], Api::Resources::Versions
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number], Api::Resources::Version
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number, 'tags', :tag_name], Api::Resources::Tag
-        add ['relationships'], Api::Resources::Relationships
-        add ['groups', :pacticipant_name], Api::Resources::Group
+
+        # Webhooks
         add ['webhooks', 'provider', :provider_name, 'consumer', :consumer_name ], Api::Resources::PactWebhooks
         add ['webhooks', :uuid ], Api::Resources::Webhook
         add ['webhooks', :uuid, 'execute' ], Api::Resources::WebhookExecution
         add ['webhooks'], Api::Resources::Webhooks
+
+        add ['relationships'], Api::Resources::Relationships
+        add ['groups', :pacticipant_name], Api::Resources::Group
+
         add [], Api::Resources::Index
       end
     end