pact_broker 2.59.1 → 2.59.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6703933e244f375a0ebc2a9be4ecc7d9baa65c1f72950e7ee9bd4bfc7fca6c
-  data.tar.gz: 3d2e0906da58faeb0e882eb78cc4e255d52d1efd7a8ee19d7feeb8d8a31b00e3
+  metadata.gz: f1933f8f7902c43ed7d9db7c022a66f2569c6301dec2c8ac767e1da7b05f70b5
+  data.tar.gz: 40d82183c3a94b2bfc2bfa37a9aee12cc27729e1c3a1b3191df980c2ba3ad192
 SHA512:
-  metadata.gz: 9022f0a89698c8cb3d648a895040059e908c7199489cc56e9183650a9b398592c5d1f1aff3394444e2d40417a02d02f621691c8db7e4de6500582a2ce4704c52
-  data.tar.gz: ba3ea7d815830ae6e35339190909e5e2d06c799c69665ce01563bd952804961f54ef2a9424ab3cc8c323d2701abf305231d9796d4c86d9bd930f528981891dc9
+  metadata.gz: 5078b560d3d0abe897572f35276b3aec1c6752026ba849a9b61517def382ea0d936731a6b2f59801b0101cab7bde636ef3e9e5e7afe9524e13c3def552f48ded
+  data.tar.gz: 6fc016ea9e10bcbad4f78d60b93a81b5d0aab2ffbfef9d222a094e0348f632680995bce488abe9fefe55cad745afafef323ce3c972db3e78a7e1f6759d222f6e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v2.59.2"></a>
+### v2.59.2 (2020-08-06)
+
+#### Bug Fixes
+
+* gracefully handle contracts without interactions or messages in deployment status warnings	 ([6c223e69](/../../commit/6c223e69))
+* add missing info level log for business level errors	 ([80a895bf](/../../commit/80a895bf))
+
 <a name="v2.59.1"></a>
 ### v2.59.1 (2020-08-04)
 

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

@@ -5,11 +5,8 @@ module PactBroker
   module Api
     module Resources
       class ErrorHandler
-
         include PactBroker::Logging
 
-        WARNING_ERROR_CLASSES = [Sequel::ForeignKeyConstraintViolation]
-
         def self.call e, request, response
           error_reference = generate_error_reference
           if log_as_warning?(e)
@@ -17,6 +14,7 @@ module PactBroker
           elsif reportable?(e)
             log_error(e, "Error reference #{error_reference}")
             report(e, error_reference, request)
+          else
             logger.info("Error reference #{error_reference}", e)
           end
           response.body = response_body_hash(e, error_reference).to_json
@@ -31,7 +29,7 @@ module PactBroker
         end
 
         def self.log_as_warning?(e)
-          WARNING_ERROR_CLASSES.any? { |clazz| e.is_a?(clazz) }
+          PactBroker.configuration.warning_error_classes.any? { |clazz| e.is_a?(clazz) }
         end
 
         def self.display_message(e, error_reference)

data/lib/pact_broker/configuration.rb

@@ -31,12 +31,14 @@ module PactBroker
       :webhook_host_whitelist,
       :base_equality_only_on_content_that_affects_verification_results,
       :seed_example_data,
-      :badge_provider_mode
+      :badge_provider_mode,
+      :warning_error_class_names
     ]
 
     attr_accessor :base_url, :log_dir, :database_connection, :auto_migrate_db, :auto_migrate_db_data, :allow_missing_migration_files, :example_data_seeder, :seed_example_data, :use_hal_browser, :html_pact_renderer, :use_rack_protection
     attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints, :version_parser, :sha_generator
     attr_accessor :use_case_sensitive_resource_names, :order_versions_by_date
+    attr_accessor :warning_error_class_names
     attr_accessor :check_for_potential_duplicate_pacticipant_names
     attr_accessor :webhook_retry_schedule
     attr_reader :webhook_http_method_whitelist, :webhook_scheme_whitelist, :webhook_host_whitelist
@@ -115,6 +117,7 @@ module PactBroker
         require 'pact_broker/api/resources/default_base_resource'
         PactBroker::Api::Resources::DefaultBaseResource
       }
+      config.warning_error_class_names = ['Sequel::ForeignKeyConstraintViolation']
       config
     end
 
@@ -228,6 +231,12 @@ module PactBroker
       @webhook_host_whitelist = parse_space_delimited_string_list_property('webhook_host_whitelist', webhook_host_whitelist)
     end
 
+    def warning_error_classes
+      warning_error_class_names.collect do | class_name |
+        Object.const_get(class_name)
+      end
+    end
+
     private
 
     def parse_space_delimited_string_list_property property_name, property_value

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -195,7 +195,7 @@ module PactBroker
               InteractionsMissingVerifications.new(selector_for(row.consumer_name), selector_for(row.provider_name), row.verification.interactions_missing_test_results)
             end
           rescue StandardError => e
-            log_error(e, "Error determining if there were missing interaction verifications")
+            logger.warn("Error determining if there were missing interaction verifications", e)
             nil
           end
         end.compact.tap { |it| report_missing_interaction_verifications(it) if it.any? }

data/lib/pact_broker/pacts/content.rb

@@ -32,7 +32,8 @@ module PactBroker
       end
 
       def interactions_missing_test_results
-        interactions.reject do | interaction |
+        return [] unless messages_or_interactions
+        messages_or_interactions.reject do | interaction |
           interaction['tests']&.any?
         end
       end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.59.1'
+  VERSION = '2.59.2'
 end

data/spec/lib/pact_broker/api/resources/error_handler_spec.rb

@@ -5,7 +5,6 @@ module PactBroker
     module Resources
       describe ErrorHandler do
         describe "call" do
-
           before do
             allow(ErrorHandler).to receive(:logger).and_return(logger)
             allow(SecureRandom).to receive(:urlsafe_base64).and_return("bYWfn-+yWPlf")
@@ -45,6 +44,24 @@ module PactBroker
             subject
           end
 
+          context "when the error class is in the warning_error_classes list" do
+            let(:error) { Sequel::ForeignKeyConstraintViolation.new }
+
+            it "logs at warn so as not to wake everyone up in the middle of the night" do
+              expect(logger).to receive(:warn).with(/bYWfnyWPlf/, error)
+              subject
+            end
+          end
+
+          context "when the error is not reportable and not a warning level" do
+            let(:error) { PactBroker::Error.new('foo') }
+
+            it "logs at info" do
+              expect(logger).to receive(:info).with(/bYWfnyWPlf/, error)
+              subject
+            end
+          end
+
           context "when show_backtrace_in_error_response? is true" do
             before do
               allow(PactBroker.configuration).to receive(:show_backtrace_in_error_response?).and_return(true)

data/spec/lib/pact_broker/pacts/content_spec.rb

@@ -308,6 +308,14 @@ module PactBroker
           expect(subject.interactions_missing_test_results.count).to eq 1
         end
 
+        context "with no interactions" do
+          let(:pact_content) { {} }
+
+          it "does not blow up" do
+            expect(subject.interactions_missing_test_results.count).to eq 0
+          end
+        end
+
         context "with nil test results" do
           let(:test_results) { nil }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.59.1
+  version: 2.59.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty