pact_broker 2.102.2 → 2.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1747ecbaa97d17fef8acf4946bd24c59ea255d3179776c09c701ccea77f4d006
-  data.tar.gz: e748481ebd6df16c369e8ba7660ba371f82a4445b2b89df8a9cf1aa8b23ac657
+  metadata.gz: a82ecff0b79c081b9f3712bde752b9983e7377eb8d48120616c8c3fcf237076c
+  data.tar.gz: cef4b3136255cbba17ad31e9001c935393989df848666ddb712e81884ac61003
 SHA512:
-  metadata.gz: a10ebe04db5984d671e58f99f8857363d3a2bf806d7429d9b39fa6d8a2a202af423166c429acacb3f8fedc9773b078964b02d67a2d9687e71e0303466b04d106
-  data.tar.gz: a50a13c96cd171b4f1583f7c17d7d5c95a557fab21aa210c1235e6505bd6eb5eceae8b0cf5d9c3fa02284d3b845093e30c8a2ec18628868dde5256b663cca34a
+  metadata.gz: cb22f318c1f69dc91ceb7a84c940170600ceaf4a53e3ef65eabb7876fd2510867ad243cb1fb4cb22cf06e7b370f868cb01199697de73835879423d1371d6e19b
+  data.tar.gz: 87507ea9c45bc37318b98a9b8d53ab5a703eeffd1970cb111f3c8d639015f08442a0839376c4d59cc3e321005cb77da11466a1ca5340661905d66578c5aa669d

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="v2.103.0"></a>
+### v2.103.0 (2022-09-14)
+
+#### Features
+
+* allow rack protection use and except options to be configured	 ([f44db585](/../../commit/f44db585))
+
+* **can-i-deploy**
+  * only warn about missing version numbers if there are no selectors with a version number	 ([ac4e1e73](/../../commit/ac4e1e73))
+
+#### Bug Fixes
+
+* correctly identify database version when schema_migrations table is empty	 ([dcb59203](/../../commit/dcb59203))
+
 <a name="v2.102.2"></a>
 ### v2.102.2 (2022-07-14)
 

data/Gemfile

@@ -26,11 +26,11 @@ group :test do
   gem "rspec-its", "~>1.2"
   gem "database_cleaner", "~>1.8", ">= 1.8.1"
   gem "timecop", "~> 0.9"
-  gem "faraday", "~>0.15"
-  gem "faraday_middleware", "~> 0.14"
+  gem "faraday", "~>2.0"
   gem "docker-api", "~>1.34"
   gem "approvals", ">=0.0.24", "<1.0.0"
   gem "tzinfo", "~>2.0"
+  gem "faraday-retry", "~>2.0"
 end
 
 if ENV["INSTALL_MYSQL"] == "true"

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Bethany Skurrie
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -16,11 +16,15 @@ module PactBroker
         end
 
         def to_json
-          raise PactBroker::TestError.new("Don't panic. This is a test API error.")
+          raise PactBroker::TestError.new("Don't panic. This is a test API error. #{Time.now.strftime("%Y-%m-%dT%H:%M:%S.000%:z")}")
         end
 
         def process_post
-          raise PactBroker::TestError.new("Don't panic. This is a test API error.")
+          begin
+            raise "This is the cause test error"
+          rescue
+            raise PactBroker::TestError.new("Don't panic. This is a test API error. #{Time.now.strftime("%Y-%m-%dT%H:%M:%S.000%:z")}")
+          end
         end
 
         def policy_name

data/lib/pact_broker/app.rb

@@ -217,7 +217,14 @@ module PactBroker
 
     def configure_rack_protection
       if configuration.use_rack_protection
-        @app_builder.use Rack::Protection, except: [:path_traversal, :remote_token, :session_hijacking, :http_origin]
+        rack_protection_options = {
+          logger: logger,
+          use: configuration.rack_protection_use,
+          except: configuration.rack_protection_except
+        }.compact
+
+        logger.info("Configuring Rack::Protection", payload: rack_protection_options)
+        @app_builder.use Rack::Protection, rack_protection_options
 
         is_hal_browser = ->(env) { env["PATH_INFO"] == "/hal-browser/browser.html" }
         not_hal_browser = ->(env) { env["PATH_INFO"] != "/hal-browser/browser.html" }

