pact_broker 2.89.1 → 2.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4932100e3772127c1bccbb90c5db0e943678d14577bf163e90e61a0cd32f8685
-  data.tar.gz: 9b136a90d19d213f7a28c10ad518dabf0a974be80e11f6d06e199584bef2ca28
+  metadata.gz: a41b90582f2bdd3705172c79b28f01ca1bf9db3c2a32aa221baf164315017d74
+  data.tar.gz: 3e3c6263edf2440b0fd1003f4a4bc03a4b81df3f85953a56e2dae23bd2b95fa2
 SHA512:
-  metadata.gz: d6820acb97cc28b5a94e7ae939b0ee5c87e96e626956c721b19484407771735fa33f07ae61bf3d4e4cab3bb17176d348a804715a670e925ffb47d5ece07efccc
-  data.tar.gz: 947e0f04cd880ee4dec65eceaf1bd0d82c0975338bcf0ed1efe309f3716b70d3e666be7b36814ce0382fcf462a0cf38156b22611332ee56135622cdbf6c4ef0e
+  metadata.gz: 0fdf1ae5f33491587a8a26f730976089a91a763376974f4703df46317b64e9814d2d4c56319c5417ebcad4485b79b9ec3d152175b4470d8021b7e27f9ce6ef6d
+  data.tar.gz: 7a02341d2cd0f63a7168b2d437f4b10346d82243dc0b624af686d74de645c4f611deb756ecd9076eb226666af38600bd6448c8abcb58633f4db10c8a5d5ed468

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="v2.90.0"></a>
+### v2.90.0 (2021-11-12)
+
+#### Features
+
+* do not let clean task delete currently deployed or currently released+supported versions	 ([b05f0b67](/../../commit/b05f0b67))
+* allow webhook certificates to be configured in the pact_broker.yml file	 ([7c60c955](/../../commit/7c60c955))
+
+#### Bug Fixes
+
+* handle conflict check for pacts where the interactions are missing in one or the other	 ([71844f0f](/../../commit/71844f0f))
+* fix error that occurs in some versions of Sqlite when running 20210702_drop_unused_columns_from_deployed_versions.rb	 ([0daa4459](/../../commit/0daa4459))
+* correct logic when redacting database URL without a password	 ([30d66cf7](/../../commit/30d66cf7))
+* set resolved environment for environment selectors	 ([f02474b7](/../../commit/f02474b7))
+
+* **deps**
+  * upgrade to bootstrap v4.6.1	 ([0433107c](/../../commit/0433107c))
+
 <a name="v2.89.1"></a>
 ### v2.89.1 (2021-10-28)
 

data/db/ddl_statements/all_verifications.rb

@@ -0,0 +1,21 @@
+def all_verifications_v2(connection)
+  # Need to fully qualify build_url because versions now has a build_url too.
+  # We don't use this view any more but we get an error when modifying other tables and views
+  # if we don't update this, so it must force some re-calculation to be done.
+  # See https://github.com/pact-foundation/pact_broker/issues/521
+  connection
+    .from(:verifications)
+    .select(
+      Sequel[:verifications][:id],
+      Sequel[:verifications][:number],
+      :success,
+      :provider_version_id,
+      Sequel[:v][:number].as(:provider_version_number),
+      Sequel[:v][:order].as(:provider_version_order),
+      Sequel[:verifications][:build_url],
+      :pact_version_id,
+      :execution_date,
+      Sequel[:verifications][:created_at],
+      :test_results
+    ).join(:versions, { id: :provider_version_id }, { :table_alias => :v })
+end

data/db/migrations/20210701_recreate_all_verifications.rb

@@ -0,0 +1,18 @@
+require_relative "../ddl_statements/all_verifications"
+
+# Naughtily insert this migration file after the creation of 20211104_switch_integrations_and_temp_integrations.rb
+# to fix the all_verifications view before
+# dropping the columns in 20210702_drop_unused_columns_from_deployed_versions.rb.
+# The update to all_verifications was already applied in
+# 20211101_recreate_all_verifications.rb, but some versions of SQLite error
+# if the view is not updated first, meaning 20210702 was never run.
+# It won't matter if this update runs out of order, as long as it's after
+# 20210117_add_branch_to_version.rb
+Sequel.migration do
+  up do
+    create_or_replace_view(:all_verifications, all_verifications_v2(self))
+  end
+
+  down do
+  end
+end

