pact_broker 2.85.1 → 2.86.0

data/spec/lib/pact_broker/webhooks/webhook_spec.rb

@@ -6,6 +6,7 @@ module PactBroker
       before do
         td.create_consumer("Foo")
           .create_provider("Bar")
+          .create_label("label1")
           .create_consumer_version
           .create_pact
           .create_global_webhook
@@ -13,11 +14,13 @@ module PactBroker
           .create_provider_webhook
           .create_provider("Wiffle")
           .create_provider_webhook
+          .create_webhook(provider: nil, consumer: nil, provider_label: "label1")
+          .create_webhook(provider: nil, consumer: nil, consumer_label: "label2", provider_label: "label1")
       end
 
       let(:consumer) { PactBroker::Domain::Pacticipant.find(name: "Foo") }
       let(:provider) { PactBroker::Domain::Pacticipant.find(name: "Bar") }
-      let(:pact) { double(consumer_id: consumer.id, provider_id: provider.id).as_null_object }
+      let(:pact) { PactBroker::Pacts::PactPublication.find(id: td.pact.id) }
 
       describe "#is_for?" do
         let(:matching_webhook_uuids) { Webhooks::Webhook.find_by_consumer_and_or_provider(consumer, provider).collect(&:uuid) }
@@ -25,10 +28,10 @@ module PactBroker
         let(:non_matching_webhooks) { Webhooks::Webhook.exclude(uuid: matching_webhook_uuids) }
 
         it "matches the implementation of Webhook::Repository#find_by_consumer_and_or_provider" do
-          expect(matching_webhooks.count).to be > 0
-          expect(non_matching_webhooks.count).to be > 0
-          expect(matching_webhooks.all?{|w| w.is_for?(pact)}).to be true
-          expect(non_matching_webhooks.all?{|w| !w.is_for?(pact)}).to be true
+          expect(matching_webhooks).not_to be_empty
+          expect(non_matching_webhooks).not_to be_empty
+          expect(matching_webhooks.reject{|w| w.is_for?(pact)}).to be_empty
+          expect(non_matching_webhooks.reject{|w| !w.is_for?(pact)}).to be_empty
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.85.1
+  version: 2.86.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -425,6 +425,7 @@ files:
 - ".github/workflows/release_gem.yml"
 - ".github/workflows/test-ruby-3.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/trigger_pact_docs_update.yml"
 - ".gitignore"
 - ".optic/.gitignore"
 - ".optic/api/specification.json"
@@ -611,6 +612,8 @@ files:
 - db/migrations/20210831_add_index_to_pact_publications.rb
 - db/migrations/20210908_add_auto_created.rb
 - db/migrations/20210913_add_pending_to_verifications.rb
+- db/migrations/20210914_add_labels_to_webhooks.rb
+- db/migrations/20210915_add_verified_by_to_verification.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -932,6 +935,7 @@ files:
 - lib/pact_broker/doc/views/pact/tag-prod-version.markdown
 - lib/pact_broker/doc/views/pact/tag-version.markdown
 - lib/pact_broker/doc/views/pacticipant/can-i-deploy-badge.markdown
+- lib/pact_broker/doc/views/pacticipant/label.markdown
 - lib/pact_broker/doc/views/pacticipant/versions.markdown
 - lib/pact_broker/doc/views/pending-provider-pacts.markdown
 - lib/pact_broker/doc/views/provider-pacts-for-verification.markdown
@@ -949,6 +953,7 @@ files:
 - lib/pact_broker/domain/verification.rb
 - lib/pact_broker/domain/version.rb
 - lib/pact_broker/domain/webhook.rb
+- lib/pact_broker/domain/webhook_pacticipant.rb
 - lib/pact_broker/domain/webhook_request.rb
 - lib/pact_broker/error.rb
 - lib/pact_broker/errors.rb
@@ -995,7 +1000,6 @@ files:
 - lib/pact_broker/pacticipants/generate_display_name.rb
 - lib/pact_broker/pacticipants/repository.rb
 - lib/pact_broker/pacticipants/service.rb
-- lib/pact_broker/pacts/all_pact_publications.rb
 - lib/pact_broker/pacts/build_verifiable_pact_notices.rb
 - lib/pact_broker/pacts/content.rb
 - lib/pact_broker/pacts/create_formatted_diff.rb
@@ -1005,15 +1009,13 @@ files:
 - lib/pact_broker/pacts/generate_sha.rb
 - lib/pact_broker/pacts/head_pact.rb
 - lib/pact_broker/pacts/latest_pact_publication_id_for_consumer_version.rb