data/lib/pact_broker/config/runtime_configuration.rb

@@ -68,6 +68,8 @@ module PactBroker
         use_hal_browser: true,
         enable_diagnostic_endpoints: true,
         use_rack_protection: true,
+        rack_protection_use: nil,
+        rack_protection_except: [:path_traversal, :remote_token, :session_hijacking, :http_origin], # Beth: not sure why these are disabled
         badge_provider_mode: :redirect,
         enable_public_badge_access: false,
         shields_io_base_url: "https://img.shields.io",
@@ -180,6 +182,14 @@ module PactBroker
         super(value_to_string_array(features, "features").collect(&:downcase))
       end
 
+      def rack_protection_use= rack_protection_use
+        super(value_to_string_array(rack_protection_use, "rack_protection_use")&.collect(&:to_sym))
+      end
+
+      def rack_protection_except= rack_protection_except
+        super(value_to_string_array(rack_protection_except, "rack_protection_except")&.collect(&:to_sym))
+      end
+
       def webhook_certificates= webhook_certificates
         if webhook_certificates.is_a?(Array)
           super(webhook_certificates.collect(&:symbolize_keys))

data/lib/pact_broker/db/version.rb

@@ -3,10 +3,27 @@ module PactBroker
     class Version
       def self.call database_connection
         if database_connection.tables.include?(:schema_migrations)
-          last_migration_filename = database_connection[:schema_migrations].order(:filename).last[:filename]
-          last_migration_filename.split("_", 2).first.to_i
+          version_from_schema_migrations(database_connection)
         elsif database_connection.tables.include?(:schema_info)
-          database_connection[:schema_info].first[:version]
+          version_from_schema_info(database_connection)
+        else
+          0
+        end
+      end
+
+      private_class_method def self.version_from_schema_migrations(database_connection)
+        last_migration = database_connection[:schema_migrations].order(:filename).last
+        if last_migration
+          last_migration[:filename].split("_", 2).first.to_i
+        else
+          0
+        end
+      end
+
+      private_class_method def self.version_from_schema_info(database_connection)
+        schema_info = database_connection[:schema_info].first
+        if schema_info
+          schema_info[:version]
         else
           0
         end

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

@@ -6,7 +6,6 @@ This resource returns the "cartesian join" of every pact publication and every v
 
 If you need to use this API, consider calling the `/can-i-deploy` resource instead, as it provides an interface that is easier to understand.
 
-
 ## Matrix selectors and options
 
 Selectors are the way we specify which pacticipants and versions we want to view the matrix for. The best way to understand them is to imagine that we start with a Matrix table that contains the pacts/verification results for every consumer and provider in the Pact Broker.

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -75,11 +75,15 @@ module PactBroker
 
       def selector_without_pacticipant_version_number_specified?
         # If only the pacticipant name is specified, it can't be a can-i-deploy query, must be a matrix UI query
-        resolved_selectors
-          .select(&:specified?)
-          .reject(&:only_pacticipant_name_specified?)
-          .reject(&:pacticipant_version_specified_in_original_selector?)
-          .any?
+        if resolved_selectors.select(&:specified?).reject(&:only_pacticipant_name_specified?).any?
+          # There should be at least one selector with a version number specified
+          resolved_selectors
+            .select(&:specified?)
+            .select(&:pacticipant_version_specified_in_original_selector?)
+            .empty?
+        else
+          false
+        end
       end
 
 

data/lib/pact_broker/pacts/pact_version.rb

@@ -29,7 +29,8 @@ module PactBroker
         dataset: LATEST_MAIN_BRANCH_VERIFICATION,
         key: :pact_version_id,
         primary_key: :id,
-        eager_block: lambda { | ds | ds.from_provider_main_branch.latest_by_pact_version }
+        eager_block: lambda { | ds | ds.from_provider_main_branch.latest_by_pact_version },
+        allow_eager: true
       )
 
       one_to_one(:latest_verification,
@@ -37,7 +38,8 @@ module PactBroker
         read_only: true,
         dataset: LATEST_VERIFICATION_DATASET,
         key: :pact_version_id, primary_key: :id,
-        eager_block: lambda { | ds | ds.latest_by_pact_version }
+        eager_block: lambda { | ds | ds.latest_by_pact_version },
+        allow_eager: true
       )
 
       # do not eager load this - it won't work because of the limit(1)

