pact_broker 2.116.0 → 2.117.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6fe2169fc6d5b3554dc0da5de9e5e73fddbb186fb56a0bede25809d7ef3254
-  data.tar.gz: 5c0e050b04a5d478b46b016a8bda1eae907457c4d7dac7985ca6c8c1c4b25226
+  metadata.gz: c52b0ab9c14e0eff3a49143fa09d4205ba9c1d9c16e96fd8e88bc74fb2b798d2
+  data.tar.gz: bf44ad81e1676d10d8af2912875726cdc50e91bbfbd10b02b62d689d7590fbaa
 SHA512:
-  metadata.gz: 3fa91a39b55d0d3783e9ac6ce873bc1c2b88434409d6b64e49aff53747b1d776806fedf1342285741883bcf6aebe11e7bdca79fe91fc2ac1ec5fbe29d3fb4d31
-  data.tar.gz: 6fc4a2ff15cfb1a0cda2b83d73317c0ff28b835c1bc1205c68ebfcea52428c619c5439c96ad35d2dcdfd06aeda670c2ebc4c8ad6bc4f7f68dd3d9e720712b67b
+  metadata.gz: 0f9ef0b473f58fd3b60c4c6e61125041bf93002d5cff4fe03f589583ca4bff47e719a23bd14220c18a78e0ce662cb0dfcda0947c94b253d96c7caf4bfdb55238
+  data.tar.gz: 8558c5f412cd6bbbdf21b1af7e235c7f3f78b6e871a7584d7654319758043c7652d341cab21e4b00c1f6014bd5e950bd7484a4eb1ec5e384dcb09237d8e0db2d

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="v2.117.1"></a>
+### v2.117.1 (2025-11-02)
+
+#### Bug Fixes
+
+* dashboard loading after zeitwerk rename prep	 ([13112e2f](/../../commit/13112e2f))
+
+<a name="v2.117.0"></a>
+### v2.117.0 (2025-10-28)
+
+#### Features
+
+* add provider pacts by branch endpoints	 ([0ccff2ec](/../../commit/0ccff2ec))
+* PACT-4511/updated matrix decorator to return app instance for an env if present (#838)	 ([8bc24e72](/../../commit/8bc24e72))
+* support provider states by branch/env	 ([f4db396f](/../../commit/f4db396f))
+
+#### Bug Fixes
+
+* update hal relations for provider pacts	 ([b6e8e8e3](/../../commit/b6e8e8e3))
+* drop pact-support pin	 ([3c7eb4c5](/../../commit/3c7eb4c5))
+* fixed the text fixtures (#826)	 ([28035c27](/../../commit/28035c27))
+
+* **test**
+  * update expectation of webhook_certificates source format dependant on rb version	 ([5364c1b1](/../../commit/5364c1b1))
+
+* **deps**
+  * add mutex_m/csv/ostruct/pstore	 ([075d2522](/../../commit/075d2522))
+
 <a name="v2.116.0"></a>
 ### v2.116.0 (2025-07-04)
 

data/Gemfile

@@ -9,8 +9,7 @@ gem "conventional-changelog", "~>1.3"
 gem "bump", "~> 0.5"
 gem "padrino-core", ">= 0.16.0.pre3", require: false
 gem "rackup", "~> 2.2"
-# TODO: using release-candidate of pact-support is release remove this and restore to gemspec.
-gem "pact-support", github: "pact-foundation/pact-support", branch: "release-1.21.3.rc1"
+gem "thor", "~> 1.4" # thor is secondary dependency but bumping here to avoid CVEs
 
 group :development do
   gem "pry-byebug"
@@ -22,7 +21,13 @@ end
 
 group :test do
   gem "simplecov", :require => false
-  gem "pact", "~>1.14"
+  if ENV["X_PACT_DEVELOPMENT"] == "true"
+    gem "pact", path: "../pact-ruby"
+    gem "pact-ffi", path: "../pact-ruby-ffi"
+  else
+    gem "pact", "~>1.14"
+    gem "pact-ffi", "~>0.4.28"
+  end
   gem "rspec-pact-matchers", "~>0.1"
   gem "bundler-audit", "~>0.4"
   gem "webmock", "~>3.9"
@@ -35,11 +40,11 @@ group :test do
   gem "approvals", ">=0.0.24", "<1.0.0"
   gem "tzinfo", "~>2.0"
   gem "faraday-retry", "~>2.0"
-  gem "openapi_first", "2.9.2" # pinned to specific version due to changelog volatility
+  gem "openapi_first", "~>2.0"
 end
 
 group :pg, optional: true do
-  gem "pg", "~>1.2"
+  gem "pg", "~>1.6"
 end
 
 group :mysql, optional: true do

data/lib/pact_broker/api/contracts/dry_validation_errors_formatter.rb

@@ -41,6 +41,9 @@ module PactBroker
             add_error(errors_hash, error.path.first, "#{error.path.last} #{error.text} (at index #{error.path[1]})")
           elsif error_path_classes == [Symbol, Integer]
             add_error(errors_hash, error.path.first, "#{error.text} (at index #{error.path[1]})")
+          elsif error_path_classes == [Symbol, Symbol, Integer]
+            # this should be refactored to dynamically handle patterns instead of hardcoding the patterns
+            add_error(errors_hash, error.path.first, "#{error.path[1]} #{error.text} (at index #{error.path[2]})")
           else
             # Don't have any usecases for this - will deal with it when it happens
             raise PactBroker::Error, "Cannot currently format an error message with path classes #{error_path_classes}"

data/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb

@@ -5,7 +5,7 @@ require "pact_broker/logging"
 module PactBroker
   module Api
     module Contracts
-      class PactsForVerificationJSONQuerySchema < BaseContract
+      class PactsForVerificationJsonQuerySchema < BaseContract
         json do
           optional(:providerVersionBranch).maybe(:string)
           optional(:providerVersionTags).maybe(:array?)

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -83,7 +83,9 @@ module PactBroker
               name: deployed_version.environment.display_name,
               href: deployed_version_url(deployed_version, context.fetch(:base_url)),
               currently_deployed: deployed_version.currently_deployed
-            }
+            }.tap do |hash|
+              hash[:application_instance] = deployed_version.application_instance unless deployed_version.application_instance.nil?
+            end
           end
         end
 

data/lib/pact_broker/api/resources/clean.rb

@@ -19,7 +19,7 @@ module PactBroker
         def process_post
           if content_type_json?
             keep_selectors = (params[:keep] || []).collect do | hash |
-              PactBroker::Matrix::UnresolvedSelector.new(hash)
+              PactBroker::DB::Clean::Selector.new(hash)
             end
 
             result = PactBroker::DB::Clean.call(Sequel::Model.db, { keep: keep_selectors })

data/lib/pact_broker/api/resources/index.rb

@@ -49,6 +49,54 @@ module PactBroker
               title: "All versions of a pact for a given consumer, provider and consumer version tag",
               templated: false
             },
+            "pb:branch-pact-versions" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}",
+              title: "All versions of pacts for a provider, for a named consumers branch",
+              templated: true
+            },
+            "pb:latest-branch-pact-versions" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest",
+              title: "Latest version of pact for a provider, for a named consumers branch",
+              templated: true
+            },
+            "pb:main-branch-pact-versions" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch",
+              title: "All versions of pacts for a provider, for a named consumers main branch",
+              templated: true
+            },
+            "pb:latest-main-branch-pact-versions" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/consumer/{consumer}/branch/latest",
+              title: "Latest version of pact for a provider, for a named consumers main branch",
+              templated: true
+            },
+            "pb:provider-pacts-with-main-branch" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/branch",
+              title: "All pacts for a provider, for any consumers main branch",
+              templated: true
+            },
+            "pb:provider-pacts-with-branch" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/branch/{branch}",
+              title: "All pacts for a provider, for any consumers named branch",
+              templated: true
+            },
+            "pb:latest-provider-pacts-with-main-branch" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/branch/latest",
+              title: "Latest pact for a provider, for any consumers main branch",
+              templated: true
+            },
+            "pb:latest-provider-pacts-with-branch" =>
+            {
+              href: base_url + "/pacts/provider/{provider}/branch/{branch}/latest",
+              title: "Latest pacts for a provider, for any consumers named branch",
+              templated: true
+            },
             "pb:pacticipants" =>
             {
               href: base_url + "/pacticipants",

data/lib/pact_broker/api/resources/latest_provider_pacts_for_branch.rb

@@ -0,0 +1,26 @@
+require "pact_broker/api/resources/provider_pacts"
+require "pact_broker/configuration"
+require "pact_broker/api/decorators/provider_pacts_decorator"
+
+module PactBroker
+  module Api
+    module Resources
+      class LatestProviderPactsForBranch < ProviderPacts
+        private
+
+        def pacts
+          pact_service.find_latest_pacts_for_provider_by_consumer_branch(
+          provider_name, 
+          branch_name: identifier_from_path[:branch_name], 
+          main_branch: identifier_from_path[:branch_name].nil?,
+          )
+        end
+
+        def resource_title
+          suffix = identifier_from_path[:branch_name] ? " with consumer version branch '#{identifier_from_path[:branch_name]}'" : ""
+          "Latest pact versions for the provider #{identifier_from_path[:provider_name]}#{suffix}#{!!identifier_from_path[:main_branch] ? ' for main branch' : ''}"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/pact_versions_for_branch.rb

@@ -14,13 +14,27 @@ module PactBroker
         end
 
         def allowed_methods
-          ["DELETE", "OPTIONS"]
+          ["GET", "DELETE", "OPTIONS"]
         end
 
         def resource_exists?
           consumer && provider
         end
 
+        def to_json
+          decorator_class(:pact_versions_decorator).new(pacts).to_json(**decorator_options(identifier_from_path))
+        end
+
+        def pacts
+          @pacts ||= pact_service.find_pacts_for_provider_and_consumer_by_consumer_branch(
+            provider_name,
+            consumer_name,
+            branch_name: identifier_from_path[:branch_name],
+            main_branch: identifier_from_path[:branch_name].nil?,
+            latest: identifier_from_path[:resource_name] == "latest_pact_publications_for_main_branch" || identifier_from_path[:resource_name] == "latest_pact_publications_for_branch"
+          )
+        end
+
         def delete_resource
           pact_service.delete_all_pact_publications_between consumer_name, and: provider_name, branch_name: identifier_from_path[:branch_name]
           set_post_deletion_response

data/lib/pact_broker/api/resources/provider_pacts_for_consumer_branch.rb

@@ -0,0 +1,47 @@
+require "pact_broker/api/resources/base_resource"
+require "pact_broker/configuration"
+require "pact_broker/api/decorators/provider_pacts_decorator"
+
+module PactBroker
+  module Api
+    module Resources
+      class ProviderPactsForConsumerBranch < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def resource_exists?
+          !!provider
+        end
+
+        def policy_name
+          :'pacts::provider_pacts'
+        end
+
+        def to_json
+          decorator_class(:provider_pacts_decorator).new(pacts).to_json(**decorator_options(identifier_from_path.merge(title: resource_title)))
+        end
+
+        private
+
+        def pacts
+          pact_service.find_pacts_for_provider_by_consumer_branch(
+          provider_name, 
+          branch_name: identifier_from_path[:branch_name], 
+          main_branch: identifier_from_path[:branch_name].nil?,
+          )
+        end
+
+        def resource_title
+          suffix = identifier_from_path[:branch_name] ? " with consumer version branch '#{identifier_from_path[:branch_name]}'" : ""
+          "All pact versions for the provider #{identifier_from_path[:provider_name]}#{suffix}#{!!identifier_from_path[:main_branch] ? ' for main branch' : ''}"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/provider_pacts_for_verification.rb

@@ -73,9 +73,9 @@ module PactBroker
 
         def schema
           if request.get?
-            PactBroker::Api::Contracts::PactsForVerificationQueryStringSchema
+            api_contract_class(:pacts_for_verification_query_string_schema)
           elsif request.post?
-            PactBroker::Api::Contracts::PactsForVerificationJSONQuerySchema
+            api_contract_class(:pacts_for_verification_json_query_schema)
           end
         end
 

data/lib/pact_broker/api/resources/provider_states.rb

@@ -25,12 +25,18 @@ module PactBroker
           :'pacts::pact'
         end
 
-        private
+        def environment_uuid
+          identifier_from_path[:environment_uuid]
+        end
 
-        # attr_reader :provider_states
+        def branch_name
+          identifier_from_path[:branch_name]
+        end
+
+        private
 
         def provider_states
-          @provider_states ||= provider_state_service.list_provider_states(provider)
+          @provider_states ||= provider_state_service.list_provider_states(provider, branch_name, environment_uuid)
         end
       end
     end

data/lib/pact_broker/api.rb

@@ -33,6 +33,9 @@ module PactBroker
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "versions"], Api::Resources::PactVersions, {resource_name: "pact_publications"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "versions", :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publication", deprecated: true} # Not the standard URL, but keep for backwards compatibility
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "tag", :tag], Api::Resources::TaggedPactVersions, {resource_name: "tagged_pact_publications"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch"], Api::Resources::PactVersionsForBranch, {resource_name: "pact_publications_for_main_branch"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", "latest"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_main_branch"}
+        add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name, "latest"], Api::Resources::PactVersionsForBranch, {resource_name: "latest_pact_publications_for_branch"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "branch", :branch_name], Api::Resources::PactVersionsForBranch, {resource_name: "pact_publications_for_branch"}
 
         # Pacts
@@ -43,10 +46,16 @@ module PactBroker
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "version", :consumer_version_number, "diff", "previous-distinct"], Api::Resources::PactContentDiff, {resource_name: "previous_distinct_pact_version_diff"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "version", :consumer_version_number, "diff", "version", :comparison_consumer_version], Api::Resources::PactContentDiff, {resource_name: "pact_version_diff_by_consumer_version"}
         add ["pacts", "provider", :provider_name, "consumer", :consumer_name, "pact-version", :pact_version_sha, "diff", "pact-version", :comparison_pact_version_sha], Api::Resources::PactContentDiff, {resource_name: "pact_version_diff_by_pact_version_sha"}
+        add ["pacts", "provider", :provider_name, "branch", "latest"], Api::Resources::LatestProviderPactsForBranch, {resource_name: "latest_main_branch_provider_pact_publications"}
+        add ["pacts", "provider", :provider_name, "branch", :branch_name, "latest"], Api::Resources::LatestProviderPactsForBranch, {resource_name: "latest_branch_provider_pact_publications"}
+        add ["pacts", "provider", :provider_name, "branch", :branch_name], Api::Resources::ProviderPactsForConsumerBranch, {resource_name: "branch_provider_pact_publications"}
+        add ["pacts", "provider", :provider_name, "branch"], Api::Resources::ProviderPactsForConsumerBranch, {resource_name: "main_branch_provider_pact_publications"}
 
         # Provider states
 
         add ["pacts", "provider", :provider_name, "provider-states"], Api::Resources::ProviderStates, { resource_name: "provider_states" }
