pact_broker 2.113.2 → 2.115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae37811c3c1f10c9ce20490a05dd1d4683c3c071c3529877d14fde1c1dcb9d77
-  data.tar.gz: 437dabe157b2b2644edbbfdbd71d060f78aa449cfdff717552e074db0a69fa25
+  metadata.gz: 5d60c3b6a432bf6499e5167d6c1b06a6799ef58fb3cf5464000ebe6712352653
+  data.tar.gz: e8b326e736249b6de4cf47baca16f0551e4a45de24d61a9839ba91b077577959
 SHA512:
-  metadata.gz: ff2279ac36ad3f8de1c05a7b059bca6b207399613f9920303d69f03865a3727cde1b9eaacf765c7e2c3c4ad6e0db7bd927c1f45464feeac0d77193bc32f1e013
-  data.tar.gz: 851dd199c1085589350e676cb03aa6efa06915dbea1cb574d515a66a52e59039f6faab1a962dd16605427b0f62fb845d45d2c57bc221fac8ae8eb6881016bbd0
+  metadata.gz: b1973fc6c1f1b44ab6fa5ea7c7986cb588f7e69cd6bc3a25c5abca52675c5cfeb453c1ee2db261ebeb4d53ffdf5d6d7e4985010c7a89dc8a162521f13728af3e
+  data.tar.gz: 06c0d372bc3f97fa958d74e064033d89e3dd096a835290c44c59fa7b7331deeb2b50653b5b4be23f194db933250520696feba15b8e24bac5ef3669ca53f52289

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="v2.115.0"></a>
+### v2.115.0 (2025-03-17)
+
+#### Features
+
+* group provider states by consumers	 ([e39860a9](/../../commit/e39860a9))
+
+#### Bug Fixes
+
+* dedupe non unique provider states #789	 ([3cf22169](/../../commit/3cf22169))
+* explicitly order labels by name	 ([d25746c1](/../../commit/d25746c1))
+
+<a name="v2.114.0"></a>
+### v2.114.0 (2025-03-06)
+
+#### Features
+
+* support extended verification results (#778)	 ([18f571c8](/../../commit/18f571c8))
+
 <a name="v2.113.2"></a>
 ### v2.113.2 (2025-03-05)
 

data/db/migrations/20240112_add_client_language_verified_by_to_verification.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    add_column(:verifications, :verified_by_client_implementation, String)
+    add_column(:verifications, :verified_by_client_version, String)
+    add_column(:verifications, :verified_by_client_test_framework, String)
+  end
+end

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

@@ -6,13 +6,30 @@ module PactBroker
       class ProviderStateDecorator < BaseDecorator
         camelize_property_names
 
-        property :name
-        property :params
-
+        property :name, getter: -> (context) { context[:represented][:name] }
+        property :params, getter: -> (context) { context[:represented][:params] }
+        property :consumers, getter: -> (context) { context[:represented][:consumers] }
       end
 
       class ProviderStatesDecorator < BaseDecorator
-        collection :providerStates, getter: -> (context) { context[:represented].sort_by(&:name) }, :extend => PactBroker::Api::Decorators::ProviderStateDecorator
+        collection :providerStates, getter: -> (context) { 
+          consumers_map = {}
+            
+            context[:represented].each do |item|
+              item["providerStates"].each do |provider_state|
+                provider_state = provider_state.to_h
+                provider_state[:consumers] ||= []
+                provider_state[:consumers] << item["consumer"]
+                consumers_map[[provider_state[:name], provider_state[:params]]] ||= []
+                consumers_map[[provider_state[:name], provider_state[:params]]] += provider_state[:consumers]
+              end
+            end
+
+            consumers_map.map do |(name, params), consumers|
+              { name: name, params: params, consumers: consumers.uniq }.transform_keys(&:to_sym)
+            end
+          .sort_by { |provider_state| provider_state[:name] }
+        }, :extend => PactBroker::Api::Decorators::ProviderStateDecorator
       end
     end
   end

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

@@ -18,6 +18,9 @@ module PactBroker
         nested :verifiedBy do
           property :verified_by_implementation, as: :implementation
           property :verified_by_version, as: :version
+          property :verified_by_client_implementation, as: :client_implementation
+          property :verified_by_client_test_framework, as: :client_test_framework
+          property :verified_by_client_version, as: :client_version
         end
 
         link :self do | options |

data/lib/pact_broker/doc/views/pact/publish-verification-results.markdown

@@ -11,3 +11,21 @@ Use a `POST` request to the `pb:publish-verification-results` link (`$['_links']
     }
 
 Multiple verification results may be published for the same pact resource. The most recently published one will be considered to reflect the current status of verification.
+
+Optionally the body can contain details about the Pact implementation which performed the verification, and test results, which support arbitrary json
+
+    {
+      "providerApplicationVersion": "1",
+      "success": true,
+      "buildUrl": "http://build-url",
+      "testResults": [],
+      "verifiedBy": {
+        "implementation": "Pact-Rust",
+        "version": "1.0.0",
+        "clientLanguage": {
+          "testFramework": "TEST",
+          "name": "TESTER",
+          "version": "1.2.3"
+        }
+      }
+    }

data/lib/pact_broker/domain/verification.rb

@@ -259,6 +259,9 @@ end
 #  pact_pending                     | boolean                     |
 #  verified_by_implementation       | text                        |
 #  verified_by_version              | text                        |
+#  verified_by_client_implementation| text                        |
+#  verified_by_client_version       | text                        |
+#  verified_by_client_test_framework| text                        |
 # Indexes:
 #  verifications_pkey                          | PRIMARY KEY btree (id)
 #  verifications_pact_version_id_number_index  | UNIQUE btree (pact_version_id, number)

data/lib/pact_broker/labels/repository.rb

@@ -5,7 +5,7 @@ module PactBroker
     class Repository
 
       def get_all_unique_labels pagination_options = {}
-        PactBroker::Domain::Label.distinct.select(:name).all_with_pagination_options(pagination_options)
+        PactBroker::Domain::Label.distinct.select(:name).order(:name).all_with_pagination_options(pagination_options)
       end
 
       def create args

data/lib/pact_broker/pacts/provider_state_service.rb

@@ -14,7 +14,7 @@ module PactBroker
       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)
         query.all.flat_map do | pact_publication |
-          pact_publication.to_domain.content_object.provider_states
+          { "providerStates" => pact_publication.to_domain.content_object.provider_states, "consumer" => pact_publication.to_domain.consumer.name }
         end
       end
     end

data/lib/pact_broker/verifications/service.rb

@@ -46,6 +46,9 @@ module PactBroker
         verification.number = next_verification_number
         verification.verified_by_implementation = params.dig("verifiedBy", "implementation")
         verification.verified_by_version = params.dig("verifiedBy", "version")
+        verification.verified_by_client_implementation = params.dig("verifiedBy", "clientLanguage", "name")
+        verification.verified_by_client_version = params.dig("verifiedBy", "clientLanguage", "version")
+        verification.verified_by_client_test_framework = params.dig("verifiedBy", "clientLanguage", "testFramework")
         verification.consumer_version_selector_hashes = event_context[:consumer_version_selectors]
         pact_version = pact_repository.find_pact_version(first_verified_pact.consumer, first_verified_pact.provider, first_verified_pact.pact_version_sha)
         verification = verification_repository.create(verification, provider_version_number, pact_version)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.113.2"
+  VERSION = "2.115.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.113.2
+  version: 2.115.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -9,7 +9,7 @@ authors:
 - Warner Godfrey
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -528,6 +528,7 @@ files:
 - db/migrations/20230616_set_integrations_contract_data_updated_at.rb
 - db/migrations/20231002_add_version_id_index_to_released_version.rb
 - db/migrations/20231003_add_version_id_index_to_deployed_version.rb
+- db/migrations/20240112_add_client_language_verified_by_to_verification.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
@@ -1226,7 +1227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: See description
 test_files: []