pact_broker 2.95.1 → 2.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f65cf2bd6eb2b3f0f7fd727e61fc73005817200f8e72bbab574493e4ea9b9ba3
-  data.tar.gz: aac1fb501fc5624227e63d424c8982f266fa0a9a2d80b1184844193347ba6724
+  metadata.gz: e08b2792c380c3066af4817bc219cc3dc134860b2769a6608e3d625269d53f7d
+  data.tar.gz: be1cefe3b370f3b227bff1330af71dd5a0adcfd609a7ae4fd1d1b144c76fe7a1
 SHA512:
-  metadata.gz: 8272759e5880069606e56bea3893055df49543b76b237d7511ce8fa21c0414f1a0e593e98ed1f9e67c4b9048b4da1c2d3ef938b0dfea182406cda696111c2bc4
-  data.tar.gz: 426a032f0016c8952934fbf630420be42accf192baeaff3bd2651aefa75170d055d8a4ed125640a7b3cad124cf5a461d7c930e5d289f4a6e5bd666366661940a
+  metadata.gz: 24dbb88676eb61e1e5809b54ef9cb6cae4d33093beefbe1e9140c0e43f68561aa0ef765cc176e5da04415964410dbc4f18b2393f6426a2b40dbf0826d86a5ff4
+  data.tar.gz: d3fdd055d91ba7b563b258c49fb666a17518432a72c8faa818ffc5dfd2c20a6095c82390ccc71c5c1f1a888e8aa7319d530d0d6c3fefe83170a5fab4320f724d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v2.96.0"></a>
+### v2.96.0 (2022-03-21)
+
+#### Features
+
+* print final value of configuration attribute rather than source value	 ([9c0fd3c4](/../../commit/9c0fd3c4))
+
+#### Bug Fixes
+
+* ensure database and basic auth credentials are not coerced to arrays if they contain commas	 ([5bce7ce4](/../../commit/5bce7ce4))
+* allow lazy loading when finding individual pacts	 ([04e03cb2](/../../commit/04e03cb2))
+
 <a name="v2.95.1"></a>
 ### v2.95.1 (2022-03-18)
 

data/lib/pact_broker/config/basic_auth_configuration.rb

@@ -20,6 +20,13 @@ module PactBroker
 
           sensitive_values(:basic_auth_password, :basic_auth_read_only_password)
 
+          coerce_types(
+            basic_auth_username: :string,
+            basic_auth_password: :string,
+            basic_auth_read_only_username: :string,
+            basic_auth_read_only_password: :string
+          )
+
           def basic_auth_credentials_provided?
             basic_auth_username&.not_blank? && basic_auth_password&.not_blank?
           end

data/lib/pact_broker/config/runtime_configuration_database_methods.rb

@@ -31,6 +31,11 @@ module PactBroker
             database_connection_validation_timeout: nil
           )
 
+          coerce_types(
+            database_username: :string,
+            database_password: :string
+          )
+
           def database_configuration
             database_credentials
               .merge(

data/lib/pact_broker/config/runtime_configuration_logging_methods.rb

@@ -1,8 +1,11 @@
 require "uri"
+require "pact_broker/hash_refinements"
 
 module PactBroker
   module Config
     module RuntimeConfigurationLoggingMethods
+      using PactBroker::HashRefinements
+
       module ClassMethods
         def sensitive_values(*values)
           @sensitive_values ||= []
@@ -19,8 +22,11 @@ module PactBroker
       end
 
       module InstanceMethods
+        # base_url raises a not implemented error
         def log_configuration(logger)
-          to_source_trace.sort_by { |key, _| key }.each { |key, value| log_config_inner(key, value, logger) }
+          to_source_trace.without("base_url").each_with_object({})do | (key, details), new_hash |
+            new_hash[key] = details.merge(value: self.send(key.to_sym))
+          end.sort_by { |key, _| key }.each { |key, value| log_config_inner(key, value, logger) }
         end
 
         def log_config_inner(key, value, logger)
@@ -29,7 +35,7 @@ module PactBroker
           elsif self.class.sensitive_value?(key)
             logger.info "#{key}=#{redact(key, value[:value])} source=#{value[:source]}"
           else
-            logger.info "#{key}=#{value[:value]} source=#{value[:source]}"
+            logger.info "#{key}=#{value[:value].inspect} source=#{value[:source]}"
           end
         end
         private :log_config_inner

data/lib/pact_broker/configuration.rb

@@ -15,10 +15,6 @@ module PactBroker
     RequestStore.store[:pact_broker_configuration] = configuration
   end
 
-  def self.with_runtime_configuration_overrides(overrides, &block)
-    self.configuration.with_runtime_configuration_overrides(overrides, &block)
-  end
-
   # @private, for testing only
   def self.reset_configuration
     RequestStore.store[:pact_broker_configuration] = Configuration.default_configuration
@@ -82,14 +78,6 @@ module PactBroker
       config
     end
 
-    def with_runtime_configuration_overrides(overrides)
-      original_runtime_configuration = runtime_configuration
-      self.runtime_configuration = override_runtime_configuration!(overrides)
-      yield
-    ensure
-      self.runtime_configuration = original_runtime_configuration
-    end
-
     def override_runtime_configuration!(overrides)
       new_runtime_configuration = runtime_configuration.dup
       valid_overrides = {}

data/lib/pact_broker/index/service.rb

@@ -108,7 +108,7 @@ module PactBroker
       # rubocop: disable Metrics/CyclomaticComplexity
       def self.latest_verification_for_pseudo_branch(pact_publication, is_overall_latest, latest_verifications_for_cv_tags, tags_option, options)
         if options[:view] == "branch" || (options[:view] == "all" && pact_publication.consumer_version.branch_heads.any?)
-          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches(forbid_lazy_load: false)
+          pact_publication.latest_verification || pact_publication.latest_verification_for_consumer_branches
         elsif tags_option == true
           latest_verifications_for_cv_tags
             .select{ | v | v.consumer_id == pact_publication.consumer_id && v.provider_id == pact_publication.provider_id && pact_publication.head_pact_tags.collect(&:name).include?(v.consumer_version_tag_name) }

data/lib/pact_broker/pacts/lazy_loaders.rb

@@ -9,6 +9,32 @@ module PactBroker
             .latest_for_consumer_tag(consumer_version_tag_names)
             .from_self.order_by(:tag_name)
       }
