pact_broker 2.76.2 → 2.79.1

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

@@ -112,12 +112,17 @@
             %a{href: line.consumer_name_url}
               = line.consumer_name
           %td.consumer-version{'data-sort-value' => line.consumer_version_order, 'data-consumer-version-id' => line.consumer_version_id}
-            %div.clippable
+            %div.clippable{'data-clippable': line.consumer_version_number}
               %a{href: line.consumer_version_number_url}
                 = line.display_consumer_version_number
               - if line.display_consumer_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
+            - if line.consumer_version_branch
+              .tag-parent{"title": line.consumer_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = line.consumer_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+                %div{"class": branch_class}
+                  = "[" + line.consumer_version_branch + "]"
             - line.latest_consumer_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}
@@ -139,12 +144,17 @@
             %a{href: line.provider_name_url}
               = line.provider_name
           %td.provider-version{'data-sort-value' => line.provider_version_order, 'data-provider-version-id' => line.provider_version_id }
-            %div.clippable
+            %div.clippable{'data-clippable': line.provider_version_number}
               %a{href: line.provider_version_number_url}
                 = line.display_provider_version_number
               - if line.display_provider_version_number
                 %button.clippy.invisible{ title: "Copy to clipboard" }
                   %span.copy-icon
+            - if line.provider_version_branch
+              .tag-parent{"title": line.provider_version_branch_tooltip, "data-toggle": "tooltip", "data-placement": "right"}
+                - branch_class = line.provider_version_latest_for_branch? ? "tag badge badge-dark" : "tag badge badge-secondary"
+                %div{"class": branch_class}
+                  = "[" + line.provider_version_branch + "]"
             - line.latest_provider_version_tags.each do | tag |
               .tag-parent{"title": tag.tooltip, "data-toggle": "tooltip", "data-placement": "right"}
                 %a{href: tag.url}

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -16,12 +16,14 @@ module PactBroker
 end
 
 # Table: latest_verification_id_for_pact_version_and_provider_version
+# Primary Key: (pact_version_id, provider_version_id)
 # Columns:
-#  consumer_id         | integer | NOT NULL
-#  pact_version_id     | integer | NOT NULL
-#  provider_id         | integer | NOT NULL
-#  provider_version_id | integer | NOT NULL
-#  verification_id     | integer | NOT NULL
+#  consumer_id         | integer                     | NOT NULL
+#  pact_version_id     | integer                     | NOT NULL
+#  provider_id         | integer                     | NOT NULL
+#  provider_version_id | integer                     | NOT NULL
+#  verification_id     | integer                     | NOT NULL
+#  created_at          | timestamp without time zone |
 # Indexes:
 #  latest_v_id_for_pv_and_pv_pv_id_pv_id_unq | UNIQUE btree (pact_version_id, provider_version_id)
 #  latest_v_id_for_pv_and_pv_v_id_unq        | UNIQUE btree (verification_id)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.76.2'
+  VERSION = '2.79.1'
 end

data/lib/pact_broker/versions/eager_loaders.rb

@@ -0,0 +1,71 @@
+module PactBroker
+  module Versions
+    module EagerLoaders
+      class LatestVersionForBranch
+        def self.call(eo, **other)
+          initialize_association(eo[:rows])
+          populate_associations(eo[:rows])
+        end
+
+        def self.initialize_association(versions)
+          versions.each{|version| version.associations[:latest_version_for_branch] = nil }
+        end
+
+        def self.populate_associations(versions)
+          group_by_pacticipant_id(versions).each do | pacticipant, versions |
+            populate_associations_by_pacticipant(pacticipant, versions)
+          end
+        end
+
+        def self.group_by_pacticipant_id(versions)
+          versions.to_a.group_by(&:pacticipant_id)
+        end
+
+        def self.populate_associations_by_pacticipant(pacticipant_id, versions)
+          latest_versions_for_branches = latest_versions_for_pacticipant_branches(
+            pacticipant_id,
+            versions.collect(&:branch).uniq.compact,
+            versions.first.class
+          )
+          self.populate_versions_with_branches(versions, latest_versions_for_branches)
+        end
+
+        def self.populate_versions_with_branches(versions, latest_versions_for_branches)
+          versions.select(&:branch).each do | version |
+            version.associations[:latest_version_for_branch] = latest_versions_for_branches[[version.pacticipant_id, version.branch]]
+          end
+        end
+
+        def self.latest_versions_for_pacticipant_branches(pacticipant_id, branches, version_class)
+          version_class.latest_versions_for_pacticipant_branches(pacticipant_id, branches).each_with_object({}) do | row, hash |
+            hash[[row.pacticipant_id, row.branch]] = row
+          end
+        end
+      end
+
+      class LatestVersionForPacticipant
+        def self.call(eo, **other)
+          populate_associations(eo[:rows])
+        end
+
+        def self.populate_associations(versions)
+          group_by_pacticipant(versions).each do | pacticipant, versions |
+            populate_associations_by_pacticipant(pacticipant, versions)
+          end
+        end
+
+        def self.group_by_pacticipant(versions)
+          versions.to_a.group_by(&:pacticipant)
+        end
+
+        def self.populate_associations_by_pacticipant(pacticipant, versions)
+          latest_version = versions.first.class.latest_version_for_pacticipant(pacticipant).single_record
+
+          versions.each do | version |
+            version.associations[:latest_version_for_pacticipant] = latest_version
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/versions/lazy_loaders.rb

