pact_broker 2.65.0 → 2.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f74ca577601716567fbf1b435dba1a2d0c8b3cec8d3c9f77ca3930ce83e49bd
-  data.tar.gz: 3920435e5b898db13b39808b43a0f40de770674ecf99ce84e3587b4658a1b0a5
+  metadata.gz: 03c656c61487fd81baf9eb94f73fa12ab27bdf5cea1bd2d670af63199123b6ef
+  data.tar.gz: '04022874b3eeb6681e79163431ce63c8d6760741dc7ec8db30cc87b8f9257a94'
 SHA512:
-  metadata.gz: 72e1efd36d6f4ccce34a9e7088ee0232678721606710a5d2a91f74d72ddb0b1d4642645ab26083af05683343f928818132ec37eab0b76e54efc0077fe4d474ea
-  data.tar.gz: 0dee5c2f282ca4a21e25502a4ea2c3d11dae57931e196297f4d3fcda46f6bfec82c155899e69975f72f79c16bc34813ce38b6bd9171c4d4d45238564f0d21255
+  metadata.gz: ce0f9fb3186ab25c419b61665245977abfbaa8d245437699c44de54783bde86d8281b950172532d02a31f6aa33f36046dde7a0636075fabe75f3f074c33016c2
+  data.tar.gz: f6b8baa8a66b80b50df9223086f8e67dd9233106897b15f5cfa16328e954805de786d4fbe672f3cee5ba831001edd78f5c0a977dfc5d767d4c79aa46a61b1010

data/.github/workflows/release_gem.yml

@@ -19,11 +19,17 @@ jobs:
     #     checkInterval: 15
     #   env:
     #     GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    - uses: pact-foundation/release-gem@v0.0.11
+    - id: release-gem
+      uses: pact-foundation/release-gem@v0.0.11
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
+    outputs:
+      gem_name: "${{ steps.release-gem.outputs.gem_name }}"
+      version: "${{ steps.release-gem.outputs.version }}"
+      increment: "${{ steps.release-gem.outputs.increment }}"
+
   notify-gem-released:
     needs: release
     strategy:

data/CHANGELOG.md