-- lib/pact_broker/pacts/latest_pact_publications.rb
-- lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb
-- lib/pact_broker/pacts/latest_tagged_pact_publications.rb
 - lib/pact_broker/pacts/lazy_loaders.rb
 - lib/pact_broker/pacts/merger.rb
 - lib/pact_broker/pacts/metadata.rb
 - lib/pact_broker/pacts/order_hash_keys.rb
 - lib/pact_broker/pacts/pact_params.rb
 - lib/pact_broker/pacts/pact_publication.rb
+- lib/pact_broker/pacts/pact_publication_clean_selector_dataset_module.rb
 - lib/pact_broker/pacts/pact_publication_dataset_module.rb
 - lib/pact_broker/pacts/pact_publication_selector_dataset_module.rb
 - lib/pact_broker/pacts/pact_publication_wip_dataset_module.rb
@@ -1087,7 +1089,6 @@ files:
 - lib/pact_broker/ui/views/matrix/show.haml
 - lib/pact_broker/verifications/latest_verification_for_consumer_and_provider.rb
 - lib/pact_broker/verifications/latest_verification_for_consumer_version_tag.rb
-- lib/pact_broker/verifications/latest_verification_for_pact_version.rb
 - lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb
 - lib/pact_broker/verifications/placeholder_verification.rb
 - lib/pact_broker/verifications/pseudo_branch_status.rb
@@ -1248,6 +1249,7 @@ files:
 - script/data/issue-494.rb
 - script/data/pending.rb
 - script/data/tags.rb
+- script/data/verify-pact-for-multiple-selectors.rb
 - script/data/webhook.rb
 - script/db-spec.sh
 - script/demonstrate-version-branches.rb
@@ -1266,6 +1268,7 @@ files:
 - script/foo-bar-verification.json
 - script/foo-bar.json
 - script/generate-certificates-for-webooks-certificate-spec.rb
+- script/generate-erd
 - script/import-pg-database.sh
 - script/insert-self-signed-certificate-from-url.rb
 - script/issues/consumer-version-selectors-docs/issue-text.txt
@@ -1421,6 +1424,7 @@ files:
 - spec/integration/ui/index_spec.rb
 - spec/integration/ui/matrix_spec.rb
 - spec/integration/webhooks/certificate_spec.rb
+- spec/integration/webhooks/pact_publication_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
@@ -1512,6 +1516,7 @@ files:
 - spec/lib/pact_broker/build_http_options_spec.rb
 - spec/lib/pact_broker/certificates/service_spec.rb
 - spec/lib/pact_broker/config/load_spec.rb
+- spec/lib/pact_broker/config/runtime_configuration_documentation_spec.rb
 - spec/lib/pact_broker/config/runtime_configuration_logging_methods_spec.rb
 - spec/lib/pact_broker/config/runtime_configuration_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
@@ -1588,10 +1593,10 @@ files:
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/generate_interaction_sha_spec.rb
 - spec/lib/pact_broker/pacts/generate_sha_spec.rb
-- spec/lib/pact_broker/pacts/latest_tagged_pact_publications_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_clean_selector_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_latest_verification_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_selector_dataset_module_spec.rb
@@ -1622,7 +1627,6 @@ files:
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
-- spec/lib/pact_broker/verifications/latest_verification_for_pact_version_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb
@@ -1899,6 +1903,7 @@ test_files:
 - spec/integration/ui/index_spec.rb
 - spec/integration/ui/matrix_spec.rb
 - spec/integration/webhooks/certificate_spec.rb
+- spec/integration/webhooks/pact_publication_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
@@ -1990,6 +1995,7 @@ test_files:
 - spec/lib/pact_broker/build_http_options_spec.rb
 - spec/lib/pact_broker/certificates/service_spec.rb
 - spec/lib/pact_broker/config/load_spec.rb
+- spec/lib/pact_broker/config/runtime_configuration_documentation_spec.rb
 - spec/lib/pact_broker/config/runtime_configuration_logging_methods_spec.rb
 - spec/lib/pact_broker/config/runtime_configuration_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
@@ -2066,10 +2072,10 @@ test_files:
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/generate_interaction_sha_spec.rb
 - spec/lib/pact_broker/pacts/generate_sha_spec.rb
-- spec/lib/pact_broker/pacts/latest_tagged_pact_publications_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_clean_selector_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_latest_verification_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_selector_dataset_module_spec.rb
@@ -2100,7 +2106,6 @@ test_files:
 - spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb
 - spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb
