pact_broker 2.101.0 → 2.102.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08222ce855214163448e53d62e9beea5b6b04c5fc6f9e56308ac27984c21599a'
-  data.tar.gz: 2e5f39087b8ff5a7b906d179554ba701043619910923465b10611fe198736a53
+  metadata.gz: 1747ecbaa97d17fef8acf4946bd24c59ea255d3179776c09c701ccea77f4d006
+  data.tar.gz: e748481ebd6df16c369e8ba7660ba371f82a4445b2b89df8a9cf1aa8b23ac657
 SHA512:
-  metadata.gz: 4bb5843f3f1fc44f56bfeea79d2315ecb61c278ebdbb089e8cd5405784f39ba4475c0a04bdeaddd179a5bf863fa46139f76692ebaff3c8185abc8c21075544e6
-  data.tar.gz: 6982da454c1f364143d0d3abd11777c25a8114dbd3dd6ab6c5987dadb2239e804dee6ec124ada34f7d8a1aabe62dabf29047bb12f0a48f306fb29ee7a54ca111
+  metadata.gz: a10ebe04db5984d671e58f99f8857363d3a2bf806d7429d9b39fa6d8a2a202af423166c429acacb3f8fedc9773b078964b02d67a2d9687e71e0303466b04d106
+  data.tar.gz: a50a13c96cd171b4f1583f7c17d7d5c95a557fab21aa210c1235e6505bd6eb5eceae8b0cf5d9c3fa02284d3b845093e30c8a2ec18628868dde5256b663cca34a

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="v2.102.2"></a>
+### v2.102.2 (2022-07-14)
+
+#### Bug Fixes
+
+* add blank? refinement for TrueClass and FalseClass	 ([05bb3bed](/../../commit/05bb3bed))
+
+<a name="v2.102.1"></a>
+### v2.102.1 (2022-07-08)
+
+#### Bug Fixes
+
+* ensure blank? method is defined where used	 ([b81b5e9b](/../../commit/b81b5e9b))
+
+<a name="v2.102.0"></a>
+### v2.102.0 (2022-07-07)
+
+#### Features
+
+* default allow_dangerous_contract_modification to false for new installations	 ([85a89951](/../../commit/85a89951))
+
+#### Bug Fixes
+
+* add missing provider version branch parameter to webhook requests	 ([262dae44](/../../commit/262dae44))
+* clean up pacticipants with no names	 ([0aff250d](/../../commit/0aff250d))
+* update string refinements with blank? and present?	 ([8373f88f](/../../commit/8373f88f))
+* update validation for creating pacticipants to return a 400 when name is missing	 ([fcb02aa6](/../../commit/fcb02aa6))
+
 <a name="v2.101.0"></a>
 ### v2.101.0 (2022-06-07)
 

data/README.md

@@ -114,7 +114,17 @@ Use the HAL browser to view documentation as you browse.
 
 ### To have a play around on your local machine
 
