pact_broker 2.52.1 → 2.56.0

data/lib/pact_broker/pacts/repository.rb

@@ -107,8 +107,8 @@ module PactBroker
       end
 
       def delete_all_pact_publications_between consumer_name, options
-        consumer = pacticipant_repository.find_by_name(consumer_name)
-        provider = pacticipant_repository.find_by_name(options.fetch(:and))
+        consumer = pacticipant_repository.find_by_name!(consumer_name)
+        provider = pacticipant_repository.find_by_name!(options.fetch(:and))
         query = PactPublication.where(consumer: consumer, provider: provider)
         query = query.tag(options[:tag]) if options[:tag]
 
@@ -202,6 +202,7 @@ module PactBroker
           .all
 
         wip_pacts.collect do | pact|
+
           pending_tag_names = find_provider_tags_for_which_pact_publication_id_is_pending(pact, successfully_verified_head_pact_publication_ids_for_each_provider_tag)
           pre_existing_tag_names = find_provider_tag_names_that_were_first_used_before_pact_published(pact, provider_tag_collection)
 
@@ -356,12 +357,11 @@ module PactBroker
         selected_pacts = selected_pacts + find_pacts_for_fallback_tags(selected_pacts, provider_name, consumer_version_selectors)
 
         selected_pacts
-          .group_by(&:pact_version_sha)
+          .group_by{ |p| [p.consumer_name, p.pact_version_sha] }
           .values
           .collect do | selected_pacts_for_pact_version_id |
             SelectedPact.merge(selected_pacts_for_pact_version_id)
           end
-
       end
 
       private
@@ -562,6 +562,7 @@ module PactBroker
             .join(:verifications, verifications_join)
             .join(:tags, tags_join, { table_alias: :provider_tags } )
             .where(Sequel[:latest_tagged_pact_publications][:provider_id] => provider_id)
+            .distinct
             .all
           hash[provider_tag] = head_pacts
         end

data/lib/pact_broker/tasks/migration_task.rb

@@ -16,8 +16,10 @@ module PactBroker
     class MigrationTask < ::Rake::TaskLib
 
       attr_accessor :database_connection
+      attr_accessor :options
 
       def initialize &block
+        @options = {}
         rake_task &block
       end
 
@@ -27,12 +29,29 @@ module PactBroker
             desc "Run sequel migrations for pact broker database"
             task :migrate, [:target] do | t, args |
               require 'pact_broker/db/migrate'
+              require 'pact_broker/db/version'
+
               instance_eval(&block)
-              options = {}
+
               if args[:target]
                 options[:target] = args[:target].to_i
               end
+
+              if (logger = database_connection.loggers.first)
+                current_version = PactBroker::DB::Version.call(database_connection)
+                if options[:target]
+                  logger.info "Migrating from schema version #{current_version} to #{options[:target]}"
+                else
+                  logger.info "Migrating from schema version #{current_version} to latest"
+                end
+              end
+
               PactBroker::DB::Migrate.call(database_connection, options)
+
+              if logger
+                current_version = PactBroker::DB::Version.call(database_connection)
+                logger.info "Current schema version is now #{current_version}"
+              end
             end
           end
         end

data/lib/pact_broker/test/test_data_builder.rb

@@ -204,6 +204,7 @@ module PactBroker
         params.delete(:comment)
         json_content = params[:json_content] || default_json_content
         pact_version_sha = params[:pact_version_sha] || generate_pact_version_sha(json_content)
+        pact_versions_count_before = PactBroker::Pacts::PactVersion.count
         @pact = PactBroker::Pacts::Repository.new.create(
           version_id: @consumer_version.id,
           consumer_id: @consumer.id,
@@ -211,8 +212,9 @@ module PactBroker
           pact_version_sha: pact_version_sha,
           json_content: prepare_json_content(json_content),
         )
+        pact_versions_count_after = PactBroker::Pacts::PactVersion.count
         set_created_at_if_set(params[:created_at], :pact_publications, id: @pact.id)
-        set_created_at_if_set(params[:created_at], :pact_versions, sha: @pact.pact_version_sha)
+        set_created_at_if_set(params[:created_at], :pact_versions, sha: @pact.pact_version_sha) if pact_versions_count_after > pact_versions_count_before
         set_created_at_if_set(params[:created_at], :latest_pact_publication_ids_for_consumer_versions, consumer_version_id: @consumer_version.id)
         @pact = PactBroker::Pacts::PactPublication.find(id: @pact.id).to_domain
         self