+
+      LATEST_VERIFICATION_FOR_CONSUMER_BRANCHES = lambda {
+        bv_pp_join = {
+          Sequel[:branch_versions][:version_id] => Sequel[:pact_publications][:consumer_version_id],
+          Sequel[:pact_publications][:provider_id] => provider_id
+        }
+
+        verifications_join = {
+          Sequel[:verifications][:pact_version_id] => Sequel[:pact_publications][:pact_version_id]
+        }
+
+        branch_ids = PactBroker::Versions::BranchVersion
+          .select(:branch_id)
+          .where(version_id: consumer_version_id)
+
+
+        latest_verification_id = PactBroker::Versions::BranchVersion
+          .select(Sequel[:verifications][:id])
+          .where(Sequel[:branch_versions][:branch_id] => branch_ids)
+          .join(:pact_publications, bv_pp_join)
+          .join(:verifications, verifications_join)
+          .order(Sequel.desc(Sequel[:verifications][:id]))
+          .limit(1)
+
+        PactBroker::Domain::Verification.where(id: latest_verification_id)
+      }
     end
   end
 end

data/lib/pact_broker/pacts/pact_publication.rb

@@ -34,43 +34,19 @@ module PactBroker
         read_only: true,
         key: :id,
         primary_key: :id,
-        dataset: lambda {
-
-          bv_pp_join = {
-            Sequel[:branch_versions][:version_id] => Sequel[:pact_publications][:consumer_version_id],
-            Sequel[:pact_publications][:provider_id] => provider_id
-          }
-
-          verifications_join = {
-            Sequel[:verifications][:pact_version_id] => Sequel[:pact_publications][:pact_version_id]
-          }
-
-          branch_ids = PactBroker::Versions::BranchVersion
-            .select(:branch_id)
-            .where(version_id: consumer_version_id)
-
-
-          latest_verification_id = PactBroker::Versions::BranchVersion
-            .select(Sequel[:verifications][:id])
-            .where(Sequel[:branch_versions][:branch_id] => branch_ids)
-            .join(:pact_publications, bv_pp_join)
-            .join(:verifications, verifications_join)
-            .order(Sequel.desc(Sequel[:verifications][:id]))
-            .limit(1)
-
-          PactBroker::Domain::Verification.where(id: latest_verification_id)
-        },
+        forbid_lazy_load: false,
+        dataset: PactBroker::Pacts::LazyLoaders::LATEST_VERIFICATION_FOR_CONSUMER_BRANCHES,
         eager_loader: proc do | _ |
           raise NotImplementedError
         end
       )
 
-
       one_to_many(:head_pact_publications_for_tags,
         class: PactPublication,
         read_only: true,
         dataset: PactBroker::Pacts::LazyLoaders::HEAD_PACT_PUBLICATIONS_FOR_TAGS,
-        eager_loader: PactBroker::Pacts::EagerLoaders::HeadPactPublicationsForTags
+        eager_loader: PactBroker::Pacts::EagerLoaders::HeadPactPublicationsForTags,
+        forbid_lazy_load: false
       )
 
       plugin :upsert, identifying_columns: [:consumer_version_id, :provider_id, :revision_number]

data/lib/pact_broker/pacts/repository.rb

@@ -250,26 +250,28 @@ module PactBroker
         if consumer_version_number && !pact_version_sha
           pact_publication_by_consumer_version
             .eager(:tags)
+            .all_allowing_lazy_load
             .collect(&:to_domain_with_content).first
         elsif pact_version_sha && !consumer_version_number
           latest_pact_publication_by_sha
             .eager(:tags)
             .collect(&:to_domain_with_content).first
         elsif consumer_version_number && pact_version_sha
-          pact_publication = pact_publication_by_consumer_version.all.first
-          pact_publication&.allow_lazy_load
+          pact_publication = pact_publication_by_consumer_version.all_allowing_lazy_load.first
           if pact_publication && pact_publication.pact_version.sha == pact_version_sha
             pact_publication.tags
             pact_publication.to_domain_with_content
           else
             latest_pact_publication_by_sha
               .eager(:tags)
+              .all_allowing_lazy_load
               .collect(&:to_domain_with_content).first
           end
         else
           pact_publication_by_consumer_version
             .eager(:tags)
             .reverse_order(:consumer_version_order, :revision_number)
+            .all_allowing_lazy_load
             .collect(&:to_domain_with_content).first
         end
       end

data/lib/pact_broker/repositories/helpers.rb

@@ -10,6 +10,10 @@ module PactBroker
         all.each{ | row | row.forbid_lazy_load if row.respond_to?(:forbid_lazy_load) }
       end
 
+      def all_allowing_lazy_load
+        all.each{ | row | row.allow_lazy_load if row.respond_to?(:allow_lazy_load) }
+      end
+
       def name_like column_name, value
         if PactBroker.configuration.use_case_sensitive_resource_names
           if mysql?

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.95.1"
+  VERSION = "2.96.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.95.1
+  version: 2.96.0
 platform: ruby
 authors:
 - Bethany Skurrie