-* Install Ruby and Bundler (check the automated tests to find the most recent version of Ruby and Bundler that are supported)
+#### Using Docker Compose
+
+Download a copy of the [example Docker Compose file](https://github.com/pact-foundation/pact-broker-docker/blob/master/docker-compose.yml) from the Pact Broker Docker repository and run:
+
+`docker compose up`
+
+Then open a browser at [http://localhost:9292](http://localhost:9292).
+
+#### Using Ruby
+
+* Install Ruby 2.7 and Bundler (check the automated tests to find the most recent version of Ruby and Bundler that are supported)
     * Windows users: get a Rails/Ruby installer from [RailsInstaller](http://railsinstaller.org/) and run it
     * unix users just use your package manager
 * Run `git clone git@github.com:pact-foundation/pact_broker.git && cd pact_broker/example`
@@ -144,8 +154,8 @@ You can use the [Pact Broker Docker image][docker] or [Terraform on AWS][terrafo
   * To ensure you're on a supported version of the database that you choose, check the [travis.yml][travisyml] file to see which versions we're currently running our tests against.
   * MySQL was supported for the native Ruby application until around 2021, but the official `pactfoundation/pact-broker` Docker image does not support it. New features will not be optimised for MySQL, and some new features may not even be supported on it (eg. the database clean feature).
 * You'll find a sample database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
-* Install ruby 2.7 or later and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
-* Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up.
+* Install ruby 2.7 and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
+* Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up if you are not using a containerized solution.
 * Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem for Postgres)
   * example Sequel configuration for postgres `{ adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8' }`
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.
@@ -169,7 +179,7 @@ The Pact Broker follows the [semantic versioning](https://semver.org/) scheme.
 [terraform]: https://github.com/nadnerb/terraform-pact-broker
 [pactflow]: https://pactflow.io/?utm_source=github&utm_campaign=pact_broker_usage
 [wiki]: https://github.com/pact-foundation/pact_broker/wiki
-[reverse-proxy-docs]: https://github.com/pact-foundation/pact_broker/wiki/Configuration#running-the-broker-behind-a-reverse-proxy
+[reverse-proxy-docs]: https://docs.pact.io/pact_broker/configuration/features#running-the-broker-behind-a-reverse-proxy
 [stackoverflow]: http://stackoverflow.com/questions/tagged/pact-broker
 [twitter]: https://twitter.com/pact_up
 [slack]: https://slack.pact.io/

data/db/migrations/20220622_default_allow_dangerous_contract_modification_to_false_for_new_installations.rb

@@ -0,0 +1,22 @@
+require_relative "migration_helper"
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    # Need to do this again because didn't actually set default of allow_dangerous_contract_modification to true
+    # when the first migration was run in db/migrations/20210810_set_allow_contract_modification.rb
+    for_upgrades_of_existing_installations do
+      from(:config).insert_ignore.insert(
+        name: "allow_dangerous_contract_modification",
+        type: "boolean",
+        value: "1",
+        created_at: Sequel.datetime_class.now,
+        updated_at: Sequel.datetime_class.now
+      )
+    end
+  end
+
+  down do
+
+  end
+end

data/db/migrations/20220625_delete_pacticipants_with_no_name.rb

@@ -0,0 +1,62 @@
+# There was a bug that caused a duplicate pacticipant to be created
+# with a null name when updating the pacticipant in a certain way.
+# It was fixed in be24a8ad650f0ed49993283b22ba1d1a744fb3e8.
+# This migration deletes any pacticipants with null names that are not referenced by any other rows,
+# or assigns a name if the pacticipant is referenced so that it can be deleted through the API
+# (I can't think of a reason why a pacticipant with a null name should be referenced, but better to be safe than sorry).
+# The "find tables that reference pacticipants" logic is done dynamically because Pactflow has extra tables not in the OSS.
+
+# Query each table that references the pacticipants table to determine
+# if there are any rows in it that reference the pacticipant with the specified ID.
+# @return [Boolean]
+def pacticipant_is_unreferenced(pacticipant_id, table_foreign_keys)
+  table_foreign_keys.any? do | (table_name, foreign_keys) |
+    criteria = foreign_keys.flat_map do | fk |
+      fk[:columns].collect do | column_name |
+        { column_name => pacticipant_id }
+      end
+    end
+
+    # SELECT 'one' FROM xxx where consumer_id = x or provider_id = x LIMIT 1
+    !from(table_name).where(Sequel.|(*criteria)).empty?
+  end
+end
+
+# Return a structure describing the tables and columns that reference the pacticipants table.
+# @return [Array] eg. [ [:integrations, [ { columns: [:consumer_id] }, { columns: [:provider_id] } ] ] ]
+def get_table_foreign_keys
+  table_foreign_keys = tables.sort.collect do | table_name |
+    key_list = foreign_key_list(table_name).select{ |fk| fk[:table] == :pacticipants }
+    if key_list.any?
+      [ table_name,  key_list]
+    end
+  end.compact
+
+  # move the integrations table check first because that's the most likely candidate to have a referencing row
+  table_foreign_keys.select{ |(table_name, _)| table_name == :integrations } | table_foreign_keys
+end
+
+# Deletes the pacticipant if it is unreferenced, or populates the name so it can
+# be deleted through the API.
+def delete_pacticipant_or_populate_name(row, table_foreign_keys)
+  if pacticipant_is_unreferenced(row[:id], table_foreign_keys)
+    from(:pacticipants).where(id: row[:id]).delete
+  else
+    from(:pacticipants).where(id: row[:id]).update(name: "Delete me #{row[:id]}")
+  end
+end
+
+Sequel.migration do
+  up do
+
+    table_foreign_keys = get_table_foreign_keys
+
+    from(:pacticipants).where(name: nil).all.each do | row |
+      delete_pacticipant_or_populate_name(row, table_foreign_keys)
+    end
+  end
+
+  down do
+
+  end
+end

data/db/migrations/migration_helper.rb

@@ -3,6 +3,12 @@ module PactBroker
 
     extend self
 
+    def for_upgrades_of_existing_installations
+      if from(:integrations).count > 0
+        yield
+      end
+    end
+
     def large_text_type
       if postgres?
         :text

data/docs/CONFIGURATION.md

@@ -648,10 +648,12 @@ Whether or not to allow the pact content for an existing consumer version to be
 as allowing modification makes the results of can-i-deploy unreliable. When this is set to false as recommended, each commit must publish pacts
 with a unique version number.
 
+If modification of an existing contract is attempted when the value is set to `false`, an HTTP 409 status will be returned.
+
 **Supported versions:** From v2.82.0<br/>
 **Environment variable name:** `PACT_BROKER_ALLOW_DANGEROUS_CONTRACT_MODIFICATION`<br/>
 **YAML configuration key name:** `allow_dangerous_contract_modification`<br/>
-**Default:** For new installations of v2.82.0 and later, this defaults to `false`.<br/>
+**Default:** For new installations of v2.102 and later, this defaults to `false` (the recommended value). Previous installations will have the default value of `true` (not recommended).<br/>
 **Allowed values:** `true`, `false`<br/>
 **More information:** https://docs.pact.io/versioning<br/>
 

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

@@ -0,0 +1,28 @@
+require "pact_broker/api/contracts/pacticipant_schema"
+
+module PactBroker
+  module Api
+    module Contracts
+      class PacticipantCreateSchema
+        extend DryValidationWorkarounds
+        extend PactBroker::Messages
+        using PactBroker::HashRefinements
+
+        SCHEMA = Dry::Validation.Schema do
+          configure do
+            predicates(DryValidationPredicates)
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+          end
+          required(:name).filled(:str?, :single_line?)
+        end
+
+        def self.call(params_with_string_keys)
+          params = params_with_string_keys&.symbolize_keys
+          update_errors = PacticipantSchema::SCHEMA.call(params).messages(full: true)
+          create_errors = SCHEMA.call(params).messages(full: true)
+          select_first_message(flatten_indexed_messages(update_errors.merge(create_errors)))
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module PactBroker
 
         property :number
         if PactBroker.feature_enabled?(:branches)
-          property :branch
           property :build_url
         end
 

data/lib/pact_broker/api/middleware/basic_auth.rb

@@ -1,11 +1,13 @@
 require "rack"
 require "pact_broker/hash_refinements"
+require "pact_broker/string_refinements"
 
 module PactBroker
   module Api
     module Middleware
       class BasicAuth
         using PactBroker::HashRefinements
+        using PactBroker::StringRefinements
 
         def initialize(app, write_credentials, read_credentials, policy)
           @app = app

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

@@ -306,20 +306,27 @@ module PactBroker
           invalid_json? || validation_errors_for_schema?(schema_to_use, params_to_validate)
         end
 
+        # Ensure we have valid JSON if a JSON body is required OR if a body has been provided
         def content_type_is_json_but_invalid_json_provided?
-          content_type_json? && any_request_body? && invalid_json?
+          content_type_json? && ((request_body_required? || any_request_body?) && invalid_json?)
         end
 
         def content_type_json?
           request.content_type&.include?("json")
         end
 
+        def request_body_required?
+          false
+        end
+
+        # TODO rename to put_to_create_supported, otherwise it sounds like it's a policy issue
         # Not a Webmachine method. This is used by security policy code to identify whether
         # a PUT to a non existing resource can create a new object.
         def put_can_create?
           false
         end
 
+        # TODO rename to patch_to_create_supported, otherwise it sounds like it's a policy issue
         # Not a Webmachine method. This is used by security policy code to identify whether
         # a PATCH to a non existing resource can create a new object.
         def patch_can_create?

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

@@ -23,6 +23,16 @@ module PactBroker
           consumer && provider
         end
 
+        def malformed_request?
+          error_messages = matrix_service.validate_options(options)
+          if error_messages.any?
+            set_json_validation_error_messages error_messages
+            true
+          else
+            false
+          end
+        end
+
         def to_json
           decorator_class(:matrix_decorator).new(results).to_json(decorator_options)
         end

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

@@ -36,6 +36,10 @@ module PactBroker
           ["GET", "PUT", "DELETE", "PATCH", "OPTIONS"]
         end
 
+        def request_body_required?
+          request.put? || request.patch?
+        end
+
         def put_can_create?
           true
         end

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

@@ -34,7 +34,7 @@ module PactBroker
         end
 
         def malformed_request?
-          super || ((request.patch? || request.really_put?) && validation_errors_for_schema?)
+          super || ((request.patch? || request.really_put?) && any_request_body? && validation_errors_for_schema?)
         end
 
         # PUT or PATCH with content-type application/json

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

@@ -2,7 +2,7 @@ require "pact_broker/api/resources/base_resource"
 require "pact_broker/api/decorators/pacticipant_decorator"
 require "pact_broker/domain/pacticipant"
 require "pact_broker/hash_refinements"
-require "pact_broker/api/contracts/pacticipant_schema"
+require "pact_broker/api/contracts/pacticipant_create_schema"
 
 module PactBroker
   module Api
@@ -26,6 +26,10 @@ module PactBroker
           super || (request.post? && validation_errors_for_schema?)
         end
 
+        def request_body_required?
+          request.post?
+        end
+
         def post_is_create?
           true
         end
@@ -62,7 +66,7 @@ module PactBroker
         private
 
         def schema
-          PactBroker::Api::Contracts::PacticipantSchema
+          PactBroker::Api::Contracts::PacticipantCreateSchema
         end
 
         def pacticipants

data/lib/pact_broker/config/runtime_configuration.rb

@@ -85,7 +85,7 @@ module PactBroker
         use_first_tag_as_branch_time_limit: 10,
         auto_detect_main_branch: true,
         main_branch_candidates: ["develop", "main", "master"],
-        allow_dangerous_contract_modification: true,
+        allow_dangerous_contract_modification: false,
         semver_formats: ["%M.%m.%p%s%d", "%M.%m", "%M"],
         seed_example_data: true,
         features: []

data/lib/pact_broker/domain/verification.rb

@@ -274,5 +274,6 @@ end
 #  verifications_pact_version_id_fkey | (pact_version_id) REFERENCES pact_versions(id)
 #  verifications_provider_id_fkey     | (provider_id) REFERENCES pacticipants(id)
 # Referenced By:
-#  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_verification_id_fk | (verification_id) REFERENCES verifications(id) ON DELETE CASCADE
-#  triggered_webhooks                                           | triggered_webhooks_verification_id_fkey      | (verification_id) REFERENCES verifications(id)
+#  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_verification_id_fk               | (verification_id) REFERENCES verifications(id) ON DELETE CASCADE
+#  pact_version_provider_tag_successful_verifications           | pact_version_provider_tag_successful_verifications_v_id_fk | (verification_id) REFERENCES verifications(id) ON DELETE SET NULL
+#  triggered_webhooks                                           | triggered_webhooks_verification_id_fkey                    | (verification_id) REFERENCES verifications(id)

data/lib/pact_broker/domain/version.rb

@@ -330,6 +330,14 @@ module PactBroker
       def tag_names
         tags.collect(&:name)
       end
+
+      def branch
+        raise NotImplementedError
+      end
+
+      def branch= branch
+        raise NotImplementedError
+      end
     end
   end
 end

data/lib/pact_broker/index/service.rb

@@ -4,6 +4,7 @@ require "pact_broker/domain/index_item"
 require "pact_broker/repositories/helpers"
 require "pact_broker/index/page"
 require "pact_broker/verifications/latest_verification_for_consumer_version_tag"
+require "pact_broker/string_refinements"
 
 module PactBroker
   module Index
@@ -11,6 +12,7 @@ module PactBroker
       extend PactBroker::Repositories
       extend PactBroker::Services
       extend PactBroker::Logging
+      using PactBroker::StringRefinements
 
       DEFAULT_PAGE_SIZE = 30
       DEFAULT_PAGE_NUMBER = 1
@@ -182,7 +184,7 @@ module PactBroker
           ))
 
           # Return early if there is no pacticipant matches the input name
-          return base.paginate(options[:page_number] || DEFAULT_PAGE_NUMBER, options[:page_size] || DEFAULT_PAGE_SIZE) if pacticipant_ids.blank?
+          return base.paginate(options[:page_number] || DEFAULT_PAGE_NUMBER, options[:page_size] || DEFAULT_PAGE_SIZE) if pacticipant_ids.empty?
         end
 
         ids_query = if options[:view]

data/lib/pact_broker/matrix/service.rb

@@ -52,7 +52,7 @@ module PactBroker
         end
       end
 
-      # rubocop: disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop: disable Metrics/CyclomaticComplexity
       def validate_selectors selectors, options = {}
         error_messages = []
 
@@ -73,6 +73,18 @@ module PactBroker
           end
         end
 
+        if selectors.size == 0
+          error_messages << "Please provide 1 or more version selectors."
+        end
+
+        error_messages + validate_options(options)
+      end
+      # rubocop: enable Metrics/CyclomaticComplexity
+
+      # rubocop: disable Metrics/CyclomaticComplexity
+      def validate_options(options = {})
+        error_messages = []
+
         options.fetch(:ignore_selectors, []).each do | s |
           if s[:pacticipant_name].nil?
             error_messages << "Please specify the pacticipant name to ignore"
@@ -83,10 +95,6 @@ module PactBroker
           end
         end
 
-        if selectors.size == 0
-          error_messages << "Please provide 1 or more version selectors."
-        end
-
         destination_identifiers = [options[:tag], options[:environment_name], options[:main_branch]&.to_s].compact
 
         if destination_identifiers.size > 1
@@ -107,7 +115,7 @@ module PactBroker
 
         error_messages
       end
-      # rubocop: enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop: enable Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb

@@ -5,12 +5,12 @@ module PactBroker
     class FindPotentialDuplicatePacticipantNames
       attr_reader :new_name, :existing_names
 
-      def initialize new_name, existing_names
+      def initialize(new_name, existing_names)
         @new_name = new_name
         @existing_names = existing_names
       end
 
-      def self.call new_name, existing_names
+      def self.call(new_name, existing_names)
         new(new_name, existing_names).call
       end
 
@@ -22,7 +22,7 @@ module PactBroker
         end
       end
 
-      def clean name
+      def clean(name)
         self.class.split(name).collect{|w| w.chomp("s") } - ["api", "provider", "service"]
       end
 

data/lib/pact_broker/pacts/pact_version.rb

@@ -179,4 +179,5 @@ end
 #  latest_pact_publication_ids_for_consumer_versions            | latest_pact_publication_ids_for_consumer_v_pact_version_id_fkey | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
 #  latest_verification_id_for_pact_version_and_provider_version | latest_v_id_for_pv_and_pv_pact_version_id_fk                    | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
 #  pact_publications                                            | pact_publications_pact_version_id_fkey                          | (pact_version_id) REFERENCES pact_versions(id)
+#  pact_version_provider_tag_successful_verifications           | pact_version_provider_tag_successful_verifications_pv_id_fk     | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
 #  verifications                                                | verifications_pact_version_id_fkey                              | (pact_version_id) REFERENCES pact_versions(id)

data/lib/pact_broker/string_refinements.rb

@@ -1,9 +1,33 @@
 module PactBroker
   module StringRefinements
+    refine TrueClass do
+      def blank?
+        false
+      end
+
+      def present?
+        true
+      end
+    end
+
+    refine FalseClass do
+      def blank?
+        false
+      end
+
+      def present?
+        true
+      end
+    end
+
     refine NilClass do
       def blank?
         true
       end
+
+      def present?
+        false
+      end
     end
 
     refine Numeric do
@@ -13,6 +37,10 @@ module PactBroker
     end
 
     refine String do
+      def present?
+        !blank?
+      end
+
       def not_blank?
         !blank?
       end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -286,6 +286,7 @@ module PactBroker
               "githubVerificationStatus" => "${pactbroker.githubVerificationStatus}",
               "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
               "providerVersionTags" => "${pactbroker.providerVersionTags}",
+              "providerVersionBranch" => "${pactbroker.providerVersionBranch}",
               "canIMerge" => "${pactbroker.providerMainBranchGithubVerificationStatus}"
             }
           }