@@ -248,7 +250,7 @@ module PactBroker
         events = event_params.collect{ |e| PactBroker::Webhooks::WebhookEvent.new(e) }
         template_params = { method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'}, username: params[:username], password: params[:password]}
         request = PactBroker::Webhooks::WebhookRequestTemplate.new(template_params.merge(params))
-        @webhook = PactBroker::Webhooks::Repository.new.create uuid, PactBroker::Domain::Webhook.new(request: request, events: events), consumer, provider
+        @webhook = PactBroker::Webhooks::Repository.new.create uuid, PactBroker::Domain::Webhook.new(request: request, events: events, description: params[:description]), consumer, provider
         self
       end
 
@@ -424,7 +426,10 @@ module PactBroker
       def set_created_at_if_set created_at, table_name, selector
         date_to_set = created_at || @now
         if date_to_set
-          Sequel::Model.db[table_name].where(selector.keys.first => selector.values.first).update(created_at: date_to_set)
+          Sequel::Model.db[table_name].where(selector).update(created_at: date_to_set)
+          if Sequel::Model.db.schema(table_name).any?{ |col| col.first == :updated_at }
+            Sequel::Model.db[table_name].where(selector.keys.first => selector.values.first).update(updated_at: date_to_set)
+          end
         end
       end
 

data/lib/pact_broker/ui/app.rb

@@ -47,6 +47,7 @@ module PactBroker
           end
 
           map "/" do
+            use PathInfoFixer
             run PactBroker::UI::Controllers::Index
           end
         }

data/lib/pact_broker/ui/controllers/base_controller.rb

@@ -11,6 +11,9 @@ module PactBroker
         set :show_exceptions, ENV['RACK_ENV'] != 'production'
         set :dump_errors, false # The padrino logger logs these for us. If this is enabled we get duplicate logging.
 
+        def base_url
+          PactBroker.configuration.base_url || ''
+        end
       end
     end
   end

data/lib/pact_broker/ui/controllers/clusters.rb

@@ -18,8 +18,8 @@ module PactBroker
         end
 
         get "/" do
-          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items)
-          haml 'clusters/show', locals: {relationships: view_model}
+          view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url)
+          haml 'clusters/show', locals: {relationships: view_model, base_url: base_url}
         end
 
       end

data/lib/pact_broker/ui/controllers/groups.rb

@@ -13,9 +13,10 @@ module PactBroker
           pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           erb :'groups/show.html', {
               locals: {
-                csv_path: "/groups/#{params[:name]}.csv",
+                csv_path: "#{base_url}/groups/#{params[:name]}.csv",
                 pacticipant_name: params[:name],
-                repository_url: pacticipant&.repository_url
+                repository_url: pacticipant&.repository_url,
+                base_url: base_url
               }
             }, {
               layout: 'layouts/main'

data/lib/pact_broker/ui/controllers/index.rb

@@ -25,7 +25,7 @@ module PactBroker
 
           # TODO remove this code when verified
           options[:optimised] = true unless params[:optimised] == 'false'
-          index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options))
+          index_items = ViewDomain::IndexItems.new(index_service.find_index_items(options), base_url: base_url)
 
           page = tags ? :'index/show-with-tags' : :'index/show'
           locals = {
@@ -34,7 +34,8 @@ module PactBroker
             page_number: page_number,
             page_size: page_size,
             pagination_record_count: index_items.pagination_record_count,
-            current_page_size: index_items.size
+            current_page_size: index_items.size,
+            base_url: base_url
           }
 
           haml page, {locals: locals, layout: :'layouts/main'}

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -3,6 +3,8 @@ require 'pact_broker/ui/view_models/matrix_lines'
 require 'pact_broker/matrix/unresolved_selector'
 require 'pact_broker/matrix/parse_query'
 require 'pact_broker/logging'
+require 'pact_broker/api/pact_broker_urls'
+
 require 'haml'
 
 module PactBroker
@@ -19,7 +21,8 @@ module PactBroker
             lines: [],
             title: "The Matrix",
             selectors: create_selector_objects(selectors),
-            options: create_options_model(options)
+            options: create_options_model(options),
+            base_url: base_url
           }
           begin
             if params[:q]
@@ -30,6 +33,7 @@ module PactBroker
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
                 locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+                locals[:badge_url] = matrix_badge_url(selectors, lines)
               else
                 locals[:errors] = errors
               end
@@ -45,14 +49,16 @@ module PactBroker
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:consumer_name]), PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:provider_name]) ]
           options = {latestby: 'cvpv', limit: 100}
           lines = matrix_service.find(selectors, options)
