pact_broker 2.27.6 → 2.29.0

data/lib/pact_broker/matrix/resolved_selector.rb

@@ -0,0 +1,126 @@
+# A selector with the pacticipant id, name, version number, and version id set
+# This is created from either specified or inferred data, based on the user's query
+# eg.
+# can-i-deploy --pacticipant Foo --version 1 (this is a specified selector)
+#              --to prod (this is used to create inferred selectors)
+module PactBroker
+  module Matrix
+    class ResolvedSelector < Hash
+
+      # A version ID of -1 will not match any rows, which is what we want to ensure that
+      # no matrix rows are returned for a version that does not exist.
+      NULL_VERSION_ID = -1
+
+      def initialize(params = {})
+        merge!(params)
+      end
+
+      def self.for_pacticipant(pacticipant, type)
+        ResolvedSelector.new(
+          pacticipant_id: pacticipant.id,
+          pacticipant_name: pacticipant.name,
+          type: type
+        )
+      end
+
+      def self.for_pacticipant_and_version(pacticipant, version, original_selector, type)
+        ResolvedSelector.new(
+          pacticipant_id: pacticipant.id,
+          pacticipant_name: pacticipant.name,
+          pacticipant_version_id: version.id,
+          pacticipant_version_number: version.number,
+          latest: original_selector[:latest],
+          tag: original_selector[:tag],
+          type: type
+        )
+      end
+
+      def self.for_pacticipant_and_non_existing_version(pacticipant, original_selector, type)
+        ResolvedSelector.new(
+          pacticipant_id: pacticipant.id,
+          pacticipant_name: pacticipant.name,
+          pacticipant_version_id: NULL_VERSION_ID,
+          pacticipant_version_number: original_selector[:pacticipant_version_number],
+          latest: original_selector[:latest],
+          tag: original_selector[:tag],
+          type: type
+        )
+      end
+
+      def pacticipant_id
+        self[:pacticipant_id]
+      end
+
+      def pacticipant_name
+        self[:pacticipant_name]
+      end
+
+      def pacticipant_version_id
+        self[:pacticipant_version_id]
+      end
+
+      def pacticipant_version_number
+        self[:pacticipant_version_number]
+      end
+
+      def latest?
+        self[:latest]
+      end
+
+      def tag
+        self[:tag]
+      end
+
+      def latest_tagged?
+        latest? && tag
+      end
+
+      def version_does_not_exist?
+        !version_exists?
+      end
+
+      def latest_tagged_version_that_does_not_exist?
+        version_does_not_exist? && latest_tagged?
+      end
+
+      def specified_version_that_does_not_exist?
+        specified? && version_does_not_exist?
+      end
+
+      def version_exists?
+        pacticipant_version_id != NULL_VERSION_ID
+      end
+
+      # Did the user specify this selector in the user's query?
+      def specified?
+        self[:type] == :specified
+      end
+
+      # Was this selector inferred based on the user's query?
+      #(ie. the integrations were calculated because only one selector was specified)
+      def inferred?
+        self[:type] == :inferred
+      end
+
+      def description
+        if latest_tagged? && pacticipant_version_number
+          "the latest version of #{pacticipant_name} with tag #{tag} (#{pacticipant_version_number})"
+        elsif latest_tagged?
+          "the latest version of #{pacticipant_name} with tag #{tag} (no such version exists)"
+        elsif latest? && pacticipant_version_number
+          "the latest version of #{pacticipant_name} (#{pacticipant_version_number})"
+        elsif latest?
+          "the latest version of #{pacticipant_name} (no such version exists)"
+        elsif tag && pacticipant_version_number
+          "a version of #{pacticipant_name} with tag #{tag} (#{pacticipant_version_number})"
+        elsif tag
+          "a version of #{pacticipant_name} with tag #{tag} (no such version exists)"
+        elsif pacticipant_version_number
+          "version #{pacticipant_version_number} of #{pacticipant_name}"
+        else
+          "any version of #{pacticipant_name}"
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/matrix/row.rb