data/lib/pact_broker/ui/app.rb

@@ -5,6 +5,7 @@ require "pact_broker/ui/controllers/matrix"
 require "pact_broker/ui/controllers/can_i_deploy"
 require "pact_broker/ui/controllers/error_test"
 require "pact_broker/ui/controllers/dashboard"
+require "pact_broker/ui/helpers/haml_helpers"
 require "pact_broker/doc/controllers/app"
 
 module PactBroker

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

@@ -1,5 +1,6 @@
 require "pact_broker/ui/controllers/base_controller"
 require "pact_broker/ui/view_models/index_items"
+require "pact_broker/string_refinements"
 require "haml"
 
 module PactBroker
@@ -7,6 +8,7 @@ module PactBroker
     module Controllers
       class Index < Base
         include PactBroker::Services
+        using PactBroker::StringRefinements
 
         get "/" do
           set_headers
@@ -27,7 +29,7 @@ module PactBroker
 
           index_items = index_service.find_index_items(options)
 
-          if index_items.blank? && !search.blank?
+          if index_items.empty? && !search.blank?
             error_messages << "No pacticipants found matching: \"#{search}\""
           end
 

data/lib/pact_broker/ui/helpers/haml_helpers.rb

@@ -0,0 +1,10 @@
+require "haml"
+require "pact_broker/string_refinements"
+
+module Haml::Helpers
+  using PactBroker::StringRefinements
+
+  def blank?(thing)
+    thing.blank?
+  end
+end