data/db/migrations/20211101_recreate_all_verifications.rb

@@ -0,0 +1,10 @@
+require_relative "../ddl_statements/all_verifications"
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:all_verifications, all_verifications_v2(self))
+  end
+
+  down do
+  end
+end

data/db/migrations/20211102_create_table_temp_integrations.rb

@@ -0,0 +1,26 @@
+Sequel.migration do
+  up do
+    # Have not created indexes on the consumer_id or provider_id because the table is likely to be small
+    # (in the 10s or 100s) and it would probably just do a full table scan anyway.
+    create_table(:temp_integrations, charset: "utf8") do
+      primary_key :id, primary_key_constraint_name: "integrations_pkey"
+      foreign_key(:consumer_id, :pacticipants, null: false, on_delete: :cascade, foreign_key_constraint_name: "integrations_consumer_id_foreign_key")
+      foreign_key(:provider_id, :pacticipants, null: false, on_delete: :cascade, foreign_key_constraint_name: "integrations_provider_id_foreign_key")
+      String :consumer_name
+      String :provider_name
+      DateTime :created_at, null: false
+      index([:consumer_id, :provider_id], unique: true, name: "integrations_consumer_id_provider_id_unique")
+    end
+
+    # TODO drop these columns
+    # They are just for backwards compatiblity during schema migrations
+    # alter_table(:integrations) do
+    #   drop_column(:consumer_name)
+    #   drop_column(:provider_name)
+    # end
+  end
+
+  down do
+    drop_table(:temp_integrations)
+  end
+end

data/db/migrations/20211103_migrate_integrations.rb

@@ -0,0 +1,21 @@
+Sequel.migration do
+  up do
+    from(:temp_integrations).insert(
+      [:consumer_id, :consumer_name, :provider_id, :provider_name, :created_at],
+      from(:pact_publications)
+        .select(
+          :consumer_id,
+          Sequel[:c][:name].as(:consumer_name),
+          :provider_id,
+          Sequel[:p][:name].as(:provider_name),
+          Sequel[:c][:created_at]
+        ).distinct
+        .join(:pacticipants, {:id => :consumer_id}, {:table_alias => :c, implicit_qualifier: :pact_publications})
+        .join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications})
+    )
+  end
+
+  down do
+
+  end
+end

data/db/migrations/20211104_switch_integrations_and_temp_integrations.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    transaction do
+      drop_view :integrations
+      rename_table :temp_integrations, :integrations
+    end
+  end
+
+  down do
+    transaction do
+      rename_table :integrations, :temp_integrations
+      create_view(:integrations,
+        from(:pact_publications)
+          .select(
+            :consumer_id,
+            Sequel[:c][:name].as(:consumer_name),
+            :provider_id,
+            Sequel[:p][:name].as(:provider_name)
+          ).distinct
+          .join(:pacticipants, {:id => :consumer_id}, {:table_alias => :c, implicit_qualifier: :pact_publications})
+          .join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications})
+      )
+    end
+  end
+end

data/docs/CONFIGURATION.md