+        add ["pacts", "provider", :provider_name, "provider-states", "branch", :branch_name], Api::Resources::ProviderStates, { resource_name: "provider_states_for_branch" }
+        add ["pacts", "provider", :provider_name, "provider-states", "environment", :environment_uuid], Api::Resources::ProviderStates, { resource_name: "provider_states_for_environment" }
 
 
         # Verifications

data/lib/pact_broker/app.rb

@@ -23,7 +23,6 @@ require "rack/pact_broker/application_context"
 require "sucker_punch"
 require "pact_broker/api/middleware/configuration"
 require "pact_broker/api/middleware/basic_auth"
-require "pact_broker/config/basic_auth_configuration"
 require "pact_broker/api/authorization/resource_access_policy"
 require "pact_broker/api/middleware/http_debug_logs"
 require "pact_broker/application_context"

data/lib/pact_broker/config/runtime_configuration.rb

@@ -3,7 +3,7 @@ require "pact_broker/config/runtime_configuration_logging_methods"
 require "pact_broker/config/runtime_configuration_database_methods"
 require "pact_broker/config/runtime_configuration_coercion_methods"
 require "pact_broker/version"
-require "pact_broker/config/basic_auth_configuration"
+require "pact_broker/config/runtime_configuration_basic_auth_methods"
 require "pact_broker/string_refinements"
 require "pact_broker/hash_refinements"
 require "pact_broker/error"

data/lib/pact_broker/doc/views/index/branch-pact-versions.markdown

@@ -0,0 +1,7 @@
+# Branch pact versions
+
+ Allowed methods: `GET`
+
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}`
+
+ Lists all the pact versions with the specified consumer, provider and consumer version branch.

data/lib/pact_broker/doc/views/index/latest-branch-pact-versions.markdown

@@ -0,0 +1,7 @@
+# Latest Branch pact versions
+
+ Allowed methods: `GET`
+
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/{branch}/latest`
+
+ Returns the latest pact version with the specified consumer, provider and consumer version branch.

data/lib/pact_broker/doc/views/index/latest-main-branch-pact-versions.markdown