data/lib/pact_broker/ui/views/dashboard/show.haml

@@ -23,10 +23,9 @@
                 = provider_name
 
 
-    - unless errors.blank?
-      - errors.each do | error |
-        %div.alert.alert-danger
-          = error
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
 
     - if consumer && provider
       %form

data/lib/pact_broker/ui/views/index/show-with-tags.haml

@@ -2,15 +2,14 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false, base_url: base_url}
-    - if index_items.empty? && search.blank?
+    - if index_items.empty? && blank?(search)
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
 
-    - unless errors.blank?
-      - errors.each do | error |
-        %div.alert.alert-danger
-          = error
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
 
     %form{action: "#{base_url}"}
       .field

data/lib/pact_broker/ui/views/index/show.haml

@@ -2,15 +2,14 @@
   != render :haml, :'index/_css_and_js', :layout => false
   .container
     != render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true, base_url: base_url}
-    - if index_items.empty? && search.blank?
+    - if index_items.empty? && blank?(search)
       != render :haml, :'index/_getting-started', :layout => false
     %h1.page-header
       Pacts
 
-    - unless errors.blank?
-      - errors.each do | error |
-        %div.alert.alert-danger
-          = error
+    - errors.each do | error |
+      %div.alert.alert-danger
+        = error
 
     %form{action: "#{base_url}"}
       .search-field