@@ -392,6 +392,26 @@ Please read the [Webhook whitelists section](https://docs.pact.io/pact_broker/co
 **Examples:** `github.com`, `10.2.3.41/24`, `/.*\\.foo\\.com$/`<br/>
 **More information:** https://docs.pact.io/pact_broker/configuration/#webhook-whitelists<br/>
 
+### webhook_certificates
+
+A list of SSL certificate configuration objects with the keys `description`, and either `content` or `path`. These
+certificates are used when a webhook needs to connect to a server that uses a self signed certificate.
+
+Each certificate configuration item accepts a chain of certificates in PEM format - there may be multiple 'BEGIN CERTIFICATE' and 'END CERTIFICATE' in the content of each item.
+
+When setting the content, use the syntax "content: |-" followed by a new line, and then the contents of the certificate
+chain in PEM format, indented by 2 more characters.
+
+When setting the path, the full path to the certificate file in PEM format must be specified.
+
+The certificate configuration is not validated on startup. If any of the configured certificates cannot be loaded during the execution of a webhook, an error
+will be logged, and they will be ignored. You can check if the configuration is working by testing the execution of
+a webhook that connects to the server with the self signed certificate by following these instructions https://docs.pact.io/pact_broker/webhooks/debugging_webhooks#testing-webhook-execution
+
+**YAML configuration key name:** `webhook_certificates`<br/>
+**Environment variable name:** `PACT_BROKER_WEBHOOK_CERTIFICATES`<br/>
+**Supported versions:** From v2.90.0<br/>
+
 ### disable_ssl_verification
 
 If set to true, SSL verification will be disabled for the HTTP requests made by the webhooks
@@ -481,6 +501,16 @@ is available (do not use this for load balancing, as it makes a database connect
 **Default:** `true`<br/>
 **Allowed values:** `true`, `false`<br/>
 
+### use_hal_browser
+
+Whether or not to enable the embedded HAL Browser.
+
+**YAML configuration key name:** `use_hal_browser`<br/>
+**Environment variable name:** `PACT_BROKER_USE_HAL_BROWSER`<br/>
+**Default:** `true`<br/>
+**Allowed values:** `true`, `false`<br/>
+**More information:** https://github.com/mikekelly/hal-browser<br/>
+
 <br/>
 
 ## Domain

data/lib/pact_broker/app.rb

@@ -46,7 +46,7 @@ module PactBroker
       # Can only be required after database connection has been made because the decorators rely on the Sequel models
       @create_pact_broker_api_block = ->() { require "pact_broker/api"; PactBroker::API }
       @configuration = PactBroker.configuration
-      yield configuration
+      yield configuration if block_given?
       post_configure
       prepare_database
       load_configuration_from_database

data/lib/pact_broker/certificates/service.rb

@@ -25,9 +25,12 @@ module PactBroker
       end
 
       def find_all_certificates
+        certificates_from_database + certificates_from_config
+      end
+
+      def certificates_from_database
         Certificate.collect do | certificate |
-          cert_arr = certificate.content.split(/(-----END [^\-]+-----)/).each_slice(2).map(&:join).map(&:strip).select{|s| !s.empty?}
-          cert_arr.collect do |c|
+          split_certificate_chain(certificate.content).collect do |c|
             begin
               OpenSSL::X509::Certificate.new(c)
             rescue StandardError => e
@@ -37,6 +40,33 @@ module PactBroker
           end
         end.flatten.compact
       end
+
+      def certificates_from_config
+        PactBroker.configuration.webhook_certificates.select{| c| c[:content] || c[:path] }.collect do | certificate_config, i |
+          load_certificate_config(certificate_config, i)
+        end.flatten.compact
+      end
+
+      def load_certificate_config(certificate_config, i)
+        begin
+          content = certificate_config[:content] || File.read(certificate_config[:path])
+          split_certificate_chain(content).collect do |c|
+            begin
+              OpenSSL::X509::Certificate.new(c)
+            rescue StandardError => e
+              logger.warn("Error creating certificate object from webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+              nil
+            end
+          end
+        rescue StandardError => e
+          logger.warn("Error loading webhook_certificate at index #{i} with description #{certificate_config[:description]}", e)
+          nil
+        end
+      end
+
+      def split_certificate_chain(content)
+        content.split(/(-----END [^\-]+-----)/).each_slice(2).map(&:join).map(&:strip).select{|s| !s.empty?}
+      end
     end
   end
 end

data/lib/pact_broker/config/runtime_configuration.rb

@@ -52,6 +52,7 @@ module PactBroker
         webhook_scheme_whitelist: ["https"],
         webhook_host_whitelist: [],
         disable_ssl_verification: false,
+        webhook_certificates: [],
         user_agent: "Pact Broker v#{PactBroker::VERSION}",
       )
 
@@ -174,6 +175,14 @@ module PactBroker
         super(value_to_string_array(features, "features").collect(&:downcase))
       end
 
+      def webhook_certificates= webhook_certificates
+        if webhook_certificates.is_a?(Array)
+          super(webhook_certificates.collect(&:symbolize_keys))
+        elsif !webhook_certificates.nil?
+          raise_validation_error("webhook_certificates must be an array")
+        end
+      end
+
       def warning_error_classes
         warning_error_class_names.collect do | class_name |
           begin

data/lib/pact_broker/config/runtime_configuration_logging_methods.rb

@@ -38,8 +38,12 @@ module PactBroker
           if value && name.to_s.end_with?("_url")
             begin
               uri = URI(value)
-              uri.password = "*****"
-              uri.to_s
+              if uri.password
+                uri.password = "*****"
+                uri.to_s
+              else
+                value
+              end
             rescue StandardError
               "*****"
             end

data/lib/pact_broker/db/data_migrations/migrate_integrations.rb

@@ -0,0 +1,40 @@
+require "pact_broker/db/data_migrations/helpers"
+
+module PactBroker
+  module DB
+    module DataMigrations
+      class MigrateIntegrations
+        extend Helpers
+
+        def self.call(connection)
+          self_join = {
+            Sequel[:pact_publications][:consumer_id] => Sequel[:existing_integrations][:consumer_id],
+            Sequel[:pact_publications][:provider_id] => Sequel[:existing_integrations][:provider_id]
+          }
+
+          missing_integrations = connection
+                                  .from(:pact_publications)
+                                    .select(
+                                      Sequel[:pact_publications][:consumer_id],
+                                      Sequel[:consumer][:name].as(:consumer_name),
+                                      Sequel[:pact_publications][:provider_id],
+                                      Sequel[:provider][:name].as(:provider_name),
+                                      Sequel[:consumer][:created_at]
+                                    )
+                                    .distinct
+                                    .left_outer_join(:integrations, self_join, { :table_alias => :existing_integrations })
+                                    .join(:pacticipants, { :id => :consumer_id }, { :table_alias => :consumer, implicit_qualifier: :pact_publications })
+                                    .join(:pacticipants, { :id => :provider_id }, { :table_alias => :provider, implicit_qualifier: :pact_publications })
+                                    .where(Sequel[:existing_integrations][:provider_id] => nil)
+
+          connection
+            .from(:integrations)
+            .insert(
+            [:consumer_id, :consumer_name, :provider_id, :provider_name, :created_at],
+            missing_integrations
+          )
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/db/migrate_data.rb

@@ -27,6 +27,7 @@ module PactBroker
         DataMigrations::SetConsumerVersionOrderForPactPublications.call(database_connection)
         DataMigrations::SetExtraColumnsForTags.call(database_connection)
         DataMigrations::CreateBranches.call(database_connection)
+        DataMigrations::MigrateIntegrations.call(database_connection)
       end
     end
   end

data/lib/pact_broker/doc/views/webhooks.markdown

@@ -102,6 +102,8 @@ Webhooks can be created to match events of certain set of [consumers or provider
 
 `contract_content_changed:` triggered when the content of the contract, or tags applied to the contract have changed since the previous publication. If `base_equality_only_on_content_that_affects_verification_results` is set to `true` in the configuration (the default), any changes to whitespace, ordering of keys, or the ordering of the `interactions` or `messages` will be ignored, and will not trigger this event. It is recommended to trigger a provider verification build for this event.
 
+`contract_requiring_verification_published:` when a pact is published, triggered once for each unique provider version that is either the latest from the main branch of the provider, or is currently deployed or released.
+
 `provider_verification_published:` triggered whenever a provider publishes a verification result.
 
 `provider_verification_succeeded:` triggered whenever a provider publishes a successful verification result.
@@ -127,6 +129,7 @@ The following variables may be used in the request path, parameters or body, and
 * `${pactbroker.bitbucketVerificationStatus}`: the verification status using the correct keywords for posting to the the [Bitbucket commit status API](https://developer.atlassian.com/server/bitbucket/how-tos/updating-build-status-for-commits/).
 * `${pactbroker.gitlabVerificationStatus}`: the verification status using the correct keywords for posting to the the [Gitlab Commits API](https://docs.gitlab.com/ee/api/commits.html#post-the-build-status-to-a-commit).
 * `${pactbroker.verificationResultUrl}`: the URL to the relevant verification result.
+* `${pactbroker.providerVersionDescriptions}`: The descriptions of the provider version(s) for which the contract_requiring_verification_published webhook has been triggered. Only populated for the contract_requiring_verification_published event.
 
 Example usage:
 
@@ -143,6 +146,26 @@ Example usage:
       }
     }
 
+#### Pacticipant versions used in the template parameters
+
+The consumer version and provider version will be populated from different sources depending on which event has been triggered,
+and how it has been triggered.
+
+##### contract published/changed
+
+* *Consumer version*: The consumer version the pact is published with.
+* *Provider version*: This is the provider version of the latest verification for this pact content from the main branch of the provider, if it exists.  Otherwise, it is the overall latest provider version that has verified the pact content. If there is none, it will be empty.
+
+##### contract requiring verification published
+
+* *Consumer version*: The consumer version the pact is published with.
+* *Provider version*: A webhook will be triggered for each unique provider version that is either the latest from the main branch of the provider, or is currently deployed or released.
+
+##### provider verification published/failed/succeeded
+
+* *Consumer version*: If the pact was verified using the URL  passed through from the webhook, then the consumer version will be the one from the pact publication that triggered the webhook.  If the result was from the provider verification task, then a webhook will be triggered for each unique consumer version identified by the consumer version selectors that selected that pact content.
+* *Provider version*: The provider version that the verification was published with.
+
 <a name="whitelist"></a>
 ### Webhook Whitelist
 

data/lib/pact_broker/domain/pacticipant.rb

@@ -103,6 +103,8 @@ end
 # Referenced By:
 #  branches                                                     | branches_pacticipant_id_fkey                                    | (pacticipant_id) REFERENCES pacticipants(id) ON DELETE CASCADE
 #  currently_deployed_version_ids                               | currently_deployed_version_ids_pacticipant_id_fkey              | (pacticipant_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+#  integrations                                                 | integrations_consumer_id_foreign_key                            | (consumer_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+#  integrations                                                 | integrations_provider_id_foreign_key                            | (provider_id) REFERENCES pacticipants(id) ON DELETE CASCADE
 #  labels                                                       | labels_pacticipant_id_fkey                                      | (pacticipant_id) REFERENCES pacticipants(id)
 #  latest_pact_publication_ids_for_consumer_versions            | latest_pact_publication_ids_for_consumer_versi_consumer_id_fkey | (consumer_id) REFERENCES pacticipants(id) ON DELETE CASCADE
 #  latest_pact_publication_ids_for_consumer_versions            | latest_pact_publication_ids_for_consumer_versi_provider_id_fkey | (provider_id) REFERENCES pacticipants(id) ON DELETE CASCADE

data/lib/pact_broker/integrations/integration.rb

@@ -6,8 +6,8 @@ require "pact_broker/webhooks/webhook"
 
 module PactBroker
   module Integrations
-    class Integration < Sequel::Model
-      set_primary_key [:consumer_id, :provider_id]
+    class Integration < Sequel::Model(Sequel::Model.db[:integrations].select(:id, :consumer_id, :provider_id))
+      plugin :insert_ignore, identifying_columns: [:consumer_id, :provider_id]
       associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
       associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
       associate(:one_to_one, :latest_verification, :class => "PactBroker::Verifications::LatestVerificationForConsumerAndProvider", key: [:consumer_id, :provider_id], primary_key: [:consumer_id, :provider_id])
@@ -18,7 +18,7 @@ module PactBroker
       # Update: now we have pagination, we should probably filter the pacts by consumer/provider id.
       LATEST_PACT_EAGER_LOADER = proc do |eo_opts|
         eo_opts[:rows].each do |integration|
-          integration.associations[:latest_pact] = []
+          integration.associations[:latest_pact] = nil
         end
 
         PactBroker::Pacts::PactPublication.overall_latest.each do | pact |
@@ -53,12 +53,24 @@ module PactBroker
         end
       end)
 
+      def self.compare_by_last_action_date a, b
+        if b.latest_pact_or_verification_publication_date && a.latest_pact_or_verification_publication_date
+          b.latest_pact_or_verification_publication_date <=> a.latest_pact_or_verification_publication_date
+        elsif b.latest_pact_or_verification_publication_date
+          1
+        elsif a.latest_pact_or_verification_publication_date
+          -1
+        else
+          a <=> b
+        end
+      end
+
       def verification_status_for_latest_pact
         @verification_status_for_latest_pact ||= PactBroker::Verifications::PseudoBranchStatus.new(latest_pact, latest_pact&.latest_verification)
       end
 
       def latest_pact_or_verification_publication_date
-        [latest_pact.created_at, latest_verification_publication_date].compact.max
+        [latest_pact&.created_at, latest_verification_publication_date].compact.max
       end
 
       def latest_verification_publication_date
@@ -66,16 +78,28 @@ module PactBroker
       end
 
       def <=>(other)
-        [consumer.name.downcase, provider.name.downcase] <=> [other.consumer.name.downcase, other.provider.name.downcase]
+        [consumer_name.downcase, provider_name.downcase] <=> [other.consumer_name.downcase, other.provider_name.downcase]
+      end
+
+      def consumer_name
+        consumer.name
+      end
+
+      def provider_name
+        provider.name
       end
     end
   end
 end
 
 # Table: integrations
-# Primary Key: (consumer_id, provider_id)
 # Columns:
-#  consumer_id   | integer |
-#  consumer_name | text    |
-#  provider_id   | integer |
-#  provider_name | text    |
+#  id          | integer | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  consumer_id | integer | NOT NULL
+#  provider_id | integer | NOT NULL
+# Indexes:
+#  integrations_pkey                           | PRIMARY KEY btree (id)
+#  integrations_consumer_id_provider_id_unique | UNIQUE btree (consumer_id, provider_id)
+# Foreign key constraints:
+#  integrations_consumer_id_foreign_key | (consumer_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+#  integrations_provider_id_foreign_key | (provider_id) REFERENCES pacticipants(id) ON DELETE CASCADE

data/lib/pact_broker/integrations/repository.rb

@@ -0,0 +1,22 @@
+require "pact_broker/integrations/integration"
+
+module PactBroker
+  module Integrations
+    class Repository
+      def create_for_pact(consumer_id, provider_id)
+        if Integration.where(consumer_id: consumer_id, provider_id: provider_id).empty?
+          Integration.new(
+            consumer_id: consumer_id,
+            provider_id: provider_id,
+            created_at: Sequel.datetime_class.now
+          ).insert_ignore
+        end
+        nil
+      end
+
+      def delete(consumer_id, provider_id)
+        Integration.where(consumer_id: consumer_id, provider_id: provider_id).delete
+      end
+    end
+  end
+end

data/lib/pact_broker/integrations/service.rb

@@ -29,7 +29,7 @@ module PactBroker
           .eager(latest_pact: [:latest_verification, :pact_version])
           .eager(:latest_verification)
           .all
-          .sort { | a, b| b.latest_pact_or_verification_publication_date <=> a.latest_pact_or_verification_publication_date }
+          .sort { | a, b| Integration.compare_by_last_action_date(a, b) }
       end
 
       def self.delete(consumer_name, provider_name)
@@ -41,7 +41,7 @@ module PactBroker
         pact_service.delete_all_pact_versions_between(consumer_name, and: provider_name)
         webhook_repository.delete_by_consumer_and_provider(consumer, provider)
         version_repository.delete_orphan_versions(consumer, provider)
-
+        integration_repository.delete(consumer.id, provider.id)
         pacticipant_service.delete_if_orphan(consumer)
         pacticipant_service.delete_if_orphan(provider) unless consumer == provider
       end

data/lib/pact_broker/locale/en.yml

@@ -34,7 +34,7 @@ en:
             consumerVersionTags: The list of tag names for the most recent consumer version associated with the pact content, separated by ", "
             consumerVersionBranch: The repository branch associated with the consumer version
             providerVersionTags: The list of tag names for the provider version associated with the verification result, separated by ", ".
-            providerVersionDescriptions: The descriptions of the provider version(s) for which the contract_requiring_verification_published webhook has been triggered.
+            providerVersionDescriptions: The descriptions of the provider version(s) for which the contract_requiring_verification_published webhook has been triggered. Only populated for the contract_requiring_verification_published event.
             providerVersionBranch: The repository branch associated with the provider version
             consumerLabels: The list of labels for the consumer associated with the pact content, separated by ", ".
             providerLabels: The list of labels for the provider associated with the pact content, separated by ", ".
@@ -46,7 +46,6 @@ en:
             gitlabVerificationStatus: The verification status using the correct keywords for posting to the Gitlab Commits API. See https://docs.gitlab.com/ee/api/commits.html#post-the-build-status-to-a-commit
             eventName: The name of the event that triggered the webhook
             buildUrl: The URL of the build that published the resources that have triggered the webhook (currently only supported for contracts published using the 'all in one' endpoint).
-            currentlyDeployedProviderVersionNumber: The version number of the currently deployed provider version (when used in a template, the webhook will be triggered once for each currently deployed provider version)
         no_webhooks_enabled_for_event: No enabled webhooks found for the detected events
         webhook_triggered_for_event: Webhook %{webhook_description} triggered for event %{event_name}.
         triggered_webhook_see_logs: View logs at %{url}

data/lib/pact_broker/pacticipants/repository.rb

@@ -77,9 +77,14 @@ module PactBroker
         ).save
       end
 
+      def delete(pacticipant)
+        pacticipant.destroy
+      end
+
       def pacticipant_names
         PactBroker::Domain::Pacticipant.select(:name).order(:name).collect(&:name)
       end
+
       def delete_if_orphan(pacticipant)
         if PactBroker::Domain::Version.where(pacticipant: pacticipant).empty? &&
           PactBroker::Pacts::PactPublication.where(provider: pacticipant).or(consumer: pacticipant).empty? &&

data/lib/pact_broker/pacticipants/service.rb

@@ -79,7 +79,7 @@ module PactBroker
       def self.delete(name)
         pacticipant = find_pacticipant_by_name name
         webhook_service.delete_all_webhhook_related_objects_by_pacticipant(pacticipant)
-        pacticipant.destroy
+        pacticipant_repository.delete(pacticipant)
       end
 
       def self.delete_if_orphan(pacticipant)

data/lib/pact_broker/pacts/merger.rb

@@ -9,10 +9,14 @@ module PactBroker
       def conflict? original_json, additional_json
         original, additional = [original_json, additional_json].map{|str| JSON.parse(str, PACT_PARSING_OPTIONS) }
 
-        additional["interactions"].any? do |new_interaction|
-          original["interactions"].any? do |original_interaction|
-            same_description_and_state?(original_interaction, new_interaction) &&
-              !same_request_properties?(original_interaction["request"], new_interaction["request"])
+        if original["interactions"].nil? || additional["interactions"].nil?
+          true
+        else
+          additional["interactions"].any? do |new_interaction|
+            original["interactions"].any? do |original_interaction|
+              same_description_and_state?(original_interaction, new_interaction) &&
+                !same_request_properties?(original_interaction["request"], new_interaction["request"])
+            end
           end
         end
       end

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -111,7 +111,7 @@ module PactBroker
       end
 
       def create_selected_pact(pact_publication, selector)
-        resolved_selector = if selector.currently_deployed? || selector.currently_supported?
+        resolved_selector = if selector.currently_deployed? || selector.currently_supported? || selector.in_environment?
                               environment = environment_service.find_by_name(pact_publication.values.fetch(:environment_name))
                               selector.resolve_for_environment(pact_publication.consumer_version, environment, pact_publication.values[:target])
                             else

data/lib/pact_broker/pacts/repository.rb

@@ -37,6 +37,7 @@ module PactBroker
       end
 
       def create params
+        integration_repository.create_for_pact(params.fetch(:consumer_id), params.fetch(:provider_id))
         pact_version = find_or_create_pact_version(
           params.fetch(:consumer_id),
           params.fetch(:provider_id),

data/lib/pact_broker/repositories.rb

@@ -47,6 +47,11 @@ module PactBroker
       PactBroker::Versions::BranchVersionRepository.new
     end
 
+    def integration_repository
+      require "pact_broker/integrations/repository"
+      PactBroker::Integrations::Repository.new
+    end
+
     extend self
   end
 end