@@ -0,0 +1,7 @@
+# Latest main branch pact versions
+
+ Allowed methods: `GET`
+
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch/latest`
+
+ Lists all latest pact version with the specified consumer, provider and the consumers main branch.

data/lib/pact_broker/doc/views/index/latest-provider-pacts-with-branch.markdown

@@ -0,0 +1,7 @@
+# Latest pacts for provider with the specified consumer branch
+
+Allowed methods: `GET`
+
+Path: `/pacts/provider/{provider}/branch/{branch}/latest`
+
+Given a provider name and a consumer version branch name, this resource returns the latest pact for each consumer that has the specified branch.

data/lib/pact_broker/doc/views/index/latest-provider-pacts-with-main-branch.markdown

@@ -0,0 +1,7 @@
+# Latest pacts for provider with the consumer main branch
+
+Allowed methods: `GET`
+
+Path: `/pacts/provider/{provider}/branch/latest`
+
+Given a provider name, this resource returns the latest pact for each consumers specified main branch.

data/lib/pact_broker/doc/views/index/latest-provider-pacts-with-tag.markdown

@@ -1,5 +1,7 @@
-# Latest pacts for provider with the specified tag
+# Latest pacts for provider with the specified consumer version tag
 
 Allowed methods: `GET`
 
+Path: `/pacts/provider/{provider}/latest/{tag}`
+
 Given a provider name and a consumer version tag name, this resource returns the latest pact for each consumer that has the specified tag.

data/lib/pact_broker/doc/views/index/main-branch-pact-versions.markdown

@@ -0,0 +1,7 @@
+# Main Branch pact versions
+
+ Allowed methods: `GET`
+
+ Path: `/pacts/provider/{provider}/consumer/{consumer}/branch`
+
+ Lists all the pact versions with the specified consumer, provider and the consumers main branch.

data/lib/pact_broker/doc/views/index/provider-pacts-with-branch.markdown

@@ -0,0 +1,7 @@
+# Provider pacts with consumer branch
+
+Allowed methods: `GET`
+
+Path: `/pacts/provider/{provider}/branch/{branch}`
+
+Given a pacticipant name and a consumer branch, this resource returns all the pact versions for all consumers of this provider with the specified consumer branch. For most use cases, the `latest-provider-pacts-with-branch` relation will better serve consumer needs by only returning the latest pact version for specified consumer branches.

data/lib/pact_broker/doc/views/index/provider-pacts-with-main-branch.markdown

@@ -0,0 +1,7 @@
+# All pacts for provider with the consumer main branch
+
+Allowed methods: `GET`
+
+Path: `/pacts/provider/{provider}/branch`
+
+Given a provider name, this resource returns the latest pact for each consumers specified main branch.

data/lib/pact_broker/doc/views/index/provider-pacts-with-tag.markdown

@@ -2,4 +2,6 @@
 
 Allowed methods: `GET`
 
+Path: `/pacts/provider/{provider}/tag/{tag}`
+
 Given a pacticipant name and a consumer version tag, this resource returns all the pact versions for all consumers of this provider with the specified tag. The most common use of this resource is to find all the `production` pact versions for the mobile consumers of an API, so that backwards compatibility can be maintained.

data/lib/pact_broker/doc/views/pact/provider-states.markdown

@@ -2,12 +2,20 @@
 
 Allowed methods: `GET`
 
-Path: `/pacts/provider/{provider}/provider-states`
-
 This resource returns a aggregated de-duplicated list of all provider states for a given provider.
 
+Path: `/pacts/provider/{provider}/provider-states`
+
 Provider states are collected from the latest pact on the main branch for any dependant consumers.
 
+Path: `/pacts/provider/{provider}/provider-states/branch/{branch_name}`
+
+Provider states are collected from the latest pacts on the specified branch for any dependant consumers.
+
+Path: `/pacts/provider/{provider}/provider-states/environment/{environment_name}`
+
+Provider states are collected from the latest pacts in the specified environment for any dependant consumers.
+
 Example response
 
 ```json