data/lib/pact_broker/verifications/pact_version_provider_tag_successful_verification.rb

@@ -9,3 +9,18 @@ module PactBroker
     end
   end
 end
+
+# Table: pact_version_provider_tag_successful_verifications
+# Columns:
+#  id                        | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  pact_version_id           | integer                     | NOT NULL
+#  provider_version_tag_name | text                        | NOT NULL
+#  wip                       | boolean                     | NOT NULL
+#  verification_id           | integer                     |
+#  execution_date            | timestamp without time zone | NOT NULL
+# Indexes:
+#  pact_version_provider_tag_successful_verifications_pkey    | PRIMARY KEY btree (id)
+#  pact_version_provider_tag_verifications_pv_pvtn_wip_unique | UNIQUE btree (pact_version_id, provider_version_tag_name, wip)
+# Foreign key constraints:
+#  pact_version_provider_tag_successful_verifications_pv_id_fk | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
+#  pact_version_provider_tag_successful_verifications_v_id_fk  | (verification_id) REFERENCES verifications(id) ON DELETE SET NULL

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.101.0"
+  VERSION = "2.102.2"
 end

data/lib/pact_broker/webhooks/pact_and_verification_parameters.rb

@@ -173,7 +173,7 @@ module PactBroker
         if webhook_context.key?(:provider_version_branch)
           webhook_context[:provider_version_branch] || ""
         else