@@ -14,7 +14,6 @@ module PactBroker
       TP_COLS = [ :consumer_version_number, :pact_revision_number, :provider_version_number, :verification_number]
 
       associate(:one_to_many, :latest_triggered_webhooks, :class => "PactBroker::Webhooks::LatestTriggeredWebhook", primary_key: :pact_publication_id, key: :pact_publication_id)
-      associate(:one_to_many, :webhooks, :class => "PactBroker::Webhooks::Webhook", primary_key: [:consumer_id, :provider_id], key: [:consumer_id, :provider_id])
       associate(:one_to_many, :consumer_version_tags, :class => "PactBroker::Tags::TagWithLatestFlag", primary_key: :consumer_version_id, key: :version_id)
       associate(:one_to_many, :provider_version_tags, :class => "PactBroker::Tags::TagWithLatestFlag", primary_key: :provider_version_id, key: :version_id)
 
@@ -198,6 +197,14 @@ module PactBroker
       def eql?(obj)
         (obj.class == model) && (obj.values == values)
       end
+
+      def pacticipant_names
+        [consumer_name, provider_name]
+      end
+
+      def involves_pacticipant_with_name?(pacticipant_name)
+        pacticipant_name.include?(pacticipant_name)
+      end
     end
   end
 end

data/lib/pact_broker/matrix/service.rb

@@ -12,10 +12,8 @@ module PactBroker
 
       def find selectors, options = {}
         query_results = matrix_repository.find selectors, options
-        pacticipant_names = selectors.collect{ | s| s[:pacticipant_name] }
-        integrations = matrix_repository.find_integrations(pacticipant_names)
-        deployment_status_summary = DeploymentStatusSummary.new(query_results.rows, query_results.resolved_selectors, integrations)
-        QueryResultsWithDeploymentStatusSummary.new(query_results.rows, query_results.selectors, query_results.options, query_results.resolved_selectors, deployment_status_summary)
+        deployment_status_summary = DeploymentStatusSummary.new(query_results.rows, query_results.resolved_selectors, query_results.integrations)
+        QueryResultsWithDeploymentStatusSummary.new(query_results.rows, query_results.selectors, query_results.options, query_results.resolved_selectors, query_results.integrations, deployment_status_summary)
       end
 
       def find_for_consumer_and_provider params
@@ -67,18 +65,6 @@ module PactBroker
           end
         end
 
-        if error_messages.empty?
-          selectors.each do | s |
-            if s[:pacticipant_version_number]
-              version = version_service.find_by_pacticipant_name_and_number(pacticipant_name: s[:pacticipant_name], pacticipant_version_number: s[:pacticipant_version_number])
-              error_messages << "No pact or verification found for #{s[:pacticipant_name]} version #{s[:pacticipant_version_number]}" if version.nil?
-            elsif s[:tag]
-              version = version_service.find_by_pacticipant_name_and_latest_tag(s[:pacticipant_name], s[:tag])
-              error_messages << "No version of #{s[:pacticipant_name]} found with tag #{s[:tag]}" if version.nil?
-            end
-          end
-        end
-
         if selectors.size == 0
           error_messages << "Please provide 1 or more version selectors."
         end

data/lib/pact_broker/pacts/repository.rb

@@ -35,13 +35,18 @@ module PactBroker
         existing_model = PactPublication.find(id: id)
         pact_version = find_or_create_pact_version(existing_model.consumer_version.pacticipant_id, existing_model.provider_id, params[:json_content])
         if existing_model.pact_version_id != pact_version.id
-          pact_publication = PactPublication.new(
+          key = {
             consumer_version_id: existing_model.consumer_version_id,
-            consumer_id: existing_model.consumer_id,
             provider_id: existing_model.provider_id,
-            revision_number: (existing_model.revision_number + 1),
-            pact_version: pact_version,
-          ).save
+            revision_number: next_revision_number(existing_model),
+          }
+          new_params = key.merge(
+            consumer_id: existing_model.consumer_id,
+            pact_version_id: pact_version.id,
+            created_at: Sequel.datetime_class.now
+          )
+          PactPublication.upsert(new_params, key.keys)
+          pact_publication = PactPublication.where(key).single_record
           update_latest_pact_publication_ids(pact_publication)
           pact_publication.to_domain
         else
@@ -49,6 +54,11 @@ module PactBroker
         end
       end
 
