pact_broker 2.81.0 → 2.82.0

data/lib/pact_broker/pacts/selected_pact.rb

@@ -13,7 +13,7 @@ module PactBroker
 
       def self.merge(selected_pacts)
         latest_selected_pact = selected_pacts.sort_by(&:consumer_version_order).last
-        selectors = selected_pacts.collect(&:selectors).reduce(&:+)
+        selectors = selected_pacts.collect(&:selectors).reduce(&:+).sort
         SelectedPact.new(latest_selected_pact.pact, selectors)
       end
 

data/lib/pact_broker/pacts/selector.rb

@@ -101,7 +101,7 @@ module PactBroker
       end
 
       def currently_deployed?
-        currently_deployed
+        !!currently_deployed
       end
 
       def currently_supported= currently_supported
@@ -113,7 +113,7 @@ module PactBroker
       end
 
       def currently_supported?
-        currently_supported
+        !!currently_supported
       end
 
       def environment_name= environment_name
@@ -204,6 +204,10 @@ module PactBroker
         Selector.new(hash)
       end
 
+      def for_consumer(consumer)
+        Selector.new(to_h.merge(consumer: consumer))
+      end
+
       def latest_for_main_branch?
         !!main_branch
       end
@@ -334,6 +338,15 @@ module PactBroker
       def == other
         super && consumer_version == other.consumer_version
       end
+
+      def <=> other
+        comparison = super
+        if comparison == 0
+          consumer_version.order <=> other.consumer_version.order
+        else
+          comparison
+        end
+      end
     end
   end
 end

data/lib/pact_broker/pacts/selectors.rb

@@ -43,6 +43,10 @@ module PactBroker
         Selectors.new(super)
       end
 
+      def sort
+        Selectors.new(super)
+      end
+
       def overall_latest?
         any?(&:overall_latest?)
       end

data/lib/pact_broker/pacts/service.rb

@@ -156,6 +156,10 @@ module PactBroker
         updated_pact
       end
 
+      def disallowed_modification?(existing_pact, new_json_content)
+        !PactBroker.configuration.allow_dangerous_contract_modification && existing_pact && existing_pact.pact_version_sha != generate_sha(new_json_content)
+      end
+
       private :update_pact
 
       # When no publication for the given consumer/provider/consumer version number exists

data/lib/pact_broker/repositories/scopes.rb

@@ -1,8 +1,19 @@
 module PactBroker
   module Repositories
     module Scopes
+      def with_no_scope
+        @unscoped = true
+        yield self
+      ensure
+        @unscoped = false
+      end
+
       def scope_for(scope)
-        PactBroker.policy_scope!(scope)
+        if @unscoped == true
+          scope
+        else
+          PactBroker.policy_scope!(scope)
+        end
       end
 
       # For the times when it doesn't make sense to use the scoped class, this is a way to

data/lib/pact_broker/string_refinements.rb

@@ -6,6 +6,12 @@ module PactBroker
       end
     end
 
+    refine Numeric do
+      def blank?
+        false
+      end
+    end
+
     refine String do
       def not_blank?
         !blank?

data/lib/pact_broker/tags/service.rb

@@ -1,15 +1,22 @@
 require "pact_broker/repositories"
+require "pact_broker/configuration"
+require "pact_broker/logging"
 
 module PactBroker
   module Tags
     module Service
       extend self
       extend PactBroker::Repositories
+      extend PactBroker::Services
+      include PactBroker::Logging
 
       def create args
+        tag_name = args.fetch(:tag_name)
         pacticipant = pacticipant_repository.find_by_name_or_create args.fetch(:pacticipant_name)
         version = version_repository.find_by_pacticipant_id_and_number_or_create pacticipant.id, args.fetch(:pacticipant_version_number)
-        tag_repository.create version: version, name: args.fetch(:tag_name)
+        version_service.maybe_set_version_branch_from_tag(version, tag_name)
+        pacticipant_service.maybe_set_main_branch(version.pacticipant, tag_name)
+        tag_repository.create(version: version, name: tag_name)
       end
 
       def find args

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -180,17 +180,19 @@ module PactBroker
         self
       end
 