-          verification&.provider_version&.branch || ""
+          verification&.provider_version&.branch_names&.last || ""
         end
       end
 

data/pact_broker.gemspec

@@ -55,6 +55,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "roar", "~> 1.1"
   gem.add_runtime_dependency "reform", "~> 2.3.3"
   gem.add_runtime_dependency "dry-validation", "~> 0.10.5"
+  # if dry-container is not locked, get this error:
+  # An error occurred while loading spec_helper.
+  # Failure/Error: require "reform/form/dry"
+  # NoMethodError:
+  #   undefined method `call' for nil:NilClass
+  # # /Users/beth.skurrie/.gem/ruby/2.7.5/gems/dry-container-0.10.0/lib/dry/container/mixin.rb:151:in `register'
+  gem.add_runtime_dependency "dry-container", "0.8.0"
   # /usr/local/bundle/gems/dry-validation-0.10.7/lib/dry/validation/schema/class_interface.rb:7:in `<module:Validation>' [dry-configurable] default value as positional argument to settings is deprecated and will be removed in the next major version
   # Provide a `default:` keyword argument instead
   gem.add_runtime_dependency "dry-configurable", "0.12.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.101.0
+  version: 2.102.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -584,11 +598,12 @@ files:
 - db/migrations/20211120_create_pact_version_provider_tag_successful_verifications.rb
 - db/migrations/20211121_migrate_pact_version_provider_tag_successful_verifications_data.rb
 - db/migrations/20220303_increase_consumer_version_selector_hashes_column_size.rb