-- spec/lib/pact_broker/verifications/latest_verification_for_pact_version_spec.rb
 - spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/sequence_spec.rb

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -1,158 +0,0 @@
-require "forwardable"
-require "pact_broker/domain/tag"
-require "pact_broker/domain/pacticipant"
-require "pact_broker/domain/version"
-require "pact_broker/pacts/pact_version"
-require "pact_broker/repositories/helpers"
-
-module PactBroker
-  module Pacts
-    class AllPactPublications < Sequel::Model(:all_pact_publications)
-
-      extend Forwardable
-
-      def_delegators :cached_domain, :name
-
-      set_primary_key :id
-      associate(:one_to_many, :tags, :class => "PactBroker::Domain::Tag", :reciprocal => :version, :key => :version_id, :primary_key => :consumer_version_id)
-      associate(:many_to_one, :pact_version, :key => :pact_version_id, :primary_key => :id)
-      associate(:many_to_one, :latest_verification, :class => "PactBroker::Verifications::LatestVerificationForPactVersion", key: :pact_version_id, primary_key: :pact_version_id)
-      associate(:many_to_one, :consumer_version, :class => "PactBroker::Domain::Version", :key => :consumer_version_id, :primary_key => :id)
-
-      dataset_module do
-        include PactBroker::Repositories::Helpers
-
-        def consumer consumer_name
-          where(name_like(:consumer_name, consumer_name))
-        end
-
-        def provider provider_name
-          where(name_like(:provider_name, provider_name))
-        end
-
-        # must be exactly correct names
-        def pacticipants pacticipant_1, pacticipant_2
-          where(
-            consumer_name: pacticipant_1,
-            provider_name: pacticipant_2
-          ).or(
-            consumer_name: pacticipant_2,
-            provider_name: pacticipant_1
-          )
-        end
-
-        def tag tag_name
-          filter = name_like(Sequel.qualify(:tags, :name), tag_name)
-          join(:tags, {version_id: :consumer_version_id}).where(filter)
-        end
-
-        def untagged
-          left_outer_join(:tags, {version_id: :consumer_version_id})
-            .where(Sequel.qualify(:tags, :name) => nil)
-        end
-
-        def consumer_version_number number
-          where(name_like(:consumer_version_number, number))
-        end
-
-        def maybe_consumer_version_number number
-          if number
-            where(name_like(:consumer_version_number, number))
-          else
-            self
-          end
-        end
-
-        def revision_number number
-          where(revision_number: number)
-        end
-
-        def pact_version_sha sha
-          where(pact_version_sha: sha)
-        end
-
-        def consumer_version_order_before order
-          where(Sequel.lit("consumer_version_order < ?", order))
-        end
-
-        def consumer_version_order_after order
-          where(Sequel.lit("consumer_version_order > ?", order))
-        end
-
-        def latest
-          reverse_order(:consumer_version_order).limit(1)
-        end
-
-        def earliest
-          order(:consumer_version_order).limit(1)
-        end
-      end
-
-      def to_domain
-        domain = to_domain_without_tags
-        domain.consumer_version.tags = tags.sort
-        domain
-      end
-
-      def to_domain_without_tags
-        consumer = Domain::Pacticipant.new(name: consumer_name)
-        consumer.id = consumer_id
-        provider = Domain::Pacticipant.new(name: provider_name)
-        provider.id = provider_id
-        consumer_version_struct = OpenStruct.new(
-          id: consumer_version_id,
-          number: consumer_version_number,
-          order: consumer_version_order,
-          pacticipant: consumer,
-          tags: nil
-        )
-        Domain::Pact.new(
-          id: id,
-          consumer: consumer,
-          consumer_version: consumer_version_struct,
-          provider: provider,
-          consumer_version_number: consumer_version_number,
-          revision_number: revision_number,
-          pact_version_sha: pact_version_sha,
-          created_at: created_at,
-          head_tag_names: head_tag_names,
-          latest_verification: pact_version.latest_verification,
-          db_model: self
-        )
-      end
-
-      def head_tag_names
-        @head_tag_names ||= PactBroker::Domain::Tag.head_tags_for_pact_publication(self).collect(&:name)
-      end
-
-      def to_domain_with_content
-        to_domain.tap do | pact |
-          pact.json_content = pact_version.content
-        end
-      end
-
-      private
-
-      def cached_domain
-        @cached_domain ||= to_domain
-      end
-
-    end
-
-  end
-end
-
-# Table: all_pact_publications
-# Columns:
-#  id                      | integer                     |
-#  consumer_id             | integer                     |
-#  consumer_name           | text                        |
-#  consumer_version_id     | integer                     |
-#  consumer_version_number | text                        |
-#  consumer_version_order  | integer                     |
-#  provider_id             | integer                     |
-#  provider_name           | text                        |
-#  revision_number         | integer                     |
-#  pact_version_id         | integer                     |
-#  pact_version_sha        | text                        |
-#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_pact_publications.rb