@@ -0,0 +1,13 @@
+module PactBroker
+  module Versions
+    module LazyLoaders
+      LATEST_VERSION_FOR_BRANCH = lambda {
+        self.class
+          .where(branch: branch, pacticipant_id: pacticipant_id)
+          .exclude(branch: nil)
+          .order(Sequel.desc(:order))
+          .limit(1)
+      }
+    end
+  end
+end

data/lib/pact_broker/versions/repository.rb

@@ -9,6 +9,7 @@ module PactBroker
 
       include PactBroker::Logging
       include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
         PactBroker::Domain::Version.where(number: number, pacticipant_id: pacticipant_id).single_record
@@ -57,7 +58,26 @@ module PactBroker
           updated_at: Sequel.datetime_class.now
         }
 
-        PactBroker::Domain::Version.new(version_params).insert_ignore
+        PactBroker::Domain::Version.new(version_params).upsert
+      end
+
+      def create_or_overwrite(pacticipant, version_number, open_struct_version)
+        saved_version = PactBroker::Domain::Version.new(
+          number: version_number,
+          pacticipant: pacticipant,
+          build_url: open_struct_version.build_url,
+          branch: open_struct_version.branch
+        ).upsert
+
+        if open_struct_version.tags
+          tag_repository.delete_by_version_id(saved_version.id)
+          open_struct_version.tags.collect do | open_struct_tag |
+            tag_repository.create(version: saved_version, name: open_struct_tag.name)
+          end
+          saved_version.refresh
+        end
+
+        saved_version
       end
 
       def find_by_pacticipant_id_and_number_or_create pacticipant_id, number
@@ -79,7 +99,7 @@ module PactBroker
         version_ids_to_keep = (version_ids_with_pact_publications + version_ids_with_verifications).uniq
 
         PactBroker::Domain::Version
-          .where(pacticipant_id: [consumer.id, provider.id])
+          .where(Sequel[:versions][:pacticipant_id] => [consumer.id, provider.id])
           .exclude(id: (version_ids_with_pact_publications + version_ids_with_verifications).uniq)
           .delete
       end

data/lib/pact_broker/versions/service.rb

@@ -1,7 +1,6 @@
 require 'pact_broker/repositories'
 
 module PactBroker
-
   module Versions
     class Service
 
@@ -19,6 +18,11 @@ module PactBroker
         version_repository.find_by_pacticipant_name_and_latest_tag(pacticipant_name, tag)
       end
 
+      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)
+      end
+
       def self.delete version
         tag_repository.delete_by_version_id version.id
         webhook_repository.delete_triggered_webhooks_by_version_id version.id

data/lib/pact_broker/webhooks/execution.rb

@@ -32,13 +32,14 @@ end
 
 # Table: webhook_executions
 # Columns:
-#  id                   | integer                     | PRIMARY KEY DEFAULT nextval('webhook_executions_id_seq'::regclass)
+#  id                   | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  triggered_webhook_id | integer                     |
 #  success              | boolean                     | NOT NULL
 #  logs                 | text                        |
 #  created_at           | timestamp without time zone | NOT NULL
 # Indexes:
-#  webhook_executions_pkey | PRIMARY KEY btree (id)
+#  webhook_executions_pkey                       | PRIMARY KEY btree (id)
+#  webhook_executions_triggered_webhook_id_index | btree (triggered_webhook_id)
 # Foreign key constraints:
 #  webhook_executions_consumer_id_fkey          | (consumer_id) REFERENCES pacticipants(id)
 #  webhook_executions_pact_publication_id_fkey  | (pact_publication_id) REFERENCES pact_publications(id)

data/lib/pact_broker/webhooks/latest_triggered_webhook.rb

@@ -21,3 +21,5 @@ end
 #  status              | text                        |
 #  created_at          | timestamp without time zone |
 #  updated_at          | timestamp without time zone |
+#  verification_id     | integer                     |
+#  event_name          | text                        |

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -110,7 +110,7 @@ end
 
 # Table: triggered_webhooks
 # Columns:
-#  id                  | integer                     | PRIMARY KEY DEFAULT nextval('triggered_webhooks_id_seq'::regclass)
+#  id                  | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  trigger_uuid        | text                        | NOT NULL
 #  trigger_type        | text                        | NOT NULL
 #  pact_publication_id | integer                     | NOT NULL
@@ -122,10 +122,17 @@ end
 #  created_at          | timestamp without time zone | NOT NULL
 #  updated_at          | timestamp without time zone | NOT NULL
 #  verification_id     | integer                     |
+#  event_name          | text                        |
+#  event_context       | text                        |
 # Indexes:
-#  triggered_webhooks_pkey     | PRIMARY KEY btree (id)
-#  uq_triggered_webhook_ppi_wi | UNIQUE btree (pact_publication_id, webhook_id, trigger_uuid)
-#  uq_triggered_webhook_wi     | UNIQUE btree (webhook_id, trigger_uuid)
+#  triggered_webhooks_pkey                      | PRIMARY KEY btree (id)
+#  uq_triggered_webhook_ppi_wi                  | UNIQUE btree (pact_publication_id, webhook_id, trigger_uuid)
+#  uq_triggered_webhook_wi                      | UNIQUE btree (webhook_id, trigger_uuid)
+#  triggered_webhooks_consumer_id_index         | btree (consumer_id)
+#  triggered_webhooks_pact_publication_id_index | btree (pact_publication_id)
+#  triggered_webhooks_provider_id_index         | btree (provider_id)
+#  triggered_webhooks_verification_id_index     | btree (verification_id)
+#  triggered_webhooks_webhook_id_index          | btree (webhook_id)
 # Foreign key constraints:
 #  triggered_webhooks_consumer_id_fkey         | (consumer_id) REFERENCES pacticipants(id)
 #  triggered_webhooks_pact_publication_id_fkey | (pact_publication_id) REFERENCES pact_publications(id)

data/lib/pact_broker/webhooks/webhook.rb

@@ -94,7 +94,7 @@ end
 
 # Table: webhooks
 # Columns:
-#  id                   | integer                     | PRIMARY KEY DEFAULT nextval('webhooks_id_seq'::regclass)
+#  id                   | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  uuid                 | text                        | NOT NULL
 #  method               | text                        | NOT NULL
 #  url                  | text                        | NOT NULL

data/lib/pact_broker/webhooks/webhook_event.rb

@@ -44,7 +44,7 @@ end
 
 # Table: webhook_events
 # Columns:
-#  id         | integer                     | PRIMARY KEY DEFAULT nextval('webhook_events_id_seq'::regclass)
+#  id         | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
 #  webhook_id | integer                     |
 #  name       | text                        |
 #  created_at | timestamp without time zone | NOT NULL

data/lib/pact_broker/webhooks/webhook_execution_result.rb

@@ -14,7 +14,12 @@ module PactBroker
       end
 
       def success?
-        !response.nil? && response.code.to_i < 300
+        if response
+          # Response HTTP Code must be in success list otherwise it is false
+          PactBroker.configuration.webhook_http_code_success.include? response.code.to_i
+        else
+          false
+        end
       end
     end
   end

data/lib/pact_broker/webhooks/webhook_request_logger.rb

@@ -117,8 +117,14 @@ module PactBroker
       end
 
       def success?(response)
-        !response.nil? && response.code.to_i < 300
+        if response
+          # Response HTTP Code must be in success list otherwise it is false
+          PactBroker.configuration.webhook_http_code_success.include? response.code.to_i
+        else
+          false
+        end
       end
+
     end
   end
 end

data/lib/rack/pact_broker/set_base_url.rb

