pact_broker 2.84.0 → 2.85.0

data/lib/pact_broker/domain/webhook_request.rb

@@ -18,7 +18,7 @@ module PactBroker
 
       HEADERS_TO_REDACT = [/authorization/i, /token/i]
 
-      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid
+      attr_accessor :method, :url, :headers, :body, :username, :password, :uuid, :user_agent
 
       # Reform gets confused by the :method method, as :method is a standard
       # Ruby method.
@@ -58,7 +58,7 @@ module PactBroker
         @http_request ||= begin
           req = Net::HTTP.const_get(method.capitalize).new(uri.request_uri)
           req.delete("accept-encoding")
-          req["user-agent"] = PactBroker.configuration.user_agent
+          req["user-agent"] = user_agent
           headers.each_pair { | name, value | req[name] = value }
           req.basic_auth(username, password) if username && username.size > 0
           req.body = body unless body.nil?

data/lib/pact_broker/index/service.rb

@@ -30,6 +30,32 @@ module PactBroker
         find_index_items(page_number: 1, page_size: 100000000000)
       end
 
+      def self.smart_default_view(consumer_name, provider_name)
+        consumer = pacticipant_repository.find_by_name(consumer_name)
+        provider = pacticipant_repository.find_by_name(provider_name)
+        if consumer && provider
+          pact_publications_with_branches = PactBroker::Pacts::PactPublication
+                                            .for_consumer_name(consumer_name)
+                                            .for_provider_name(provider_name)
+                                            .join_consumer_branch_versions
+
+          pact_publication_with_tags =   PactBroker::Pacts::PactPublication
+            .for_consumer_name(consumer_name)
+            .for_provider_name(provider_name)
+            .join_consumer_version_tags
+
+          if pact_publications_with_branches.any?
+            "branch"
+          elsif pact_publication_with_tags.any?
+            "tag"
+          else
+            "all"
+          end
+        else
+          nil
+        end
+      end
+
       # rubocop: disable Metrics/CyclomaticComplexity
       # rubocop: disable Metrics/MethodLength
       def self.find_index_items options = {}
@@ -53,7 +79,7 @@ module PactBroker
         index_items = pact_publications.all.collect do | pact_publication |
           is_overall_latest_for_integration = latest_pp_ids.include?(pact_publication.id)
 
-          latest_verification = latest_verification_for_pseudo_branch(pact_publication, is_overall_latest_for_integration, latest_verifications_for_cv_tags, options[:tags])
+          latest_verification = latest_verification_for_pseudo_branch(pact_publication, is_overall_latest_for_integration, latest_verifications_for_cv_tags, options[:tags], options)
           webhook = webhooks.find{ |wh| wh.is_for?(pact_publication.integration) }
 
           PactBroker::Domain::IndexItem.create(
@@ -77,10 +103,13 @@ module PactBroker
       # rubocop: enable Metrics/CyclomaticComplexity
 
       # Worst. Code. Ever.
-      #
+      # This needs a big rethink.
+      # TODO environments view
       # rubocop: disable Metrics/CyclomaticComplexity
-      def self.latest_verification_for_pseudo_branch(pact_publication, is_overall_latest, latest_verifications_for_cv_tags, tags_option)
-        if tags_option == true
+      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
+        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) }
             .sort{ |v1, v2| v1.id <=> v2.id }.last || (is_overall_latest && pact_publication.integration.latest_verification)
@@ -157,25 +186,27 @@ module PactBroker
           return base.paginate(options[:page_number] || DEFAULT_PAGE_NUMBER, options[:page_size] || DEFAULT_PAGE_SIZE) if pacticipant_ids.blank?
         end
 
-        ids_query = query_pact_publication_ids_by_tags(base, options[:tags])
-        query = PactBroker::Pacts::PactPublication
-                  .select_all_qualified
-                  .where(Sequel[:pact_publications][:id] => ids_query)
-                  .join_consumers(:consumers)
-                  .join_providers(:providers)
-                  .join(:versions,
-                        { Sequel[:pact_publications][:consumer_version_id] => Sequel[:cv][:id] },
-                        { table_alias: :cv }
-                       )
+        ids_query = if options[:view]
+                      pact_publications_by_view(base, options)
+                    else
+                      query_pact_publication_ids_by_tags(base, options[:tags])
+                    end
 
-        order_columns = [
-          Sequel.asc(Sequel.function(:lower, Sequel[:consumers][:name])),
-          Sequel.desc(Sequel[:cv][:order]),
-          Sequel.asc(Sequel.function(:lower, Sequel[:providers][:name]))
-        ]
+        select_columns_and_order(ids_query, options)
+      end
 