-          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
+          lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
           locals = {
             lines: lines,
             title: "The Matrix",
             consumer_name: params[:consumer_name],
             provider_name: params[:provider_name],
             selectors: create_selector_objects(selectors),
-            options: create_options_model(options)
+            options: create_options_model(options),
+            badge_url: nil,
+            base_url: base_url
           }
           haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
         end
@@ -76,6 +82,16 @@ module PactBroker
           o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
           o
         end
+
+        def matrix_badge_url(selectors, lines)
+          if lines.any? && selectors.size == 2 && selectors.all?{ | selector| selector.latest_for_pacticipant_and_tag? }
+            consumer_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.consumer_name }
+            provider_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.provider_name }
+            if consumer_selector && provider_selector
+              PactBroker::Api::PactBrokerUrls.matrix_badge_url_for_selectors(consumer_selector, provider_selector, base_url)
+            end
+          end
+        end
       end
     end
   end

data/lib/pact_broker/ui/helpers/url_helper.rb

@@ -7,12 +7,12 @@ module PactBroker
 
         extend self
 
-        def group_url pacticipant_name
-          "/groups/#{ERB::Util.url_encode(pacticipant_name)}"
+        def group_url pacticipant_name, base_url = ''
+          "#{base_url}/groups/#{ERB::Util.url_encode(pacticipant_name)}"
         end
 
-        def matrix_url consumer_name, provider_name
-          "/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
+        def matrix_url consumer_name, provider_name, base_url = ''
+          "#{base_url}/matrix/provider/#{ERB::Util.url_encode(provider_name)}/consumer/#{ERB::Util.url_encode(consumer_name)}"
         end
       end
     end

data/lib/pact_broker/ui/view_models/index_item.rb

@@ -11,8 +11,9 @@ module PactBroker
 
         include PactBroker::Api::PactBrokerUrls
 
-        def initialize relationship
+        def initialize relationship, options = {}
           @relationship = relationship
+          @options = options
         end
 
         def consumer_name
@@ -48,23 +49,23 @@ module PactBroker
         end
 
         def consumer_group_url
-          Helpers::URLHelper.group_url consumer_name
+          Helpers::URLHelper.group_url(consumer_name, base_url)
         end
 
         def provider_group_url
-          Helpers::URLHelper.group_url provider_name
+          Helpers::URLHelper.group_url(provider_name, base_url)
         end
 
         def latest_pact_url
-          "#{pactigration_base_url('', @relationship)}/latest"
+          "#{pactigration_base_url(base_url, @relationship)}/latest"
         end
 
         def pact_url
-          PactBroker::Api::PactBrokerUrls.pact_url('', @relationship)
+          PactBroker::Api::PactBrokerUrls.pact_url(base_url, @relationship)
         end
 
         def pact_matrix_url
-          Helpers::URLHelper.matrix_url consumer_name, provider_name
+          Helpers::URLHelper.matrix_url(consumer_name, provider_name, base_url)
         end
 
         def any_webhooks?
@@ -72,11 +73,11 @@ module PactBroker
         end
 
         def pact_versions_url
-          PactBroker::Api::PactBrokerUrls.pact_versions_url(consumer_name, provider_name)
+          PactBroker::Api::PactBrokerUrls.pact_versions_url(consumer_name, provider_name, base_url)
         end
 
         def integration_url
-          PactBroker::Api::PactBrokerUrls.integration_url(consumer_name, provider_name)
+          PactBroker::Api::PactBrokerUrls.integration_url(consumer_name, provider_name, base_url)
         end
 
         def webhook_label
@@ -114,11 +115,11 @@ module PactBroker
         def webhook_url
           url = case @relationship.webhook_status
             when :none
-              PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider
+              PactBroker::Api::PactBrokerUrls.webhooks_for_consumer_and_provider_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
             else
-              PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider
+              PactBroker::Api::PactBrokerUrls.webhooks_status_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, base_url
           end
-          "/hal-browser/browser.html##{url}"
+          PactBroker::Api::PactBrokerUrls.hal_browser_url(url, base_url)
         end
 
         def last_verified_date
@@ -181,6 +182,10 @@ module PactBroker
             version_number
           end
         end
+
+        def base_url
+          @options[:base_url]
+        end
       end
     end
   end

data/lib/pact_broker/ui/view_models/index_items.rb

@@ -7,9 +7,9 @@ module PactBroker
 
         attr_reader :pagination_record_count
 