@@ -1,48 +0,0 @@
-require "pact_broker/pacts/latest_pact_publications_by_consumer_version"
-require "pact_broker/pacts/head_pact"
-
-module PactBroker
-  module Pacts
-
-    # latest pact for each consumer/provider pair
-    class LatestPactPublications < LatestPactPublicationsByConsumerVersion
-      set_dataset(:latest_pact_publications)
-
-      # def dataset_module
-      #   def where_age_less_than(days)
-      #     start_date = Date.today - days
-      #     where{ latest_pact_publications[:created_at] >= start_date }
-      #   end
-
-      #   def for_selector(selector)
-      #     query = self
-      #     query = query.where(consumer_name: selector.pacticipant_name) if selector.pacticipant_name
-      #     query = query.where(tag_name: selector.tag) if selector.tag && selector.tag.is_a?(String)
-      #     query = query.where_age_less_than(selector.max_age) if selector.max_age
-      #     query
-      #   end
-      # end
-
-      # This pact may well be the latest for certain tags, but in this query
-      # we don't know what they are
-      def to_domain
-        HeadPact.new(super, consumer_version_number, nil)
-      end
-    end
-  end
-end
-
-# Table: latest_pact_publications
-# Columns:
-#  id                      | integer                     |
-#  consumer_id             | integer                     |
-#  consumer_name           | text                        |
-#  consumer_version_id     | integer                     |
-#  consumer_version_number | text                        |
-#  consumer_version_order  | integer                     |
-#  provider_id             | integer                     |
-#  provider_name           | text                        |
-#  revision_number         | integer                     |
-#  pact_version_id         | integer                     |
-#  pact_version_sha        | text                        |
-#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb

@@ -1,26 +0,0 @@
-require "pact_broker/pacts/all_pact_publications"
-
-module PactBroker
-  module Pacts
-
-    class LatestPactPublicationsByConsumerVersion < AllPactPublications
-      set_dataset(:latest_pact_publications_by_consumer_versions)
-    end
-
-  end
-end
-
-# Table: latest_pact_publications_by_consumer_versions
-# Columns:
-#  id                      | integer                     |
-#  consumer_id             | integer                     |
-#  consumer_name           | text                        |
-#  consumer_version_id     | integer                     |
-#  consumer_version_number | text                        |
-#  consumer_version_order  | integer                     |
-#  provider_id             | integer                     |
-#  provider_name           | text                        |
-#  revision_number         | integer                     |
-#  pact_version_id         | integer                     |
-#  pact_version_sha        | text                        |
-#  created_at              | timestamp without time zone |

data/lib/pact_broker/pacts/latest_tagged_pact_publications.rb

@@ -1,45 +0,0 @@
-require "pact_broker/pacts/latest_pact_publications_by_consumer_version"
-require "pact_broker/pacts/head_pact"
-
-module PactBroker
-  module Pacts
-    class LatestTaggedPactPublications < LatestPactPublicationsByConsumerVersion
-      set_dataset(:latest_tagged_pact_publications)
-
-      dataset_module do
-        def where_age_less_than(days)
-          start_date = Date.today - days
-          where{ latest_tagged_pact_publications[:created_at] >= start_date }
-        end
-
-        def for_selector(selector)
-          query = self
-          query = query.where(consumer_name: selector.pacticipant_name) if selector.pacticipant_name
-          query = query.where(tag_name: selector.tag) if selector.tag && selector.tag.is_a?(String)
-          query = query.where_age_less_than(selector.max_age) if selector.max_age
-          query
-        end
-      end
-
-      def to_domain
-        HeadPact.new(super, consumer_version_number, tag_name)
-      end
-    end
-  end
-end
-
-# Table: latest_tagged_pact_publications
-# Columns:
-#  id                      | integer                     |
-#  consumer_id             | integer                     |
-#  consumer_name           | text                        |
-#  consumer_version_id     | integer                     |
-#  consumer_version_number | text                        |
-#  consumer_version_order  | integer                     |
-#  provider_id             | integer                     |
-#  provider_name           | text                        |
-#  revision_number         | integer                     |
-#  pact_version_id         | integer                     |
-#  pact_version_sha        | text                        |
-#  created_at              | timestamp without time zone |
-#  tag_name                | text                        |