+      # This logic is a separate method so we can stub it to create a "conflict" scenario
+      def next_revision_number(existing_model)
+        existing_model.revision_number + 1
+      end
+
       def update_latest_pact_publication_ids(pact_publication)
         params = {
           consumer_version_id: pact_publication.consumer_version_id,

data/lib/pact_broker/repositories/helpers.rb

@@ -36,11 +36,12 @@ module PactBroker
         end
       end
 
-      def upsert row, key_names
+      def upsert row, key_names, columns_to_update = nil
         if postgres?
           insert_conflict(update: row, target: key_names).insert(row)
         elsif mysql?
-          on_duplicate_key_update.insert(row)
+          update_cols = columns_to_update || (row.keys - key_names)
+          on_duplicate_key_update(*update_cols).insert(row)
         else
           # Sqlite
           key = row.reject{ |k, v| !key_names.include?(k) }

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

@@ -0,0 +1,14 @@
+%nav.navbase-default{role: "navigation", id: "navigation"}
+  .container-fluid
+    .navbar-header
+    %ul.navbar-right#top-left-menu
+      %li
+        - if tag_toggle
+          %a{href: './?tags=true'}
+            Show latest tags
+        - else
+          %a{href: './'}
+            Hide latest tags
+
+        %a{href: '/hal-browser/browser.html'}
+          API Browser

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

@@ -1,19 +1,8 @@
 %body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   .container
-    %nav.navbase-default{role: "navigation", id: "navigation"}
-      .container-fluid
-        .navbar-header
-        %ul.navbar-right#top-left-menu
-          %li
-            %a{href: './'}
-              Hide latest tags
-            %a{href: '/hal-browser/browser.html'}
-              API Browser
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: false}
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }

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