+- db/migrations/20220622_default_allow_dangerous_contract_modification_to_false_for_new_installations.rb
+- db/migrations/20220625_delete_pacticipants_with_no_name.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/PACTICIPANTS.md
 - docs/api/WEBHOOKS.md
-- lib/db.rb
 - lib/pact/doc/README.md
 - lib/pact/doc/doc_file.rb
 - lib/pact/doc/generate.rb
@@ -609,6 +624,7 @@ files:
 - lib/pact_broker/api/contracts/dry_validation_predicates.rb
 - lib/pact_broker/api/contracts/dry_validation_workarounds.rb
 - lib/pact_broker/api/contracts/environment_schema.rb
+- lib/pact_broker/api/contracts/pacticipant_create_schema.rb
 - lib/pact_broker/api/contracts/pacticipant_name_contract.rb
 - lib/pact_broker/api/contracts/pacticipant_name_validation.rb
 - lib/pact_broker/api/contracts/pacticipant_schema.rb
@@ -1000,6 +1016,7 @@ files:
 - lib/pact_broker/ui/controllers/index.rb
 - lib/pact_broker/ui/controllers/matrix.rb
 - lib/pact_broker/ui/controllers/pacts.rb
+- 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
@@ -1223,7 +1240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: See description

data/lib/db.rb