data/lib/pact_broker/pacts/repository.rb

@@ -16,6 +16,7 @@ require "pact_broker/pacts/selectors"
 require "pact_broker/feature_toggle"
 require "pact_broker/pacts/pacts_for_verification_repository"
 require "pact_broker/pacts/content"
+require "pact_broker/policies"
 
 module PactBroker
   module Pacts

data/lib/pact_broker/pacts/selector.rb

@@ -29,7 +29,9 @@ module PactBroker
       # verifiable_pact_messages, so don't need the "for_consumer" sub category
       # rubocop: disable Metrics/CyclomaticComplexity
       def type
-        if latest_for_branch?
+        if latest_for_main_branch?
+          :latest_for_main_branch
+        elsif latest_for_branch?
           :latest_for_branch
         elsif matching_branch?
           :matching_branch

data/lib/pact_broker/pacts/verifiable_pact_messages.rb

@@ -252,6 +252,8 @@ module PactBroker
           else
             "latest with tag #{selector.tag}"
           end
+        elsif selector.latest_for_main_branch?
+          "latest from main branch"
         elsif selector.latest_for_branch?
           if selector.fallback_branch?
             "latest from branch #{selector.fallback_branch}"

data/lib/pact_broker/repositories.rb

@@ -3,55 +3,112 @@ require "pact_broker/pacts/repository"
 
 module PactBroker
   module Repositories
+    REPOSITORY_FACTORIES = {}
+
+    extend self
+
+    def register_repository(name, &block)
+      REPOSITORY_FACTORIES[name] = block
+    end
+
+    def get_repository(name)
+      REPOSITORY_FACTORIES[name].call
+    end
+
     def pacticipant_repository
-      require "pact_broker/pacticipants/repository"
-      Pacticipants::Repository.new
+      get_repository(:pacticipant_repository)
     end
 
     def version_repository
-      require "pact_broker/versions/repository"
-      Versions::Repository.new
+      get_repository(:version_repository)
     end
 
     def pact_repository
-      PactBroker::Pacts::Repository.new
+      get_repository(:pact_repository)
     end
 
     def tag_repository
-      require "pact_broker/tags/repository"
-      Tags::Repository.new
+      get_repository(:tag_repository)
     end
 
     def label_repository
-      require "pact_broker/labels/repository"
-      Labels::Repository.new
+      get_repository(:label_repository)
     end
 
     def webhook_repository
-      require "pact_broker/webhooks/repository"
-      Webhooks::Repository.new
+      get_repository(:webhook_repository)
     end
 
     def verification_repository
-      require "pact_broker/verifications/repository"
-      Verifications::Repository.new
+      get_repository(:verification_repository)
     end
 
     def matrix_repository
-      require "pact_broker/matrix/repository"
-      Matrix::Repository.new
+      get_repository(:matrix_repository)
     end
 
     def branch_version_repository
-      require "pact_broker/versions/branch_version_repository"
-      PactBroker::Versions::BranchVersionRepository.new
+      get_repository(:branch_version_repository)
     end
 
     def integration_repository
-      require "pact_broker/integrations/repository"
-      PactBroker::Integrations::Repository.new
+      get_repository(:integration_repository)
     end
 
-    extend self
+    # rubocop: disable Metrics/MethodLength
+    def register_default_repositories
+      register_repository(:pacticipant_repository) do
+        require "pact_broker/pacticipants/repository"
+        Pacticipants::Repository.new
+      end
+
+      register_repository(:version_repository) do
+        require "pact_broker/versions/repository"
+        Versions::Repository.new
+      end
+
+      register_repository(:pact_repository) do
+        PactBroker::Pacts::Repository.new
+      end
+
+      register_repository(:tag_repository) do
+        require "pact_broker/tags/repository"
+        Tags::Repository.new
+      end
+
+      register_repository(:label_repository) do
+        require "pact_broker/labels/repository"
+        Labels::Repository.new
+      end
+
+      register_repository(:webhook_repository) do
+        require "pact_broker/webhooks/repository"
+        Webhooks::Repository.new
+      end
+
+      register_repository(:verification_repository) do
+        require "pact_broker/verifications/repository"
+        Verifications::Repository.new
+      end
+
+      register_repository(:matrix_repository) do
+        require "pact_broker/matrix/repository"
+        Matrix::Repository.new
+      end
+
+      register_repository(:branch_version_repository) do
+        require "pact_broker/versions/branch_version_repository"
+        PactBroker::Versions::BranchVersionRepository.new
+      end
+
+      register_repository(:integration_repository) do
+        require "pact_broker/integrations/repository"
+        PactBroker::Integrations::Repository.new
+      end
+
+      # rubocop: enable Metrics/MethodLength
+    end
   end
 end