@@ -1,19 +1,8 @@
 %body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
   %link{rel: 'stylesheet', href: '/stylesheets/index.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
   %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   .container
-    %nav.navbase-default{role: "navigation", id: "navigation"}
-      .container-fluid
-        .navbar-header
-        %ul.navbar-right#top-left-menu
-          %li
-            %a{href: './?tags=true'}
-              Show latest tags
-            %a{href: '/hal-browser/browser.html'}
-              API Browser
+    = render :haml, :'index/_navbar', :layout => false, locals: {tag_toggle: true}
     %h1.page-header
       Pacts
     %table.table.table-bordered.table-striped{ id: 'relationships' }

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

@@ -3,4 +3,7 @@
   %head
     %title= defined?(title) ? title : ""
     %link{rel: 'shortcut icon', href: '/images/favicon.ico', type:'image/x-icon'}
+    %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+    %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
+    %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
   = yield

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.27.6'
+  VERSION = '2.29.0'
 end

data/lib/pact_broker/webhooks/job.rb

@@ -11,6 +11,16 @@ module PactBroker
       include PactBroker::Logging
 
       def perform data
+        data.fetch(:database_connector).call do
+          perform_with_connection(data)
+        end
+      end
+
+      private
+
+      attr_reader :triggered_webhook, :error_count
+
+      def perform_with_connection(data)
         @data = data
         @triggered_webhook = PactBroker::Webhooks::TriggeredWebhook.find(id: data[:triggered_webhook].id)
         @error_count = data[:error_count] || 0
@@ -26,10 +36,6 @@ module PactBroker
         end
       end
 
-      private
-
-      attr_reader :triggered_webhook, :error_count
-
       def execution_options
         {
           success_log_message: "Successfully executed webhook",
@@ -59,7 +65,7 @@ module PactBroker
           reschedule_job
           update_triggered_webhook_status TriggeredWebhook::STATUS_RETRYING
         else
-          logger.error "Failed to execute webhook #{triggered_webhook.webhook_uuid} after #{retry_schedule.size + 1} attempts."
+          logger.info "Failed to execute webhook #{triggered_webhook.webhook_uuid} after #{retry_schedule.size + 1} attempts."
           update_triggered_webhook_status TriggeredWebhook::STATUS_FAILURE
         end
       end

data/lib/pact_broker/webhooks/service.rb

@@ -124,14 +124,22 @@ module PactBroker
           begin
             triggered_webhook = webhook_repository.create_triggered_webhook(trigger_uuid, webhook, pact, verification, RESOURCE_CREATION)
             logger.info "Scheduling job for #{webhook.description} with uuid #{webhook.uuid}"
-            # Bit of a dodgey hack to make sure the request transaction has finished before we execute the webhook
-            Job.perform_in(5, triggered_webhook: triggered_webhook)
+            job_data = {
+              triggered_webhook: triggered_webhook,
+              database_connector: job_database_connector
+            }
+            # Delay slightly to make sure the request transaction has finished before we execute the webhook
+            Job.perform_in(5, job_data)
           rescue StandardError => e
             log_error e
           end
         end
       end
 
+      def self.job_database_connector
+        Thread.current[:pact_broker_thread_data].database_connector
+      end
+
       def self.find_latest_triggered_webhooks_for_pact pact
         webhook_repository.find_latest_triggered_webhooks_for_pact pact
       end

data/lib/pact_broker/webhooks/webhook.rb

@@ -71,6 +71,10 @@ module PactBroker
         end
       end
 
+      def is_for? relationship
+        (consumer_id == relationship.consumer_id || !consumer_id) && (provider_id == relationship.provider_id || !provider_id)
+      end
+
       private
 
       def self.properties_hash_from_domain webhook

data/lib/rack/pact_broker/database_transaction.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/constants'
 require 'sequel'
+require 'ostruct'
 
 module Rack
   module PactBroker
@@ -11,14 +12,22 @@ module Rack
       def initialize app, database_connection
         @app = app
         @database_connection = database_connection
+        @default_database_connector = ->(&block) {
+          database_connection.synchronize do
+            block.call
+          end
+        }
       end
 
       def call env
+        set_database_connector
         if use_transaction? env
           call_with_transaction env
         else
           call_without_transaction env
         end
+      ensure
+        clear_database_connector
       end
 
       def use_transaction? env
@@ -43,6 +52,19 @@ module Rack
       def do_not_rollback? response
         response[1].delete(::PactBroker::DO_NOT_ROLLBACK)
       end
+
+      def set_database_connector
+        Thread.current[:pact_broker_thread_data] ||= OpenStruct.new
+        Thread.current[:pact_broker_thread_data].database_connector ||= @default_database_connector
+      end
+
+      def clear_database_connector
+        if thread_data = Thread.current[:pact_broker_thread_data]
+          if thread_data.database_connector == @default_database_connector
+            thread_data.database_connector = nil
+          end
+        end
+      end
     end
   end
 end

data/pact_broker.gemspec

@@ -3,6 +3,28 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pact_broker/version'
 
+def gem_files
+  if Dir.exist?(".git")
+    `git ls-files`.split($/)
+  else
+    root_path      = File.dirname(__FILE__)
+    all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+    all_files.reject! { |file| [".", ".."].include?(File.basename(file)) || File.directory?(file)}
+    gitignore_path = File.join(root_path, ".gitignore")
+    gitignore      = File.readlines(gitignore_path)
+    gitignore.map!    { |line| line.chomp.strip }
+    gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+    all_files.reject do |file|
+      gitignore.any? do |ignore|
+        file.start_with?(ignore) ||
+          File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+          File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+      end
+    end
+  end
+end
+
 Gem::Specification.new do |gem|
   gem.name          = "pact_broker"
   gem.version       = PactBroker::VERSION
@@ -14,7 +36,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.2.0'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = gem_files
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
@@ -38,6 +60,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'sucker_punch', '~>2.0'
   gem.add_runtime_dependency 'rack-protection', '~>2.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
+  gem.add_runtime_dependency 'dry-logic', '0.4.2' # Later version cases ArgumentError: wrong number of arguments
   gem.add_runtime_dependency 'table_print', '~> 1.5'
   gem.add_runtime_dependency 'semantic_logger', '~> 4.3'
 
@@ -57,4 +80,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bump', '~> 0.5'
   gem.add_development_dependency 'timecop', '~> 0.9'
   gem.add_development_dependency 'sequel-annotate', '~>1.3'
+  gem.add_development_dependency 'faraday', '~>0.15'
 end