@@ -1,22 +1,52 @@
 module Rack
   module PactBroker
     class SetBaseUrl
-      def initialize app, base_url
+      X_FORWARDED_PATTERN = /_X_FORWARDED_/.freeze
+
+      def initialize app, base_urls
         @app = app
-        @base_url = base_url
+        @base_urls = base_urls
       end
 
-      def call env
+      def call(env)
         if env["pactbroker.base_url"]
           app.call(env)
         else
-          app.call(env.merge("pactbroker.base_url" => base_url))
+          app.call(env.merge("pactbroker.base_url" => select_matching_base_url(env)))
         end
       end
 
       private
 
-      attr_reader :app, :base_url
+      attr_reader :app, :base_urls
+
+      def select_matching_base_url(env)
+        if base_urls.size > 1
+          return matching_base_url_considering_x_forwarded_headers(env) ||
+            matching_base_url_not_considering_x_forwarded_headers(env) ||
+            default_base_url
+        end
+        default_base_url
+      end
+
+      def default_base_url
+        base_urls.first
+      end
+
+      def matching_base_url_considering_x_forwarded_headers(env)
+        matching_base_url(env)
+      end
+
+      def matching_base_url_not_considering_x_forwarded_headers(env)
+        matching_base_url(env.reject{ |k, _| k =~ X_FORWARDED_PATTERN} )
+      end
+
+      def matching_base_url(env)
+        request_base_url = Rack::Request.new(env).base_url
+        if base_urls.include?(request_base_url)
+          request_base_url
+        end
+      end
     end
   end
 end

data/lib/sequel/plugins/upsert.rb

@@ -5,11 +5,12 @@ module Sequel
       def self.configure(model, opts=OPTS)
         model.instance_exec do
           @upsert_plugin_identifying_columns = opts.fetch(:identifying_columns)
+          @upsert_plugin_ignore_columns_on_update = opts[:ignore_columns_on_update]
         end
       end
 
       module ClassMethods
-        attr_reader :upsert_plugin_identifying_columns
+        attr_reader :upsert_plugin_identifying_columns, :upsert_plugin_ignore_columns_on_update
       end
 
       module InstanceMethods
@@ -67,7 +68,8 @@ module Sequel
           query = values.select{ |k, _| self.class.upsert_plugin_identifying_columns.include?(k) }
           existing_record = model.where(query).single_record
           if existing_record
-            existing_record.update(values)
+            existing_record.set(values_to_update)
+            existing_record.save(opts)
           else
             save(opts)
           end
@@ -78,9 +80,9 @@ module Sequel
         def _insert_dataset
           if upsert_plugin_upserting
             if postgres?
-              super.insert_conflict(update: values, target: self.class.upsert_plugin_identifying_columns)
+              super.insert_conflict(update: values_to_update, target: self.class.upsert_plugin_identifying_columns)
             elsif mysql?
-              columns_to_update = values.keys - self.class.upsert_plugin_identifying_columns
+              columns_to_update = values_to_update.keys - self.class.upsert_plugin_identifying_columns
               super.on_duplicate_key_update(*columns_to_update)
             else
               super
@@ -97,6 +99,18 @@ module Sequel
         def postgres?
           model.db.adapter_scheme.to_s == "postgres"
         end
+
+        def values_to_update
+          columns_with_nil_values.merge(values).reject{ |k, _| columns_to_not_update_when_exists.include?(k) }
+        end
+
+        def columns_with_nil_values
+          self.class.columns.each_with_object({}) {|key, hash| hash[key] = nil }
+        end
+
+        def columns_to_not_update_when_exists
+          @columns_to_not_update ||=  self.class.upsert_plugin_ignore_columns_on_update || (self.class.upsert_plugin_identifying_columns + [:created_at, self.class.primary_key]).flatten
+        end
       end
     end
   end

data/pact_broker.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httparty', '~> 0.14'
   gem.add_runtime_dependency 'json', '~> 2.3'
   gem.add_runtime_dependency 'roar', '~> 1.1'
-  gem.add_runtime_dependency 'reform', '~> 2.3','>= 2.3.1'
+  gem.add_runtime_dependency 'reform', '~> 2.3.3'
   gem.add_runtime_dependency 'dry-validation', '~> 0.10.5'
   gem.add_runtime_dependency 'sequel', '~> 5.28'
   gem.add_runtime_dependency 'webmachine', '1.5.0'