-        query.order(*order_columns)
-          .paginate(options[:page_number] || DEFAULT_PAGE_NUMBER, options[:page_size] || DEFAULT_PAGE_SIZE)
+      def self.pact_publications_by_view(query, options)
+        case options[:view]
+        when "branch" then query.latest_by_consumer_branch
+        when "tag" then query.latest_by_consumer_tag
+        when "environment" then query.in_environments
+        else
+          query
+            .overall_latest
+            .union(query.latest_by_consumer_branch)
+            .union(query.latest_by_consumer_tag)
+            .union(query.in_environments)
+        end
       end
 
       # eager loading the tag stuff doesn't seem to make it quicker
@@ -223,7 +254,27 @@ module PactBroker
         pacticipant_repository.search_by_name(pacticipant_name).collect(&:id)
       end
 
-      private_class_method :base_query, :query_pact_publication_ids_by_tags, :pact_pacticipant_ids_by_name
+      def self.select_columns_and_order(ids_query, options)
+        query = PactBroker::Pacts::PactPublication
+                  .select_all_qualified
+                  .where(Sequel[:pact_publications][:id] => ids_query)
+                  .join_consumers(:consumers)
+                  .join_providers(:providers)
+
+
+        order_columns = [
+          Sequel.asc(Sequel.function(:lower, Sequel[:consumers][:name])),
+          Sequel.desc(Sequel[:pact_publications][:consumer_version_order]),
+          Sequel.asc(Sequel.function(:lower, Sequel[:providers][:name]))
+        ]
+
+        pact_number = options[:page_number] || DEFAULT_PAGE_NUMBER
+        page_size = options[:page_size] || DEFAULT_PAGE_SIZE
+
+        query.order(*order_columns).paginate(pact_number, page_size)
+      end
+
+      private_class_method :base_query, :query_pact_publication_ids_by_tags, :pact_pacticipant_ids_by_name, :select_columns_and_order
     end
   end
 end

data/lib/pact_broker/locale/en.yml

@@ -19,6 +19,8 @@ en:
       response_body_hidden: For security purposes, the response details are not logged. To enable response logging, configure the webhook_host_whitelist property. See %{base_url}/doc/webhooks#whitelist for more information.
       index:
         title: Pacts
+      dashboard:
+        title: "%{consumer_name} / %{provider_name}"
       matrix:
         pre_verified: This pact was "pre-verified" as it has identical content to a previously verified pact.
       webhooks:

data/lib/pact_broker/pacts/metadata.rb

@@ -8,6 +8,7 @@ module PactBroker
         [:consumer_version_number, "cvn"], # for old urls
         [:consumer_version_id, "cv"],
         [:wip, "w"],
+        [:pending, "p"],
         [:consumer_version_selectors, "s"],
         [:tag, "t"],
         [:branch, "b"],
@@ -62,8 +63,9 @@ module PactBroker
                 "l" => selector.latest,
                 "cv" => selector.consumer_version.id
               }.compact
-            end
-          }
+            end,
+            "p" => verifiable_pact.pending?
+          }.compact
         end
       end
 

data/lib/pact_broker/pacts/pact_publication.rb

@@ -27,6 +27,43 @@ module PactBroker
       # TODO rename to consumer_version_tags
       associate(:one_to_many, :tags, :class => "PactBroker::Domain::Tag", :key => :version_id, :primary_key => :consumer_version_id)
 