-      def create_global_webhook_for_contract_changed(uuid: nil, url: "https://postman-echo.com/post", body: nil)
+      def create_global_webhook_for_event(uuid: nil, url: "https://postman-echo.com/post", body: nil, event_name: )
         puts "Creating global webhook for contract changed event with uuid #{uuid}"
         uuid ||= SecureRandom.uuid
         default_body = {
-          "deployedProviderVersion" => "${pactbroker.currentlyDeployedProviderVersionNumber}",
+          "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
+          "providerVersionBranch" => "${pactbroker.providerVersionBranch}",
+          "consumerVersionNumber" => "${pactbroker.consumerVersionNumber}",
           "consumerVersionBranch" => "${pactbroker.consumerVersionBranch}"
         }
         request_body = {
           "description" => "A webhook for all consumers and providers",
           "events" => [{
-            "name" => "contract_content_changed"
+            "name" => event_name
           }],
           "request" => {
             "method" => "POST",
@@ -204,6 +206,10 @@ module PactBroker
         self
       end
 
+      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_anything_published(uuid: nil, url: "https://postman-echo.com/post")
         puts "Creating global webhook for contract changed event with uuid #{uuid}"
         uuid ||= SecureRandom.uuid
@@ -248,8 +254,8 @@ module PactBroker
         self
       end
 
-      def can_i_deploy(pacticipant:, version:, to:)
-        can_i_deploy_response = client.get("can-i-deploy", { pacticipant: pacticipant, version: version, to: to} ).tap { |response| check_for_error(response) }
+      def can_i_deploy(pacticipant:, version:, to: nil, to_environment: nil)
+        can_i_deploy_response = client.get("can-i-deploy", { pacticipant: pacticipant, version: version, to: to, environment: to_environment}.compact ).tap { |response| check_for_error(response) }
         can = !!(can_i_deploy_response.body["summary"] || {})["deployable"]
         puts "can-i-deploy #{pacticipant} version #{version} to #{to}: #{can ? 'yes' : 'no'}"
         summary = can_i_deploy_response.body["summary"]

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

@@ -1,9 +1,11 @@
-%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
-%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-menu.css"}
-%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-icon.css"}
-%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/jquery-confirm.min.css"}
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery.tablesorter.min.js"}
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/material-menu.js"}
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/index.js"}
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/clipboard.js"}
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-confirm.min.js"}
+- require "pact_broker/version"
+
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css?v=#{PactBroker::VERSION}"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-menu.css?v=#{PactBroker::VERSION}"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/material-icon.css?v=#{PactBroker::VERSION}"}
+%link{rel: 'stylesheet', href: "#{base_url}/stylesheets/jquery-confirm.min.css?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery.tablesorter.min.js?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/material-menu.js?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/index.js?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/clipboard.js?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-confirm.min.js?v=#{PactBroker::VERSION}"}

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

@@ -1,4 +1,6 @@
-%script{type: 'text/javascript', src:"#{base_url}/javascripts/pagination.js"}
+- require "pact_broker/version"
+
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/pagination.js?v=#{PactBroker::VERSION}"}
 
 :javascript
   const PAGE_NUMBER = #{page_number};

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -1,9 +1,11 @@
+- require "pact_broker/version"
+
 <!DOCTYPE html>
 %html
   %head
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: "#{base_url}/images/favicon.ico", type:'image/x-icon'}
-    %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
-    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.5.1.min.js"}
-    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.bundle.min.js"}
+    %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css?v=#{PactBroker::VERSION}"}
+    %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.5.1.min.js?v=#{PactBroker::VERSION}"}
+    %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.bundle.min.js?v=#{PactBroker::VERSION}"}
   != yield

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

@@ -1,12 +1,14 @@
+- require "pact_broker/version"
+
 %body
-  %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css"}
-  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css"}
-  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/matrix.css"}
-  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.5.1.min.js"}
-  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery.tablesorter.min.js"}
-  %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js"}
-  %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js"}
-  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.bundle.min.js"}
+  %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css?v=#{PactBroker::VERSION}"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/index.css?v=#{PactBroker::VERSION}"}
+  %link{rel: 'stylesheet', href: "#{base_url}/stylesheets/matrix.css?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery-3.5.1.min.js?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/jquery.tablesorter.min.js?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.bundle.min.js?v=#{PactBroker::VERSION}"}
 
   .container
     .navbar-right

data/lib/pact_broker/verifications/required_verification.rb

@@ -0,0 +1,28 @@
+module PactBroker
+  module Verifications
+    class RequiredVerification
+      attr_reader :provider_version, :provider_version_descriptions
+
+      def initialize(attributes = {})
+        attributes.each do | (name, value) |
+          instance_variable_set("@#{name}", value) if respond_to?(name)
+        end
+      end
+
+      def == other
+        provider_version == other.provider_version && provider_version_descriptions == other.provider_version_descriptions
+      end
+
+      def + other
+        if provider_version != other.provider_version
+          raise PactBroker::Error.new("Can't + RequiredVerifications with different provider versions (#{provider_version.number}/#{other.provider_version.number})")
+        end
+
+        RequiredVerification.new(
+          provider_version: provider_version,
+          provider_version_descriptions: (provider_version_descriptions + other.provider_version_descriptions).uniq
+        )
+      end
+    end
+  end
+end

data/lib/pact_broker/verifications/service.rb

@@ -5,6 +5,7 @@ require "pact_broker/verifications/summary_for_consumer_version"
 require "pact_broker/logging"
 require "pact_broker/hash_refinements"
 require "pact_broker/events/publisher"
+require "pact_broker/verifications/required_verification"
 
 module PactBroker
   module Verifications
@@ -89,7 +90,16 @@ module PactBroker
         verification_repository.delete_all_verifications_between(consumer_name, options)
       end
 
-      private
+      def calculate_required_verifications_for_pact(pact)
+        pact_version = PactBroker::Pacts::PactVersion.for_pact_domain(pact)
+        required_verifications =  required_verifications_for_main_branch(pact_version) +
+                                  required_verifications_for_deployed_versions(pact_version) +
+                                  required_verifications_for_released_versions(pact_version)
+        required_verifications
+          .group_by(&:provider_version)
+          .values
+          .flat_map { | required_verifications_for_provider_version | required_verifications_for_provider_version.reduce(&:+) }
+      end
 
       def broadcast_events(verification, pact, event_context)
         event_params = {
@@ -105,6 +115,44 @@ module PactBroker
           broadcast(:provider_verification_failed, event_params)
         end
       end
+      private :broadcast_events
+
+      def identify_required_verification(pact_version, provider_version, description)
+        any_verifications = PactBroker::Domain::Verification.where(pact_version_id: pact_version.id, provider_version_id: provider_version.id).any?
+        if !any_verifications
+          RequiredVerification.new(provider_version: provider_version, provider_version_descriptions: [description])
+        end
+      end
+      private :identify_required_verification
+
+      def required_verifications_for_main_branch(pact_version)
+        latest_version_from_main_branch = [version_service.find_latest_version_from_main_branch(pact_version.provider)].compact
+
+        latest_version_from_main_branch.collect do | main_branch_version |
+          identify_required_verification(pact_version, main_branch_version, "latest version from main branch")
+        end.compact
+      end
+      private :required_verifications_for_main_branch
+
+      def required_verifications_for_deployed_versions(pact_version)
+        deployed_versions = deployed_version_service.with_no_scope do | unscoped_service |
+          unscoped_service.find_currently_deployed_versions_for_pacticipant(pact_version.provider)
+        end
+        deployed_versions.collect do | deployed_version |
+          identify_required_verification(pact_version, deployed_version.version, "currently deployed version (#{deployed_version.environment_name})")
+        end.compact
+      end
+      private :required_verifications_for_deployed_versions
+
+      def required_verifications_for_released_versions(pact_version)
+        released_versions = released_version_service.with_no_scope do | unscoped_service |
+          unscoped_service.find_currently_supported_versions_for_pacticipant(pact_version.provider)
+        end
+        released_versions.collect do | released_version |
+          identify_required_verification(pact_version, released_version.version, "currently released version (#{released_version.environment_name})")
+        end.compact
+      end
+      private :required_verifications_for_released_versions
     end
   end
 end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.81.0"
+  VERSION = "2.82.0"
 end

data/lib/pact_broker/versions/repository.rb

@@ -128,6 +128,21 @@ module PactBroker
       def find_versions_for_selector(selector)
         PactBroker::Domain::Version.select_all_qualified.for_selector(selector).all
       end
+
+      def set_branch_if_unset(version, branch)
+        version.update(branch: branch) if version.branch.nil?
+        version
+      end
+
+      def find_latest_version_from_main_branch(pacticipant)
+        if pacticipant.main_branch
+          latest_from_main_branch = PactBroker::Domain::Version
+            .latest_versions_for_pacticipant_branches(pacticipant.id, pacticipant.main_branch)
+            .single_record
+
+          latest_from_main_branch || find_by_pacticipant_name_and_latest_tag(pacticipant.name, pacticipant.main_branch)
+        end
+      end
     end
   end
 end

data/lib/pact_broker/versions/service.rb

@@ -1,3 +1,4 @@
+require "pact_broker/logging"
 require "pact_broker/repositories"
 require "pact_broker/messages"
 
@@ -6,6 +7,8 @@ module PactBroker
     class Service
       extend PactBroker::Messages
       extend PactBroker::Repositories
+      extend PactBroker::Services
+      include PactBroker::Logging
 
       def self.conflict_errors(_existing_version, _open_struct_version, _version_url)
         # This validation is causing problems in the PF build when branches are merged
@@ -38,12 +41,20 @@ module PactBroker
 
       def self.create_or_overwrite(pacticipant_name, version_number, version)
         pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
-        version_repository.create_or_overwrite(pacticipant, version_number, version)
+        version = version_repository.create_or_overwrite(pacticipant, version_number, version)
+        pacticipant_service.maybe_set_main_branch(pacticipant, version.branch)
+        version
       end
 
       def self.create_or_update(pacticipant_name, version_number, version)
         pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
-        version_repository.create_or_update(pacticipant, version_number, version)
+        version = version_repository.create_or_update(pacticipant, version_number, version)
+        pacticipant_service.maybe_set_main_branch(pacticipant, version.branch)
+        version
+      end
+
+      def self.find_latest_version_from_main_branch(pacticipant)
+        version_repository.find_latest_version_from_main_branch(pacticipant)
       end
 
       def self.delete version
@@ -53,6 +64,25 @@ module PactBroker
         verification_repository.delete_by_provider_version_id version.id
         version_repository.delete_by_id version.id
       end
+
+      def self.maybe_set_version_branch_from_tag(version, tag_name)
+        if use_tag_as_branch?(version) && !version.branch
+          logger.info "Setting #{version.pacticipant.name} version #{version.number} branch to '#{tag_name}' from first tag (because use_first_tag_as_branch=true)"
+          version_repository.set_branch_if_unset(version, tag_name)
+        end
+      end
+
+      def self.use_tag_as_branch?(version)
+        version.tags.count == 0 &&
+          PactBroker.configuration.use_first_tag_as_branch &&
+          ((now - version.created_at.to_datetime) * 24 * 60 * 60) <= PactBroker.configuration.use_first_tag_as_branch_time_limit
+      end
+      private_class_method :use_tag_as_branch?
+
+      def self.now
+        Time.now.utc.to_datetime
+      end
+      private_class_method :now
     end
   end
 end