@@ -25,4 +33,3 @@ Example response
     ]
 }
 ```
-

data/lib/pact_broker/pacts/pact_publication.rb

@@ -3,7 +3,7 @@ require "pact_broker/dataset"
 require "pact_broker/domain/pact"
 require "pact_broker/pacts/pact_version"
 require "pact_broker/integrations/integration"
-require "pact_broker/tags/head_pact_tags"
+require "pact_broker/tags/head_pact_tag"
 require "pact_broker/pacts/pact_publication_dataset_module"
 require "pact_broker/pacts/pact_publication_wip_dataset_module"
 require "pact_broker/pacts/eager_loaders"

data/lib/pact_broker/pacts/pact_publication_selector_dataset_module.rb

@@ -44,6 +44,14 @@ module PactBroker
           .remove_overridden_revisions_from_complete_query
       end
 
+      def for_main_branches
+        consumers_join = { Sequel[:pact_publications][:consumer_id] => Sequel[:consumers][:id] }
+        query = self
+        query
+          .join(:pacticipants, consumers_join, { table_alias: :consumers })
+          .remove_overridden_revisions_from_complete_query
+      end
+
       def for_currently_deployed_versions(environment_name)
         deployed_versions_join = {
           Sequel[:pact_publications][:consumer_version_id] => Sequel[:deployed_versions][:version_id]

data/lib/pact_broker/pacts/provider_state_service.rb

@@ -11,8 +11,16 @@ module PactBroker
       extend PactBroker::Services
       extend PactBroker::Repositories::Scopes
 
-      def self.list_provider_states(provider)
-        query = scope_for(PactPublication).eager_for_domain_with_content.for_provider_and_consumer_version_selector(provider, PactBroker::Pacts::Selector.latest_for_main_branch)
+      def self.list_provider_states(provider, branch_name = nil, environment_name = nil)
+        selector =
+          if branch_name
+            PactBroker::Pacts::Selector.latest_for_branch(branch_name)
+          elsif environment_name
+            PactBroker::Pacts::Selector.for_environment(environment_name)
+          else
+            PactBroker::Pacts::Selector.latest_for_main_branch
+          end
+        query = scope_for(PactPublication).eager_for_domain_with_content.for_provider_and_consumer_version_selector(provider, selector)
         query.all.flat_map do | pact_publication |
           { "providerStates" => pact_publication.to_domain.content_object.provider_states, "consumer" => pact_publication.to_domain.consumer.name }
         end

data/lib/pact_broker/pacts/repository.rb

@@ -151,6 +151,36 @@ module PactBroker
         query.all.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
       end
 
+      def find_pacts_by_consumer_branch(provider_name, options = {})
+        consumer_name = options[:consumer]
+        latest = options.fetch(:latest, false)
+        branch = options[:branch_name]
+        main_branch = options.fetch(:main_branch, false)
+        
+        query = scope_for(PactPublication)
+                  .eager_for_domain_with_content
+                  .for_provider_name(provider_name)
+        
+        if consumer_name
+          query = query.for_consumer_name(consumer_name)
+        end
+
+        if main_branch
+          if latest
+            query = query.latest_for_main_branches
+          else
+            query = query.for_main_branches
+          end
+        else 
+          if latest
+            query = query.latest_for_consumer_branch(branch)
+          else
+            query = query.for_branch_name(branch)
+          end
+        end
+        query.all.sort_by{ | p| p.consumer_name.downcase }.collect(&:to_head_pact)
+      end
+
       def find_for_verification(provider_name, consumer_version_selectors)
         PactsForVerificationRepository.new.find(provider_name, consumer_version_selectors)
       end

data/lib/pact_broker/pacts/service.rb

@@ -95,6 +95,26 @@ module PactBroker
         pact_repository.find_latest_pacts_for_provider provider_name, options[:tag]
       end
 
+      def find_latest_pacts_for_provider_by_consumer_branch provider_name, options = {}
+        options[:latest] = true
+        pact_repository.find_pacts_by_consumer_branch provider_name, options
+      end
+
+      def find_pacts_for_provider_by_consumer_branch provider_name, options = {}
+        pact_repository.find_pacts_by_consumer_branch provider_name, options
+      end
+
+      def find_pacts_for_provider_and_consumer_by_consumer_branch provider_name, consumer, options = {}
+        options[:consumer] = consumer
+        pact_repository.find_pacts_by_consumer_branch provider_name, options
+      end
+
+      def find_latest_pacts_for_provider_and_consumer_by_consumer_branch provider_name, consumer, options = {}
+        options[:consumer] = consumer
+        options[:latest] = true
+        pact_repository.find_pacts_by_consumer_branch provider_name, options
+      end
+
       def find_pact_versions_for_provider provider_name, options = {}
         pact_repository.find_pact_versions_for_provider provider_name, options[:tag]
       end

data/lib/pact_broker/tasks/clean_task.rb

@@ -2,6 +2,7 @@
 # to stop performance issues from slowing down responses when there is
 # too much data.
 # See https://docs.pact.io/pact_broker/administration/maintenance
+require "rake/tasklib"
 
 module PactBroker
   module DB

data/lib/pact_broker/ui/controllers/can_i_deploy.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/matrix_lines"
 require "pact_broker/matrix/unresolved_selector"
 require "pact_broker/matrix/parse_query"
@@ -20,7 +20,7 @@ module PactBroker
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:pacticipant_name], latest: true, tag: params[:tag]) ]
           options = { latestby: "cvp", limit: 100, tag: params[:to] }
           result = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(result, base_url: base_url)
+          lines = PactBroker::UI::ViewModels::MatrixLines.new(result, base_url: base_url)
           locals = {
             lines: lines,
             selectors: create_selector_objects(selectors),

data/lib/pact_broker/ui/controllers/clusters.rb

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         get "/" do
-          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
+          view_model = PactBroker::UI::ViewModels::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
           haml "clusters/show", locals: { relationships: view_model, base_url: base_url }, escape_html: true
         end
 

data/lib/pact_broker/ui/controllers/dashboard.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "haml"
 
@@ -44,7 +44,7 @@ module PactBroker
                           []
                         end
 
-          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url, view: view)
+          view_index_items = PactBroker::UI::ViewModels::IndexItems.new(index_items, base_url: base_url, view: view)
 
           page = :'dashboard/show'
           locals = {

data/lib/pact_broker/ui/controllers/error_test.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/logging"
 require "pact_broker/error"
 

data/lib/pact_broker/ui/controllers/groups.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "haml"
 

data/lib/pact_broker/ui/controllers/index.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/index_items"
 require "pact_broker/string_refinements"
 require "haml"
@@ -33,7 +33,7 @@ module PactBroker
             error_messages << "No pacticipants found matching: \"#{search}\""
           end
 
-          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url)
+          view_index_items = PactBroker::UI::ViewModels::IndexItems.new(index_items, base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
           locals = {

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 require "pact_broker/ui/view_models/matrix_lines"
 require "pact_broker/matrix/unresolved_selector"
 require "pact_broker/matrix/parse_query"
@@ -32,7 +32,7 @@ module PactBroker
               errors = matrix_service.validate_selectors(selectors, options)
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
-                locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
+                locals[:lines] = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url)
                 locals[:badge_url] = matrix_badge_url(selectors, lines, base_url)
               else
                 locals[:errors] = errors
@@ -52,7 +52,7 @@ module PactBroker
                       ]
           options = { latestby: "cvpv", limit: 100 }
           lines = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
+          lines = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url)
           locals =  {
                       lines: lines,
                       consumer_name: params[:consumer_name],

data/lib/pact_broker/ui/controllers/pacts.rb

@@ -1,4 +1,4 @@
-require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/controllers/base"
 
 module PactBroker
   module UI

data/lib/pact_broker/ui/view_models/index_item.rb

@@ -9,7 +9,7 @@ require "forwardable"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItem
         extend Forwardable
 

data/lib/pact_broker/ui/view_models/index_item_branch_head.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItemBranchHead
 
         include PactBroker::Api::PactBrokerUrls

data/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItemProviderBranchHead
 
         include PactBroker::Api::PactBrokerUrls

data/lib/pact_broker/ui/view_models/index_items.rb

@@ -2,7 +2,7 @@ require "pact_broker/ui/view_models/index_item"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class IndexItems
 
         attr_reader :pagination_record_count

data/lib/pact_broker/ui/view_models/matrix_branch.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixBranch
 
         include PactBroker::Api::PactBrokerUrls

data/lib/pact_broker/ui/view_models/matrix_deployed_version.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixDeployedVersion
         include PactBroker::Api::PactBrokerUrls
 

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -11,7 +11,7 @@ require "forwardable"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixLine
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Messages

data/lib/pact_broker/ui/view_models/matrix_lines.rb

@@ -2,12 +2,12 @@ require "pact_broker/ui/view_models/matrix_line"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixLines < Array
 
         def initialize rows, options = {}
           lines = rows.collect do | row |
-            PactBroker::UI::ViewDomain::MatrixLine.new(row, options)
+            PactBroker::UI::ViewModels::MatrixLine.new(row, options)
           end
           super(lines.sort)
         end

data/lib/pact_broker/ui/view_models/matrix_released_version.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixReleasedVersion
         include PactBroker::Api::PactBrokerUrls
 

data/lib/pact_broker/ui/view_models/matrix_tag.rb

@@ -4,7 +4,7 @@ require "pact_broker/date_helper"
 
 module PactBroker
   module UI
-    module ViewDomain
+    module ViewModels
       class MatrixTag
         include PactBroker::Api::PactBrokerUrls
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.116.0"
+  VERSION = "2.117.1"
 end

data/pact_broker.gemspec

@@ -57,11 +57,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "sequel", "~> 5.90"
   gem.add_runtime_dependency "webmachine", ">= 2.0.0.beta", "< 3.0"
   gem.add_runtime_dependency "semver2", "~> 3.4.2"
-  gem.add_runtime_dependency "rack", "~> 3.1", ">= 3.1.16"
+  gem.add_runtime_dependency "rack", "~> 3.2"
   gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"
-  # TODO: restore this with when latest master is released as 1.21.3
-  # remove the Gemfile entry pointing to master
-  # gem.add_runtime_dependency "pact-support" , ">= 1.21.3", "~> 1.21"
+  gem.add_runtime_dependency "pact-support" , ">= 1.21.2", "~> 1.21"
   gem.add_runtime_dependency "haml", "~>5.0"
   gem.add_runtime_dependency "sucker_punch", "~>3.0"
   gem.add_runtime_dependency "rack-protection", "~> 4.1"
@@ -72,4 +70,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "anyway_config", "~> 2.1"
   gem.add_runtime_dependency "request_store", "~> 1.5"
   gem.add_runtime_dependency "moments", "~> 0.2"
+  # dropped in ruby 3.4 stdlib
+  gem.add_runtime_dependency "mutex_m", "~> 0.3" # until as-notifications -> webmachine requires it
+  gem.add_runtime_dependency "csv", "~> 3.0" # lib/pact_broker/api/decorators/relationships_csv_decorator.rb
+  # dropped in ruby 3.5 stdlib
+  gem.add_runtime_dependency "ostruct", "~> 0.5" 
+  gem.add_development_dependency "pstore", "~> 0.1" # until webmachine requires it
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.116.0
+  version: 2.117.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -135,20 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +163,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: pact-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.21.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.21.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +323,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -681,6 +751,7 @@ files:
 - lib/pact_broker/api/resources/latest_pact.rb
 - lib/pact_broker/api/resources/latest_pacts.rb
 - lib/pact_broker/api/resources/latest_provider_pacts.rb
+- lib/pact_broker/api/resources/latest_provider_pacts_for_branch.rb
 - lib/pact_broker/api/resources/latest_verification_for_latest_pact.rb
 - lib/pact_broker/api/resources/latest_verification_for_pact.rb
 - lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb
@@ -708,6 +779,7 @@ files:
 - lib/pact_broker/api/resources/pagination_methods.rb
 - lib/pact_broker/api/resources/previous_distinct_pact_version.rb
 - lib/pact_broker/api/resources/provider_pacts.rb
+- lib/pact_broker/api/resources/provider_pacts_for_consumer_branch.rb
 - lib/pact_broker/api/resources/provider_pacts_for_verification.rb
 - lib/pact_broker/api/resources/provider_states.rb
 - lib/pact_broker/api/resources/publish_contracts.rb
@@ -733,10 +805,10 @@ files:
 - lib/pact_broker/build_http_options.rb
 - lib/pact_broker/certificates/certificate.rb
 - lib/pact_broker/certificates/service.rb
-- lib/pact_broker/config/basic_auth_configuration.rb
 - lib/pact_broker/config/load.rb
 - lib/pact_broker/config/repository.rb
 - lib/pact_broker/config/runtime_configuration.rb
+- lib/pact_broker/config/runtime_configuration_basic_auth_methods.rb
 - lib/pact_broker/config/runtime_configuration_coercion_methods.rb
 - lib/pact_broker/config/runtime_configuration_database_methods.rb
 - lib/pact_broker/config/runtime_configuration_logging_methods.rb
@@ -751,7 +823,6 @@ files:
 - lib/pact_broker/contracts/contracts_to_publish.rb
 - lib/pact_broker/contracts/notice.rb
 - lib/pact_broker/contracts/service.rb
-- lib/pact_broker/dashboard/service.rb
 - lib/pact_broker/dataset.rb
 - lib/pact_broker/dataset/page.rb
 - lib/pact_broker/date_helper.rb
@@ -806,18 +877,26 @@ files:
 - lib/pact_broker/doc/views/can-i-deploy.markdown
 - lib/pact_broker/doc/views/consumer-version.markdown
 - lib/pact_broker/doc/views/consumer.markdown
+- lib/pact_broker/doc/views/index/branch-pact-versions.markdown
 - lib/pact_broker/doc/views/index/environment.markdown
 - lib/pact_broker/doc/views/index/environments.markdown
+- lib/pact_broker/doc/views/index/latest-branch-pact-versions.markdown
+- lib/pact_broker/doc/views/index/latest-main-branch-pact-versions.markdown
 - lib/pact_broker/doc/views/index/latest-pact-versions.markdown
+- lib/pact_broker/doc/views/index/latest-provider-pacts-with-branch.markdown
+- lib/pact_broker/doc/views/index/latest-provider-pacts-with-main-branch.markdown
 - lib/pact_broker/doc/views/index/latest-provider-pacts-with-tag.markdown
 - lib/pact_broker/doc/views/index/latest-provider-pacts.markdown
 - lib/pact_broker/doc/views/index/latest-tagged-version.markdown
 - lib/pact_broker/doc/views/index/latest-version.markdown
+- lib/pact_broker/doc/views/index/main-branch-pact-versions.markdown
 - lib/pact_broker/doc/views/index/pacticipant-branch-version.markdown
 - lib/pact_broker/doc/views/index/pacticipant-branch.markdown
 - lib/pact_broker/doc/views/index/pacticipant-version-tag.markdown
 - lib/pact_broker/doc/views/index/pacticipant-version.markdown
 - lib/pact_broker/doc/views/index/pacticipants.markdown
+- lib/pact_broker/doc/views/index/provider-pacts-with-branch.markdown
+- lib/pact_broker/doc/views/index/provider-pacts-with-main-branch.markdown
 - lib/pact_broker/doc/views/index/provider-pacts-with-tag.markdown
 - lib/pact_broker/doc/views/index/provider-pacts.markdown
 - lib/pact_broker/doc/views/index/publish-contracts.markdown
@@ -955,7 +1034,7 @@ files:
 - lib/pact_broker/services.rb
 - lib/pact_broker/string_refinements.rb
 - lib/pact_broker/tags/eager_loaders.rb
-- lib/pact_broker/tags/head_pact_tags.rb
+- lib/pact_broker/tags/head_pact_tag.rb
 - lib/pact_broker/tags/repository.rb
 - lib/pact_broker/tags/service.rb
 - lib/pact_broker/tasks.rb
@@ -968,7 +1047,7 @@ files:
 - lib/pact_broker/test/test_data_builder.rb
 - lib/pact_broker/ui.rb
 - lib/pact_broker/ui/app.rb
-- lib/pact_broker/ui/controllers/base_controller.rb
+- lib/pact_broker/ui/controllers/base.rb
 - lib/pact_broker/ui/controllers/can_i_deploy.rb
 - lib/pact_broker/ui/controllers/clusters.rb
 - lib/pact_broker/ui/controllers/dashboard.rb
@@ -980,7 +1059,6 @@ files:
 - lib/pact_broker/ui/helpers/haml_helpers.rb
 - lib/pact_broker/ui/helpers/matrix_helper.rb
 - lib/pact_broker/ui/helpers/url_helper.rb
-- lib/pact_broker/ui/view_models/clusters.rb
 - lib/pact_broker/ui/view_models/index_item.rb
 - lib/pact_broker/ui/view_models/index_item_branch_head.rb
 - lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb
@@ -1209,7 +1287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: See description
 test_files: []