+      many_to_one(:latest_verification_for_consumer_branches,
+        class: "PactBroker::Domain::Verification",
+        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)
+        },
+        eager_loader: proc do | _ |
+          raise NotImplementedError
+        end
+      )
+
+
       one_to_many(:head_pact_publications_for_tags,
         class: PactPublication,
         read_only: true,

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -216,6 +216,27 @@ module PactBroker
         end
       end
 
+      def in_environments
+        currently_deployed_join = {
+          Sequel[:pact_publications][:consumer_version_id] => Sequel[:currently_deployed_version_ids][:version_id]
+        }
+
+        released_join = {
+          Sequel[:pact_publications][:consumer_version_id] => Sequel[:released_versions][:version_id],
+          Sequel[:released_versions][:support_ended_at] => nil
+        }
+
+        base_query = self
+        if no_columns_selected?
+          base_query = base_query.select_all_qualified
+        end
+
+        deployed = base_query.join(:currently_deployed_version_ids, currently_deployed_join)
+        released = base_query.join(:released_versions, released_join)
+
+        deployed.union(released)
+      end
+
       def verified_before_date(date)
         where { Sequel[:verifications][:execution_date] < date }
       end
@@ -251,6 +272,10 @@ module PactBroker
         join(:tags, { Sequel[table_alias][:version_id] => Sequel[:pact_publications][:consumer_version_id]}, { table_alias: table_alias })
       end
 
+      def join_consumer_branch_versions
+        join(:branch_versions, { Sequel[:pact_publications][:consumer_version_id] => Sequel[:branch_versions][:version_id] })
+      end
+
       def join_consumer_version_tags_with_names(consumer_version_tag_names)
         join(:tags, {
           Sequel[:ct][:version_id] => Sequel[:pact_publications][:consumer_version_id],
@@ -292,6 +317,20 @@ module PactBroker
         join(:tags, {version_id: :consumer_version_id}).where(filter)
       end
 
+      def for_branch_name branch_name
+        branch_versions_join = {
+          Sequel[:branch_versions][:version_id] => Sequel[:pact_publications][:consumer_version_id],
+          Sequel[:branch_versions][:branch_name] => branch_name
+        }
+
+        base_query = self
+        if no_columns_selected?
+          base_query = base_query.select_all_qualified.select_append(Sequel[:branch_versions][:branch_name].as(:branch_name))
+        end
+
+        base_query.join(:branch_versions, branch_versions_join)
+      end
+
       def provider_name_like(name)
         where(name_like(Sequel[:providers][:name], name))
       end

data/lib/pact_broker/pacts/repository.rb

@@ -130,8 +130,9 @@ module PactBroker
         provider = pacticipant_repository.find_by_name!(options.fetch(:and))
         query = scope_for(PactPublication).where(consumer: consumer, provider: provider)
         query = query.tag(options[:tag]) if options[:tag]
+        query = query.for_branch_name(options[:branch_name]) if options[:branch_name]
 
-        ids = query.select_for_subquery(:id)
+        ids = query.select_for_subquery(Sequel.qualify(:pact_publications, :id).as(:id))
         webhook_repository.delete_triggered_webhooks_by_pact_publication_ids(ids)
         unscoped(PactPublication).where(id: ids).delete
       end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -145,7 +145,7 @@ module PactBroker
         self
       end
 
-      def get_pacts_for_verification(provider: last_provider_name, provider_version_tag: nil, provider_version_branch: nil, consumer_version_selectors: nil, enable_pending: false, include_wip_pacts_since: nil)
+      def get_pacts_for_verification(provider: last_provider_name, provider_version_tag: nil, provider_version_branch: nil, consumer_version_selectors: nil, enable_pending: nil, include_wip_pacts_since: nil)
         @last_provider_name = provider
         @last_provider_version_tag = provider_version_tag
         @last_provder_version_branch = provider_version_branch

data/lib/pact_broker/test/test_data_builder.rb

@@ -234,6 +234,10 @@ module PactBroker
         self
       end
 
+      def create_pact_with_different_content params = {}
+        create_pact(params.merge(json_content: random_json_content(consumer.name, provider.name)))
+      end
+
       def republish_same_pact params = {}
         params.delete(:comment)
         last_pact_version = PactBroker::Pacts::PactVersion.order(:id).last
@@ -336,7 +340,7 @@ module PactBroker
       def create_webhook_execution params = {}
         params.delete(:comment)
         logs = params[:logs] || "logs"
-        webhook_execution_result = PactBroker::Webhooks::WebhookExecutionResult.new(nil, OpenStruct.new(code: "200"), logs, nil)
+        webhook_execution_result = PactBroker::Webhooks::WebhookExecutionResult.new(nil, OpenStruct.new(code: "200"), true, logs, nil)
         @webhook_execution = PactBroker::Webhooks::Repository.new.create_execution @triggered_webhook, webhook_execution_result
         created_at = params[:created_at] || @pact.created_at + Rational(1, 86400)
         set_created_at_if_set created_at, :webhook_executions, {id: @webhook_execution.id}

data/lib/pact_broker/ui/app.rb

@@ -4,6 +4,7 @@ require "pact_broker/ui/controllers/pacts"
 require "pact_broker/ui/controllers/matrix"
 require "pact_broker/ui/controllers/can_i_deploy"
 require "pact_broker/ui/controllers/error_test"
+require "pact_broker/ui/controllers/dashboard"
 require "pact_broker/doc/controllers/app"
 
 module PactBroker
@@ -30,7 +31,7 @@ module PactBroker
             run PactBroker::UI::Controllers::Index
           end
 
-          map "/groups" do
+          map "/pacticipants" do
             run PactBroker::UI::Controllers::Groups
           end
 
@@ -58,6 +59,11 @@ module PactBroker
             run PactBroker::UI::Controllers::ErrorTest
           end
 
+          map "/dashboard" do
+            use PathInfoFixer
+            run PactBroker::UI::Controllers::Dashboard
+          end
+
           map "/" do
             use PathInfoFixer
             run PactBroker::UI::Controllers::Index

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

@@ -0,0 +1,80 @@
+require "pact_broker/ui/controllers/base_controller"
+require "pact_broker/ui/view_models/index_items"
+require "haml"
+
+module PactBroker
+  module UI
+    module Controllers
+      class Dashboard < Base
+        include PactBroker::Services
+
+        get "/provider/:provider_name/consumer/:consumer_name" do
+          set_headers
+          consumer_name = params[:consumer_name]
+          provider_name = params[:provider_name]
+          view = params[:view] || index_service.smart_default_view(consumer_name, provider_name) || "branch"
+          tags = view == "tag" || view == "all"
+          page_number = params[:page]&.to_i || 1
+          # Make page size smaller for data intensive query
+          page_size = params[:pageSize]&.to_i || 30
+          options = {
+            tags: tags,
+            page_number: page_number,
+            page_size: page_size,
+            consumer_name: params[:consumer_name],
+            provider_name: params[:provider_name],
+            view: view
+          }.compact
+          error_messages = []
+
+          consumer = pacticipant_service.find_pacticipant_by_name(params[:consumer_name])
+          provider = pacticipant_service.find_pacticipant_by_name(params[:provider_name])
+
+          if !consumer
+            error_messages << "No pacticipant found with name #{consumer_name}"
+          end
+
+          if !provider
+            error_messages << "No pacticipant found with name #{provider_name}"
+          end
+
+          index_items = if consumer && provider
+                          index_service.find_index_items(options)
+                        else
+                          []
+                        end
+
+          view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url, view: view)
+
+          page = :'dashboard/show'
+          locals = {
+            title: PactBroker::Messages.message("messages.dashboard.title", consumer_name: params[:consumer_name], provider_name: params[:provider_name]),
+            index_items: view_index_items,
+            page_number: page_number,
+            page_size: page_size,
+            pagination_record_count: view_index_items.pagination_record_count,
+            current_page_size: view_index_items.size,
+            base_url: base_url,
+            errors: error_messages,
+            tags: tags,
+            view: view,
+            consumer_name: params[:consumer_name],
+            provider_name: params[:provider_name],
+            consumer: consumer,
+            provider: provider
+          }
+
+          haml page, { locals: locals, layout: :'layouts/main', escape_html: true }
+        end
+
+        private
+
+        def set_headers
+          response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
+          response.headers["Pragma"] = "no-cache"
+          response.headers["Expires"] = "0"
+        end
+      end
+    end
+  end
+end

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

@@ -2,27 +2,42 @@ require "pact_broker/ui/controllers/base_controller"
 require "pact_broker/ui/view_models/index_items"
 require "haml"
 
+# TODO handle 404 gracefully
+
 module PactBroker
   module UI
     module Controllers
       class Groups < Base
-
         include PactBroker::Services
 
         get ":name" do
-          pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
           erb :'groups/show.html', {
-              locals: {
-                csv_path: "#{base_url}/groups/#{ERB::Util.url_encode(params[:name])}.csv",
-                pacticipant_name: params[:name],
-                repository_url: pacticipant&.repository_url,
-                base_url: base_url
-              }
+              locals: locals(tab: "details")
             }, {
               layout: "layouts/main",
             }
         end
 
+        get ":name/network" do
+          erb :'groups/show.html', {
+              locals: locals(tab: "network")
+            }, {
+              layout: "layouts/main",
+            }
+        end
+
+        def locals(overrides)
+          pacticipant = pacticipant_service.find_pacticipant_by_name(params[:name])
+          {
+            csv_path: "#{base_url}/groups/#{ERB::Util.url_encode(params[:name])}.csv",
+            pacticipant_name: params[:name],
+            repository_url: pacticipant&.repository_url,
+            base_url: base_url,
+            pacticipant: pacticipant,
+            details_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}",
+            network_url: "#{base_url}/pacticipants/#{ERB::Util.url_encode(params[:name])}/network"
+          }.merge(overrides)
+        end
       end
     end
   end