+
+PactBroker::Repositories.register_default_repositories

data/lib/pact_broker/services.rb

@@ -1,96 +1,96 @@
 module PactBroker
   module Services
 
-    FACTORIES = {}
+    SERVICE_FACTORIES = {}
 
     extend self
 
     def register_service(name, &block)
-      FACTORIES[name] = block
+      SERVICE_FACTORIES[name] = block
     end
 
-    def get(name)
-      FACTORIES[name].call
+    def get_service(name)
+      SERVICE_FACTORIES[name].call
     end
 
     def index_service
-      get(:index_service)
+      get_service(:index_service)
     end
 
     def pact_service
-      get(:pact_service)
+      get_service(:pact_service)
     end
 
     def pacticipant_service
-      get(:pacticipant_service)
+      get_service(:pacticipant_service)
     end
 
     def tag_service
-      get(:tag_service)
+      get_service(:tag_service)
     end
 
     def label_service
-      get(:label_service)
+      get_service(:label_service)
     end
 
     def group_service
-      get(:group_service)
+      get_service(:group_service)
     end
 
     def webhook_service
-      get(:webhook_service)
+      get_service(:webhook_service)
     end
 
     def version_service
-      get(:version_service)
+      get_service(:version_service)
     end
 
     def verification_service
-      get(:verification_service)
+      get_service(:verification_service)
     end
 
     def badge_service
-      get(:badge_service)
+      get_service(:badge_service)
     end
 
     def matrix_service
-      get(:matrix_service)
+      get_service(:matrix_service)
     end
 
     def certificate_service
-      get(:certificate_service)
+      get_service(:certificate_service)
     end
 
     def integration_service
-      get(:integration_service)
+      get_service(:integration_service)
     end
 
     def webhook_trigger_service
-      get(:webhook_trigger_service)
+      get_service(:webhook_trigger_service)
     end
 
     def metrics_service
-      get(:metrics_service)
+      get_service(:metrics_service)
     end
 
     def environment_service
-      get(:environment_service)
+      get_service(:environment_service)
     end
 
     def deployed_version_service
-      get(:deployed_version_service)
+      get_service(:deployed_version_service)
     end
 
     def released_version_service
-      get(:released_version_service)
+      get_service(:released_version_service)
     end
 
     def contract_service
-      get(:contract_service)
+      get_service(:contract_service)
     end
 
     def branch_service
-      get(:branch_service)
+      get_service(:branch_service)
     end
 
     # rubocop: disable Metrics/MethodLength

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -1,5 +1,4 @@
 require "faraday"
-require "faraday_middleware"
 require "logger"
 require "erb"
 require "yaml"
@@ -82,7 +81,7 @@ module PactBroker
           available_environments = version_body["_links"]["pb:record-deployment"].collect{ | relation | relation["name"]}.join
           puts "Environment with name #{environment_name} not found. Available environments: #{available_environments}"
         else
-          client.post(environment_relation["href"]).tap { |response| check_for_error(response) }
+          client.post(environment_relation["href"], {}).tap { |response| check_for_error(response) }
         end
 
         separate
@@ -142,7 +141,7 @@ module PactBroker
         self
       end
 
-      def publish_pact(consumer: last_consumer_name, consumer_version:, provider: last_provider_name, content_id:, tag: nil, branch: nil)
+      def publish_pact_the_old_way(consumer: last_consumer_name, consumer_version:, provider: last_provider_name, content_id:, tag: nil, branch: nil)
         @last_consumer_name = consumer
         @last_provider_name = provider
         @last_consumer_version_number = consumer_version
@@ -162,6 +161,19 @@ module PactBroker
         self
       end
 