@@ -1,3 +1,71 @@
+<a name="v2.69.0"></a>
+### v2.69.0 (2020-11-24)
+
+#### Features
+
+* **wip**
+  * keep pacts as WIP when verified via the pactUrl passed though the webhook template parameters - experimental.	 ([a9b3fef0](/../../commit/a9b3fef0))
+
+* add link to the pact content version	 ([8eefba5f](/../../commit/8eefba5f))
+* display V3 provider states in HTML (#357)	 ([8e06a7f2](/../../commit/8e06a7f2))
+* optimise query for determining latest verification for consumer and provider	 ([7889b051](/../../commit/7889b051))
+
+#### Bug Fixes
+
+* return a 404 when the base pact for a pact diff doesn't exist	 ([74d3644d](/../../commit/74d3644d))
+* Add consumer name to inclusion reason log (#358)	 ([82901891](/../../commit/82901891))
+
+<a name="v2.68.1"></a>
+### v2.68.1 (2020-10-24)
+
+#### Bug Fixes
+
+* set default User-Agent header in webhook requests	 ([caa71f9b](/../../commit/caa71f9b))
+
+<a name="v2.68.0"></a>
+### v2.68.0 (2020-10-23)
+
+#### Features
+
+* use a sequence for the version order on postgres	 ([da497a76](/../../commit/da497a76))
+* only cascade apps for 404s (not 405s)	 ([4e1b3083](/../../commit/4e1b3083))
+* use a sequence for the verification number on postgres	 ([b8f029ee](/../../commit/b8f029ee))
+* optimise query to find latest verification for pact	 ([db17ef5a](/../../commit/db17ef5a))
+
+<a name="v2.67.0"></a>
+### v2.67.0 (2020-10-16)
+
+#### Features
+
+* **wip pacts**
+  * if a pact was successfully verified because it was included as a WIP pact, keep it as WIP	 ([16cae55d](/../../commit/16cae55d))
+  * add 'wip' column to verification results	 ([34f98592](/../../commit/34f98592))
+
+#### Bug Fixes
+
+* typo when rendering created webhook for old webhooks path	 ([1e6a06a0](/../../commit/1e6a06a0))
+* include can-i-deploy badge in is_badge_path? logic	 ([31ea5f34](/../../commit/31ea5f34))
+
+* **pacts for verification**
+  * gracefully log empty request body	 ([0e48d13a](/../../commit/0e48d13a))
+
+* **can-i-deploy**
+  * gracefully handle pacticipant not found	 ([f6903b23](/../../commit/f6903b23))
+
+<a name="v2.66.0"></a>
+### v2.66.0 (2020-10-01)
+
+#### Features
+
+* paginate pacticipant versions	 ([f489ba7b](/../../commit/f489ba7b))
+
+* **webhooks**
+  * add event name to group by clause when selecting latest triggered webhooks	 ([134f12c8](/../../commit/134f12c8))
+
+#### Bug Fixes
+
+* maintain latest and tag params when submitting page after following link from can-i-deploy debug logs	 ([6e2f1a85](/../../commit/6e2f1a85))
+
 <a name="v2.65.0"></a>
 ### v2.65.0 (2020-09-25)
 

data/Gemfile

@@ -18,13 +18,15 @@ group :test do
   gem 'rspec-pact-matchers', '~>0.1'
   gem 'bundler-audit', '~>0.4'
   gem 'fakefs', '~>0.4'
-  gem 'webmock', '~>2.3'
+  gem 'webmock', '~>3.9'
   gem 'rspec', '~>3.0'
   gem 'rspec-its', '~>1.2'
   gem 'database_cleaner', '~>1.8', '>= 1.8.1'
   gem 'timecop', '~> 0.9'
   gem 'faraday', '~>0.15'
+  gem 'faraday_middleware', '~> 0.14'
   gem 'docker-api', '~>1.34'
+  gem 'approvals', '>=0.0.1', '<1.0.0'
 end
 
 if ENV['INSTALL_MYSQL'] == "true"

data/db/ddl_statements/latest_triggered_webhooks.rb

@@ -0,0 +1,66 @@
+# These views find the latest triggered webhook for each webhook/consumer/provider
+# by finding the latest execution date for each webhook
+# then taking the row with the max ID in case there there are two
+# triggered webhooks for the same UUID and same creation date
+# Not sure if this is strictly necessary to do the extra step, but better to be
+# safe than sorry.
+# I probably could just take the max ID for each webhook/consumer/provider, but
+# something in my head says that
+# relying on the primary key for order is not a good idea, even though
+# according to the SQL it should be fine.
+def latest_triggered_webhook_creation_dates_v2
+  "select webhook_uuid, consumer_id, provider_id, max(created_at) as latest_triggered_webhook_created_at
+  from triggered_webhooks
+  group by webhook_uuid, consumer_id, provider_id"
+end
+
+# Ignore ltwcd.latest_triggered_webhook_created_at, it's there because postgres doesn't allow you to modify
+# the names and types of columns in a view
+def latest_triggered_webhook_ids_v2
+  "select tw.webhook_uuid, tw.consumer_id, tw.provider_id, ltwcd.latest_triggered_webhook_created_at, max(tw.id) as latest_triggered_webhook_id
+  from latest_triggered_webhook_creation_dates ltwcd
+  inner join triggered_webhooks tw
+  on tw.consumer_id = ltwcd.consumer_id
+  and tw.provider_id = ltwcd.provider_id
+  and tw.webhook_uuid = ltwcd.webhook_uuid
+  and tw.created_at = ltwcd.latest_triggered_webhook_created_at
+  group by tw.webhook_uuid, tw.consumer_id, tw.provider_id, ltwcd.latest_triggered_webhook_created_at"
+end
+
+def latest_triggered_webhooks_v2
+  "select tw.*
+  from triggered_webhooks tw
+  inner join latest_triggered_webhook_ids ltwi
+  on tw.consumer_id = ltwi.consumer_id
+  and tw.provider_id = ltwi.provider_id
+  and tw.webhook_uuid = ltwi.webhook_uuid
+  and tw.id = ltwi.latest_triggered_webhook_id"
+end
+
+# use explicit columns - can't drop event_name in 20200922_add_event_to_triggered_webhook.rb
+# if tw.* is used because you can't remove columns from a view in postgres
+def latest_triggered_webhooks_v3_rollback(is_postgres)
+  if is_postgres
+    "select tw.id, tw.trigger_uuid, tw.trigger_type, tw.pact_publication_id, tw.webhook_id, tw.webhook_uuid, tw.consumer_id, tw.provider_id, tw.status, tw.created_at, tw.updated_at, tw.verification_id, ''::text as event_name
+    from triggered_webhooks tw
+    inner join latest_triggered_webhook_ids ltwi
+    on tw.consumer_id = ltwi.consumer_id
+    and tw.provider_id = ltwi.provider_id
+    and tw.webhook_uuid = ltwi.webhook_uuid
+    and tw.id = ltwi.latest_triggered_webhook_id"
+  else
+    latest_triggered_webhooks_v2
+  end
+end
+
+##### v3
+
+# screw dates, just use IDs.
+def latest_triggered_webhooks_v3
+  "select tw.id, tw.trigger_uuid, tw.trigger_type, tw.pact_publication_id, tw.webhook_id, tw.webhook_uuid, tw.consumer_id, tw.provider_id, tw.status, tw.created_at, tw.updated_at, tw.verification_id, tw.event_name
+  from triggered_webhooks tw
+  inner join (select max(id) as max_id
+    from triggered_webhooks
+    group by webhook_uuid, consumer_id, provider_id, event_name) latest_ids
+  on latest_ids.max_id = tw.id"
+end

data/db/ddl_statements/latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,25 @@
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1 = "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publications_by_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id"
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2 = "select
+        provider_id,
+        consumer_id,
+        max(id) as latest_verification_id
+        from verifications v
+        group by provider_id, consumer_id"
+
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3 = "select
+        provider_id,
+        consumer_id,
+        max(verification_id) as latest_verification_id
+        from latest_verification_id_for_pact_version_and_provider_version v
+        group by provider_id, consumer_id"

data/db/migrations/20180119_update_latest_triggered_webhooks.rb

@@ -1,44 +1,10 @@
+require_relative '../ddl_statements/latest_triggered_webhooks'
+
 Sequel.migration do
   up do
-    # These views find the latest triggered webhook for each webhook/consumer/provider
-    # by finding the latest execution date for each webhook
-    # then taking the row with the max ID in case there there are two
-    # triggered webhooks for the same UUID and same creation date
-    # Not sure if this is strictly necessary to do the extra step, but better to be
-    # safe than sorry.
-    # I probably could just take the max ID for each webhook/consumer/provider, but
-    # something in my head says that
-    # relying on the primary key for order is not a good idea, even though
-    # according to the SQL it should be fine.
-
-    create_or_replace_view(:latest_triggered_webhook_creation_dates,
-      "select webhook_uuid, consumer_id, provider_id, max(created_at) as latest_triggered_webhook_created_at
-      from triggered_webhooks
-      group by webhook_uuid, consumer_id, provider_id"
-    )
-
-    # Ignore ltwcd.latest_triggered_webhook_created_at, it's there because postgres doesn't allow you to modify
-    # the names and types of columns in a view
-    create_or_replace_view(:latest_triggered_webhook_ids,
-      "select tw.webhook_uuid, tw.consumer_id, tw.provider_id, ltwcd.latest_triggered_webhook_created_at, max(tw.id) as latest_triggered_webhook_id
-      from latest_triggered_webhook_creation_dates ltwcd
-      inner join triggered_webhooks tw
-      on tw.consumer_id = ltwcd.consumer_id
-      and tw.provider_id = ltwcd.provider_id
-      and tw.webhook_uuid = ltwcd.webhook_uuid
-      and tw.created_at = ltwcd.latest_triggered_webhook_created_at
-      group by tw.webhook_uuid, tw.consumer_id, tw.provider_id, ltwcd.latest_triggered_webhook_created_at"
-    )
-
-    create_or_replace_view(:latest_triggered_webhooks,
-      "select tw.*
-      from triggered_webhooks tw
-      inner join latest_triggered_webhook_ids ltwi
-      on tw.consumer_id = ltwi.consumer_id
-      and tw.provider_id = ltwi.provider_id
-      and tw.webhook_uuid = ltwi.webhook_uuid
-      and tw.id = ltwi.latest_triggered_webhook_id"
-    )
+    create_or_replace_view(:latest_triggered_webhook_creation_dates, latest_triggered_webhook_creation_dates_v2)
+    create_or_replace_view(:latest_triggered_webhook_ids, latest_triggered_webhook_ids_v2)
+    create_or_replace_view(:latest_triggered_webhooks, latest_triggered_webhooks_v2)
   end
 
   down do

data/db/migrations/20180524_create_latest_verifications_for_consumer_and_provider.rb

@@ -1,17 +1,10 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
 
     # The most recent verification for each consumer/consumer version tag/provider
     latest_verifications = from(:verifications)

data/db/migrations/20180614_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -1,27 +1,15 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        provider_id,
-        consumer_id,
-        max(id) as latest_verification_id
-        from verifications v
-        group by provider_id, consumer_id")
+          LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
   end
 
   down do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
   end
 end

data/db/migrations/20200930_update_latest_triggered_webhooks.rb

@@ -0,0 +1,15 @@
+require_relative '../ddl_statements/latest_triggered_webhooks'
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    # TODO
+    # drop_view(:latest_triggered_webhook_ids)
+    # drop_view(:latest_triggered_webhook_creation_dates)
+    create_or_replace_view(:latest_triggered_webhooks, latest_triggered_webhooks_v3)
+  end
+
+  down do
+    create_or_replace_view(:latest_triggered_webhooks, latest_triggered_webhooks_v3_rollback(PactBroker::MigrationHelper.postgres?))
+  end
+end

data/db/migrations/20201006_add_wip_to_verification.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    add_column(:verifications, :wip, TrueClass, default: false, null: false)
+  end
+end

data/db/migrations/20201023_create_verification_number_sequence.rb

@@ -0,0 +1,20 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    if PactBroker::MigrationHelper.postgres?
+      row = from(:verification_sequence_number).select(:value).limit(1).first
+      start = row ? row[:value] + 100 : 1
+      run("CREATE SEQUENCE verification_number_sequence START WITH #{start}")
+    end
+  end
+
+  down do
+    if PactBroker::MigrationHelper.postgres?
+      nextval = execute("SELECT nextval('verification_number_sequence') as val") { |v| v.first["val"].to_i }
+      # Add a safety margin!
+      from(:verification_sequence_number).update(value: nextval + 100)
+      run("DROP SEQUENCE verification_number_sequence")
+    end
+  end
+end

data/db/migrations/20201024_create_version_order_sequence.rb

@@ -0,0 +1,20 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  up do
+    if PactBroker::MigrationHelper.postgres?
+      row = from(:version_sequence_number).select(:value).limit(1).first
+      start = row ? row[:value] + 100 : 1
+      run("CREATE SEQUENCE version_order_sequence START WITH #{start}")
+    end
+  end
+
+  down do
+    if PactBroker::MigrationHelper.postgres?
+      nextval = execute("SELECT nextval('version_order_sequence') as val") { |v| v.first["val"].to_i }
+      # Add a safety margin!
+      from(:version_sequence_number).update(value: nextval + 100)
+      run("DROP SEQUENCE version_order_sequence")
+    end
+  end
+end

data/db/migrations/20201026_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,14 @@
+require_relative 'migration_helper'
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3)
+  end
+
+  down do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
+  end
+end

data/db/migrations/migration_helper.rb

@@ -4,7 +4,7 @@ module PactBroker
     extend self
 
     def large_text_type
-      if adapter == 'postgres'
+      if postgres?
         :text
       else
         # Assume mysql
@@ -13,11 +13,19 @@ module PactBroker
     end
 
     def with_mysql
-      if adapter =~ /mysql/
+      if mysql?
         yield
       end
     end
 
+    def mysql?
+      adapter =~ /mysql/
+    end
+
+    def postgres?
+      adapter == 'postgres'
+    end
+
     def adapter
       Sequel::Model.db.adapter_scheme.to_s
     end

data/docker-compose-issue-repro.yml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+  pact-broker:
+    build:
+      context: .
+      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    ports:
+      - "9292:9292"
+    command: bundle exec rackup -p 9292 -o 0.0.0.0
+
+  repro-issue:
+    build:
+      context: .
+      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    depends_on:
+      - pact-broker
+    command: dockerize -wait http://pact-broker:9292 -timeout 30s /home/script/reproduce-issue.rb