@@ -1,79 +0,0 @@
-require "sequel"
-require "sequel/connection_pool/threaded"
-require "yaml"
-require "pact_broker/logging"
-require "erb"
-require "pact_broker/project_root"
-require "fileutils"
-
-module DB
-  include PactBroker::Logging
-  ##
-  # Sequel by default does not test connections in its connection pool before
-  # handing them to a client. To enable connection testing you need to load the
-  # "connection_validator" extension like below. The connection validator
-  # extension is configurable, by default it only checks connections once per
-  # hour:
-  #
-  # http://sequel.rubyforge.org/rdoc-plugins/files/lib/sequel/extensions/connection_validator_rb.html
-  #
-  # Because most of our applications so far are accessed infrequently, there is
-  # very little overhead in checking each connection when it is requested. This
-  # takes care of stale connections.
-  #
-  # A gotcha here is that it is not enough to enable the "connection_validator"
-  # extension, we also need to specify that we want to use the threaded connection
-  # pool, as noted in the documentation for the extension.
-  #
-  def self.connect db_credentials
-    # Keep this conifiguration in sync with lib/pact_broker/app.rb#configure_database_connection
-    Sequel.datetime_class = DateTime
-    if ENV["DEBUG"] == "true" && ENV["PACT_BROKER_SQL_LOG_LEVEL"] && ENV["PACT_BROKER_SQL_LOG_LEVEL"] != "none"
-      logger = Logger.new($stdout)
-    end
-    if db_credentials.fetch("adapter") == "sqlite"
-      FileUtils.mkdir_p(File.dirname(db_credentials.fetch("database")))
-    end
-    con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => "utf8"))
-    con.extension(:connection_validator)
-    con.extension(:pagination)
-    con.extension(:statement_timeout)
-    con.extension(:any_not_empty)
-    #con.extension(:caller_logging)
-    con.timezone = :utc
-    con.run("SET sql_mode='STRICT_TRANS_TABLES';") if db_credentials[:adapter].to_s =~ /mysql/
-    con
-  end
-
-  def self.connection_for_env env
-    config = configuration_for_env(env)
-    logger.info "Connecting to #{env} #{config['adapter']} database #{config['database']}."
-    connect config
-  end
-
-  def self.configuration_for_env env
-    database_yml = PactBroker.project_root.join("config","database.yml")
-    config = YAML.load(ERB.new(File.read(database_yml)).result)
-    config.fetch(env).fetch(ENV.fetch("DATABASE_ADAPTER","default"))
-  end
-
-  def self.sqlite?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /sqlite/)
-  end
-
-  def self.mysql?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /mysql/)
-  end
-
-  def self.postgres?
-    !!(PACT_BROKER_DB.adapter_scheme.to_s =~ /postgres/)
-  end
-
-  PACT_BROKER_DB ||= connection_for_env ENV.fetch("RACK_ENV")
-
-  def self.health_check
-    PACT_BROKER_DB.synchronize do |c|
-      PACT_BROKER_DB.valid_connection? c
-    end
-  end
-end