+      def publish_contract_and_verify(consumer:, provider:, consumer_version:, content_id: nil, consumer_branch: "main", provider_version:, provider_branch: "main", success: true)
+        publish_contract(consumer: consumer, provider: provider, consumer_version: consumer_version, content_id: content_id || SecureRandom.rand.to_s, branch: consumer_branch)
+          .get_pacts_for_verification(provider: provider, consumer_version_selectors: [ { branch: consumer_branch }])
+          .verify_pact(
+            provider: provider,
+            provider_version_branch: provider_branch,
+            provider_version: provider_version,
+            success: success
+          )
+      end
+
+      alias_method :publish_pact, :publish_pact_the_old_way
+
       def get_pacts_for_verification(provider: last_provider_name, provider_version_tag: nil, provider_version_branch: nil, consumer_version_selectors: nil, enable_pending: nil, include_wip_pacts_since: nil)
         @last_provider_name = provider
         @last_provider_version_tag = provider_version_tag
@@ -227,6 +239,7 @@ module PactBroker
         create_webhook_for_event(**kwargs)
       end
 
+      # rubocop: disable Metrics/MethodLength
       def create_webhook_for_event(uuid: nil, url: "https://postman-echo.com/post", body: nil, provider: nil, consumer: nil, event_name:)
         require "securerandom"
         webhook_prefix = "global " if provider.nil? && consumer.nil?
@@ -237,11 +250,12 @@ module PactBroker
           "eventName" => "${pactbroker.eventName}",
           "consumerName" => "${pactbroker.consumerName}",
           "consumerVersionNumber" => "${pactbroker.consumerVersionNumber}",
-          "providerVersionBranch" => "${pactbroker.providerVersionBranch}",
+          "consumerVersionTags" => "${pactbroker.consumerVersionTags}",
+          "consumerVersionBranch" => "${pactbroker.consumerVersionBranch}",
           "providerName" => "${pactbroker.providerName}",
           "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
+          "providerVersionBranch" => "${pactbroker.providerVersionBranch}",
           "providerVersionDescriptions" => "${pactbroker.providerVersionDescriptions}",
-          "consumerVersionBranch" => "${pactbroker.consumerVersionBranch}",
         }
         request_body = {
           "consumer" => consumer,
@@ -259,11 +273,16 @@ module PactBroker
         separate
         self
       end
+      # rubocop: enable Metrics/MethodLength
 
       def create_global_webhook_for_contract_changed(uuid: nil, url: "https://postman-echo.com/post", body: nil)
         create_global_webhook_for_event(uuid: uuid, url: url, body: body, event_name: "contract_content_changed")
       end
 
+      def create_global_webhook_for_contract_requiring_verification_published(uuid: nil, url: "https://postman-echo.com/post", body: nil)
+        create_global_webhook_for_event(uuid: uuid, url: url, body: body, event_name: "contract_requiring_verification_published")
+      end
+
       def create_global_webhook_for_anything_published(uuid: nil, url: "https://postman-echo.com/post")
         puts "Creating global webhook for contract changed event with uuid #{uuid}"
         uuid ||= SecureRandom.uuid

data/lib/pact_broker/version.rb

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

data/pact_broker.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.files         = begin
                         if Dir.exist?(".git")
                           Dir.chdir(File.expand_path(__dir__)) do
-                            include_patterns = %w[lib/**/* db/**/* docs/**/*.md public/**/* vendor/**/* README.md CHANGELOG.md Gemfile pact_broker.gemspec]
+                            include_patterns = %w[lib/**/* db/**/* docs/**/*.md public/**/* vendor/**/* LICENSE.txt README.md CHANGELOG.md Gemfile pact_broker.gemspec]
                             exclude_patterns = %w[db/test/**/*]
                             include_list = include_patterns.flat_map{ | pattern | Dir.glob(pattern) } - exclude_patterns.flat_map{ | pattern | Dir.glob(pattern) }
 
@@ -50,7 +50,6 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   #gem.add_runtime_dependency 'pact'
-  gem.add_runtime_dependency "httparty", "~> 0.14"
   gem.add_runtime_dependency "json", "~> 2.3"
   gem.add_runtime_dependency "roar", "~> 1.1"
   gem.add_runtime_dependency "reform", "~> 2.3.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.102.2
+  version: 2.103.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,22 +10,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +410,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- LICENSE.txt
 - README.md
 - db/ddl_statements.rb
 - db/ddl_statements/all_verifications.rb
@@ -1240,7 +1227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: See description