-        def initialize index_items
+        def initialize index_items, options = {}
           # Why are we sorting twice!?
-          @index_items = index_items.collect{ |index_item| IndexItem.new(index_item) }.sort
+          @index_items = index_items.collect{ |index_item| IndexItem.new(index_item, options) }.sort
           # until the feature flag is turned on
           @pagination_record_count = index_items.size
           @pagination_record_count = index_items.pagination_record_count if index_items.respond_to?(:pagination_record_count)

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -12,8 +12,9 @@ module PactBroker
         include PactBroker::Api::PactBrokerUrls
         include PactBroker::Messages
 
-        def initialize line
+        def initialize line, options = {}
           @line = line
+          @options = options
           @overwritten = false # true if the pact was revised and this revision is no longer the latest
         end
 
@@ -22,7 +23,7 @@ module PactBroker
         end
 
         def provider_name_url
-          hal_browser_url(pacticipant_url_from_params(pacticipant_name: provider_name))
+          hal_browser_url(pacticipant_url_from_params({ pacticipant_name: provider_name }, base_url), base_url)
         end
 
         def consumer_name
@@ -30,7 +31,7 @@ module PactBroker
         end
 
         def consumer_name_url
-          hal_browser_url(pacticipant_url_from_params(pacticipant_name: consumer_name))
+          hal_browser_url(pacticipant_url_from_params({ pacticipant_name: consumer_name }, base_url), base_url)
         end
 
         def pact_version_sha
@@ -68,7 +69,7 @@ module PactBroker
 
         def consumer_version_number_url
           params = { pacticipant_name: consumer_name, version_number: consumer_version_number }
-          hal_browser_url(version_url_from_params(params))
+          hal_browser_url(version_url_from_params(params, base_url), base_url)
         end
 
         def consumer_version_order
@@ -85,7 +86,7 @@ module PactBroker
 
         def provider_version_number_url
           params = { pacticipant_name: provider_name, version_number: provider_version_number }
-          hal_browser_url(version_url_from_params(params))
+          hal_browser_url(version_url_from_params(params, base_url), base_url)
         end
 
         def provider_version_order
@@ -142,7 +143,7 @@ module PactBroker
         end
 
         def verification_status_url
-          hal_browser_url(verification_url(self))
+          hal_browser_url(verification_url(self, base_url), base_url)
         end
 
         def pact_publication_date
@@ -150,7 +151,7 @@ module PactBroker
         end
 
         def pact_publication_date_url
-          pact_url_from_params('', @line)
+          pact_url(base_url, @line)
         end
 
         def relative_date date
@@ -182,6 +183,10 @@ module PactBroker
             message("messages.matrix.pre_verified")
           end
         end
+
+        def base_url
+          @options[:base_url]
+        end
       end
     end
   end

data/lib/pact_broker/ui/view_models/matrix_lines.rb

@@ -5,9 +5,9 @@ module PactBroker
     module ViewDomain
       class MatrixLines < Array
 
-        def initialize rows
+        def initialize rows, options = {}
           lines = rows.collect do | row |
-            PactBroker::UI::ViewDomain::MatrixLine.new(row)
+            PactBroker::UI::ViewDomain::MatrixLine.new(row, options)
           end
           super(lines.sort)
         end

data/lib/pact_broker/ui/views/groups/show.html.erb

@@ -5,11 +5,11 @@
 <head>
 <meta charset="utf-8">
 <title>Network Graph</title>
-<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon'/>
+<link rel='shortcut icon' href='<%= base_url %>/favicon.ico' type='image/x-icon'/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <meta name="author" content="Duncan Alexander">
-<script type="text/javascript" src="/javascripts/d3.v3.js.pagespeed.ce.dFNRrGTALe.js"></script>
+<script type="text/javascript" src="<%= base_url %>/javascripts/d3.v3.js.pagespeed.ce.dFNRrGTALe.js"></script>
 <style>
 body{
     font-family:"Helvetica Neue",Arial,sans-serif;
@@ -105,7 +105,7 @@ var relationshipPath = function(relationship, nodeLocations, pacticipants) {
 
 var latestPactUrl = function (consumerName, providerName) {
     //TODO send this with the relationship data
-    return '/pacts/provider/' + providerName + '/consumer/' + consumerName + '/latest';
+    return '<%= base_url %>/pacts/provider/' + providerName + '/consumer/' + consumerName + '/latest';
 };
 
 var relationshipData = function(pacticipant, relationships) {