pact_broker 2.89.1 → 2.93.0

data/lib/pact_broker/pacts/pact_publication_wip_dataset_module.rb

@@ -32,16 +32,23 @@ module PactBroker
         end
       end
 
-      def successfully_verified_by_provider_tag_when_not_wip(provider_id, provider_tag)
+      def successfully_verified_by_provider_tag_when_not_wip(provider_tag)
+        pact_version_provider_tag_verifications_join = {
+          Sequel[:sv][:pact_version_id] => Sequel[:pp][:pact_version_id],
+          Sequel[:sv][:provider_version_tag_name] => provider_tag,
+          Sequel[:sv][:wip] => false
+        }
+
         from_self(alias: :pp)
           .select(Sequel[:pp].*)
-          .where(Sequel[:pp][:provider_id] => provider_id)
-          .join_successful_non_wip_verifications_for_provider_id(provider_id)
-          .join_provider_version_tags_for_tag(provider_tag)
+          .join(:pact_version_provider_tag_successful_verifications, pact_version_provider_tag_verifications_join, { table_alias: :sv })
           .distinct
+
       end
 
       def successfully_verified_by_provider_another_tag_before_this_tag_first_created(provider_id, provider_tag)
+        return new_successfully_verified_by_provider_another_tag_before_this_tag_first_created(provider_id, provider_tag) if PactBroker.feature_enabled?(:new_wip_calculation)
+
         first_tag_with_name = PactBroker::Domain::Tag.where(pacticipant_id: provider_id, name: provider_tag).order(:created_at).first
         from_self(alias: :pp)
           .select(Sequel[:pp].*)
@@ -54,6 +61,32 @@ module PactBroker
           .distinct
       end
 
+      def new_successfully_verified_by_provider_another_tag_before_this_tag_first_created(provider_id, provider_tag)
+        first_tag_with_name = PactBroker::Domain::Tag.where(pacticipant_id: provider_id, name: provider_tag).order(:created_at).first
+
+        pact_version_provider_tag_verifications_join = {
+          Sequel[:sv][:pact_version_id] => Sequel[:pp][:pact_version_id],
+          Sequel[:sv][:wip] => false
+        }
+
+        created_at_criteria = if first_tag_with_name
+                                Sequel.lit("sv.execution_date < ?", first_tag_with_name.created_at)
+                              else
+                                Sequel.lit("1 = 1")
+                              end
+
+        from_self(alias: :pp)
+          .select(Sequel[:pp].*)
+          .where(Sequel[:pp][:provider_id] => provider_id)
+          .join(:pact_version_provider_tag_successful_verifications, pact_version_provider_tag_verifications_join, { table_alias: :sv }) do
+            Sequel.&(
+              Sequel.lit("sv.provider_version_tag_name NOT IN (?)", provider_tag),
+              created_at_criteria
+            )
+          end
+          .distinct
+      end
+
       protected
 
       def verified_before_date(date)

data/lib/pact_broker/pacts/pacts_for_verification_repository.rb

@@ -111,7 +111,7 @@ module PactBroker
       end
 
       def create_selected_pact(pact_publication, selector)
-        resolved_selector = if selector.currently_deployed? || selector.currently_supported?
+        resolved_selector = if selector.currently_deployed? || selector.currently_supported? || selector.in_environment?
                               environment = environment_service.find_by_name(pact_publication.values.fetch(:environment_name))
                               selector.resolve_for_environment(pact_publication.consumer_version, environment, pact_publication.values[:target])
                             else
@@ -270,7 +270,7 @@ module PactBroker
 
       def remove_non_wip_for_tag(pact_publications_query, provider, tag, specified_pact_version_shas)
         specified_explicitly = pact_publications_query.for_pact_version_sha(specified_pact_version_shas)
-        verified_by_this_tag = pact_publications_query.successfully_verified_by_provider_tag_when_not_wip(provider.id, tag)
+        verified_by_this_tag = pact_publications_query.successfully_verified_by_provider_tag_when_not_wip(tag)
         verified_by_another_tag = pact_publications_query.successfully_verified_by_provider_another_tag_before_this_tag_first_created(provider.id, tag)
 
         log_debug_for_wip do

data/lib/pact_broker/pacts/repository.rb

@@ -37,6 +37,7 @@ module PactBroker
       end
 
       def create params
+        integration_repository.create_for_pact(params.fetch(:consumer_id), params.fetch(:provider_id))
         pact_version = find_or_create_pact_version(
           params.fetch(:consumer_id),
           params.fetch(:provider_id),

data/lib/pact_broker/repositories.rb

@@ -47,6 +47,11 @@ module PactBroker
       PactBroker::Versions::BranchVersionRepository.new
     end
 
+    def integration_repository
+      require "pact_broker/integrations/repository"
+      PactBroker::Integrations::Repository.new
+    end
+
     extend self
   end
 end

data/lib/pact_broker/tasks/clean_task.rb

@@ -43,6 +43,7 @@ module PactBroker
               if keep_version_selectors.nil? || keep_version_selectors.empty?
                 raise PactBroker::Error.new("You must specify which versions to keep")
               else
+                add_defaults_to_keep_selectors
                 output "#{prefix}Deleting oldest #{version_deletion_limit} versions, keeping versions that match the configured selectors", keep_version_selectors
               end
 
@@ -64,6 +65,16 @@ module PactBroker
       def output string, payload = {}
         logger ? logger.info(string, payload: payload) : puts("#{string} #{payload.to_json}")
       end
+
+      def add_defaults_to_keep_selectors
+        if keep_version_selectors.none?(&:currently_deployed?)
+          keep_version_selectors << PactBroker::DB::Clean::Selector.new(deployed: true)
+        end
+
+        if keep_version_selectors.none?(&:currently_supported?)
+          keep_version_selectors <<  PactBroker::DB::Clean::Selector.new(released: true)
+        end
+      end
     end
   end
 end

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -273,6 +273,7 @@ module PactBroker
               "eventName" => "${pactbroker.eventName}",
               "consumerVersionNumber" => "${pactbroker.consumerVersionNumber}",
               "consumerVersionTags" => "${pactbroker.consumerVersionTags}",
+              "consumerVersionBranch" => "${pactbroker.consumerVersionBranch}",
               "githubVerificationStatus" => "${pactbroker.githubVerificationStatus}",
               "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
               "providerVersionTags" => "${pactbroker.providerVersionTags}",

data/lib/pact_broker/test/test_data_builder.rb

@@ -30,6 +30,9 @@ require "pact_broker/deployments/environment_service"
 require "pact_broker/deployments/deployed_version_service"
 require "pact_broker/deployments/released_version_service"
 require "pact_broker/versions/branch_version_repository"
+require "pact_broker/integrations/repository"
+require "pact_broker/contracts/service"
+
 require "ostruct"
 
 module PactBroker
@@ -157,6 +160,11 @@ module PactBroker
         self
       end
 
+      def create_integration
+        PactBroker::Integrations::Repository.new.create_for_pact(consumer.id, provider.id)
+        self
+      end
+
       def use_provider provider_name
         @provider = PactBroker::Domain::Pacticipant.find(:name => provider_name)
         self
@@ -213,6 +221,27 @@ module PactBroker
         self
       end
 
+      def publish_pact(consumer_name:, provider_name:, consumer_version_number: , tags: nil, branch: nil, build_url: nil, json_content: nil)
+        json_content = json_content || random_json_content(consumer_name, provider_name)
+        contracts = [
+          PactBroker::Contracts::ContractToPublish.from_hash(consumer_name: consumer_name, provider_name: provider_name, decoded_content: json_content, content_type: "application/json", specification: "pact")
+        ]
+        contracts_to_publish = PactBroker::Contracts::ContractsToPublish.from_hash(
+          pacticipant_name: consumer_name,
+          pacticipant_version_number: consumer_version_number,
+          tags: tags,
+          branch: branch,
+          build_url: build_url,
+          contracts: contracts
+        )
+        PactBroker::Contracts::Service.publish(contracts_to_publish, base_url: "http://example.org")
+        @consumer = find_pacticipant(consumer_name)
+        @consumer_version = find_version(consumer_name, consumer_version_number)
+        @provider = find_pacticipant(provider_name)
+        @pact = PactBroker::Pacts::PactPublication.last.to_domain
+        self
+      end
+
       def create_pact params = {}
         params.delete(:comment)
         json_content = params[:json_content] || default_json_content
@@ -357,6 +386,7 @@ module PactBroker
       end
 
       def create_verification parameters = {}
+        # This should use the verification service. what a mess
         parameters.delete(:comment)
         branch = parameters.delete(:branch)
         tag_names = [parameters.delete(:tag_names), parameters.delete(:tag_name)].flatten.compact
@@ -367,20 +397,23 @@ module PactBroker
         parameters.delete(:provider_version)
         verification = PactBroker::Domain::Verification.new(parameters)
         pact_version = PactBroker::Pacts::Repository.new.find_pact_version(@consumer, @provider, pact.pact_version_sha)
-        @verification = PactBroker::Verifications::Repository.new.create(verification, provider_version_number, pact_version)
-        @provider_version = PactBroker::Domain::Version.where(pacticipant_id: @provider.id, number: provider_version_number).single_record
+        @provider_version = version_repository.find_by_pacticipant_id_and_number_or_create(provider.id, provider_version_number)
         PactBroker::Versions::BranchVersionRepository.new.add_branch(@provider_version, branch) if branch
 
-        set_created_at_if_set(parameters[:created_at], :verifications, id: @verification.id)
-        set_created_at_if_set(parameters[:created_at], :versions, id: @provider_version.id)
-        set_created_at_if_set(parameters[:created_at], :latest_verification_id_for_pact_version_and_provider_version, pact_version_id: pact_version_id, provider_version_id: @provider_version.id)
-
         if tag_names.any?
           tag_names.each do | tag_name |
-            PactBroker::Domain::Tag.new(name: tag_name, version: @provider_version).insert_ignore
+            PactBroker::Domain::Tag.new(name: tag_name, version: @provider_version, version_order: @provider_version.order).insert_ignore
             set_created_at_if_set(parameters[:created_at], :tags, version_id: @provider_version.id, name: tag_name)
           end
         end
+
+        @verification = PactBroker::Verifications::Repository.new.create(verification, provider_version_number, pact_version)
+
+        set_created_at_if_set(parameters[:created_at], :verifications, id: @verification.id)
+        set_created_at_if_set(parameters[:created_at], :versions, id: @provider_version.id)
+        set_created_at_if_set(parameters[:created_at], :latest_verification_id_for_pact_version_and_provider_version, pact_version_id: pact_version_id, provider_version_id: @provider_version.id)
+        set_created_at_if_set(parameters[:created_at], :pact_version_provider_tag_successful_verifications, { verification_id: @verification.id }, :execution_date)
+
         self
       end
 
@@ -588,10 +621,10 @@ module PactBroker
         PactBroker::Pacts::Content.from_json(json_content).with_ids(false).to_json
       end
 
-      def set_created_at_if_set created_at, table_name, selector
+      def set_created_at_if_set created_at, table_name, selector, date_column_name = :created_at
         date_to_set = created_at || @now
         if date_to_set
-          Sequel::Model.db[table_name].where(selector).update(created_at: date_to_set)
+          Sequel::Model.db[table_name].where(selector).update(date_column_name => 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

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

@@ -9,3 +9,4 @@
 %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}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/set-css-asset-base-url.js?v=#{PactBroker::VERSION}"}

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

@@ -8,4 +8,8 @@
     %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}"}
+
+    :javascript
+      const BASE_URL = '#{base_url}';
+
   != yield

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

@@ -9,6 +9,7 @@
   %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}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/set-css-asset-base-url.js?v=#{PactBroker::VERSION}"}
 
   .container
     %nav{'aria-label': 'breadcrumb'}

data/lib/pact_broker/verifications/pact_version_provider_tag_successful_verification.rb

@@ -0,0 +1,11 @@
+require "pact_broker/domain/verification"
+
+# Represents a non WIP, successful verification for a provider version with a tag.
+
+module PactBroker
+  module Verifications
+    class PactVersionProviderTagSuccessfulVerification < Sequel::Model
+      plugin :insert_ignore, identifying_columns: [:pact_version_id, :provider_version_tag_name, :wip]
+    end
+  end
+end

data/lib/pact_broker/verifications/repository.rb

@@ -2,6 +2,7 @@ require "sequel"
 require "pact_broker/domain/verification"
 require "pact_broker/verifications/sequence"
 require "pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version"
+require "pact_broker/verifications/pact_version_provider_tag_successful_verification"
 
 module PactBroker
   module Verifications
@@ -27,6 +28,7 @@ module PactBroker
         verification.tag_names = version.tag_names # TODO pass this in from contracts service
         verification.save
         update_latest_verification_id(verification)
+        update_pact_version_provider_tag_verifications(verification, version.tag_names)
         verification
       end
 
@@ -46,6 +48,20 @@ module PactBroker
         LatestVerificationIdForPactVersionAndProviderVersion.new(params).upsert
       end
 
+      def update_pact_version_provider_tag_verifications(verification, tag_names)
+        if verification.success
+          tag_names&.each do | tag_name |
+            PactVersionProviderTagSuccessfulVerification.new(
+              pact_version_id: verification.pact_version_id,
+              provider_version_tag_name: tag_name,
+              wip: verification.wip,
+              verification_id: verification.id,
+              execution_date: verification.execution_date
+            ).insert_ignore
+          end
+        end
+      end
+
       def find consumer_name, provider_name, pact_version_sha, verification_number
         PactBroker::Domain::Verification
           .select_all_qualified

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.89.1"
+  VERSION = "2.93.0"
 end

data/lib/pact_broker/webhooks/pact_and_verification_parameters.rb

@@ -41,8 +41,7 @@ module PactBroker
         CONSUMER_LABELS,
         PROVIDER_LABELS,
         EVENT_NAME,
-        BUILD_URL,
-        CURRENTLY_DEPLOYED_PROVIDER_VERSION_NUMBER
+        BUILD_URL
       ]
 
       # TODO change this verification to the latest main branch

data/pact_broker.gemspec

@@ -18,8 +18,15 @@ Gem::Specification.new do |gem|
 
   gem.files         = begin
                         if Dir.exist?(".git")
-                          `git ls-files`.split($/)
+                          Dir.chdir(File.expand_path(__dir__)) do
+                            include_patterns = %w[lib/**/* db/**/* docs/**/*.md public/**/* vendor/**/* README.md CHANGELOG.md Gemfile pact_broker.gemspec]
+                            exclude_patterns = %w[db/test/**/*]
+                            include_list = include_patterns.flat_map{ | pattern | Dir.glob(pattern) } - exclude_patterns.flat_map{ | pattern | Dir.glob(pattern) }
+
+                            `git ls-files -z`.split("\x0") & include_list
+                          end
                         else
+                          # Can't remember why this is ever needed
                           root_path      = File.dirname(__FILE__)
                           all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
                           all_files.reject! { |file| [".", ".."].include?(File.basename(file)) || File.directory?(file)}

data/public/css/bootstrap-grid.css

@@ -1,8 +1,8 @@
 /*!
- * Bootstrap Grid v4.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Bootstrap Grid v4.6.1 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 html {
   box-sizing: border-box;
@@ -15,7 +15,12 @@ html {
   box-sizing: inherit;
 }
 
-.container {
+.container,
+.container-fluid,
+.container-sm,
+.container-md,
+.container-lg,
+.container-xl {
   width: 100%;
   padding-right: 15px;
   padding-left: 15px;
@@ -24,37 +29,29 @@ html {
 }
 
 @media (min-width: 576px) {
-  .container {
+  .container, .container-sm {
     max-width: 540px;
   }
 }
 
 @media (min-width: 768px) {
-  .container {
+  .container, .container-sm, .container-md {
     max-width: 720px;
   }
 }
 
 @media (min-width: 992px) {
-  .container {
+  .container, .container-sm, .container-md, .container-lg {
     max-width: 960px;
   }
 }
 
 @media (min-width: 1200px) {
-  .container {
+  .container, .container-sm, .container-md, .container-lg, .container-xl {
     max-width: 1140px;
   }
 }
 
-.container-fluid {
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
 .row {
   display: -ms-flexbox;
   display: flex;
@@ -95,6 +92,42 @@ html {
   max-width: 100%;
 }
 
+.row-cols-1 > * {
+  -ms-flex: 0 0 100%;
+  flex: 0 0 100%;
+  max-width: 100%;
+}
+
+.row-cols-2 > * {
+  -ms-flex: 0 0 50%;
+  flex: 0 0 50%;
+  max-width: 50%;
+}
+
+.row-cols-3 > * {
+  -ms-flex: 0 0 33.333333%;
+  flex: 0 0 33.333333%;
+  max-width: 33.333333%;
+}
+
+.row-cols-4 > * {
+  -ms-flex: 0 0 25%;
+  flex: 0 0 25%;
+  max-width: 25%;
+}
+
+.row-cols-5 > * {
+  -ms-flex: 0 0 20%;
+  flex: 0 0 20%;
+  max-width: 20%;
+}
+
+.row-cols-6 > * {
+  -ms-flex: 0 0 16.666667%;
+  flex: 0 0 16.666667%;
+  max-width: 16.666667%;
+}
+
 .col-auto {
   -ms-flex: 0 0 auto;
   flex: 0 0 auto;
@@ -301,6 +334,36 @@ html {
     flex-grow: 1;
     max-width: 100%;
   }
+  .row-cols-sm-1 > * {
+    -ms-flex: 0 0 100%;
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+  .row-cols-sm-2 > * {
+    -ms-flex: 0 0 50%;
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+  .row-cols-sm-3 > * {
+    -ms-flex: 0 0 33.333333%;
+    flex: 0 0 33.333333%;
+    max-width: 33.333333%;
+  }
+  .row-cols-sm-4 > * {
+    -ms-flex: 0 0 25%;
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+  .row-cols-sm-5 > * {
+    -ms-flex: 0 0 20%;
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+  .row-cols-sm-6 > * {
+    -ms-flex: 0 0 16.666667%;
+    flex: 0 0 16.666667%;
+    max-width: 16.666667%;
+  }
   .col-sm-auto {
     -ms-flex: 0 0 auto;
     flex: 0 0 auto;
@@ -473,6 +536,36 @@ html {
     flex-grow: 1;
     max-width: 100%;
   }
+  .row-cols-md-1 > * {
+    -ms-flex: 0 0 100%;
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+  .row-cols-md-2 > * {
+    -ms-flex: 0 0 50%;
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+  .row-cols-md-3 > * {
+    -ms-flex: 0 0 33.333333%;
+    flex: 0 0 33.333333%;
+    max-width: 33.333333%;
+  }
+  .row-cols-md-4 > * {
+    -ms-flex: 0 0 25%;
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+  .row-cols-md-5 > * {
+    -ms-flex: 0 0 20%;
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+  .row-cols-md-6 > * {
+    -ms-flex: 0 0 16.666667%;
+    flex: 0 0 16.666667%;
+    max-width: 16.666667%;
+  }
   .col-md-auto {
     -ms-flex: 0 0 auto;
     flex: 0 0 auto;
@@ -645,6 +738,36 @@ html {
     flex-grow: 1;
     max-width: 100%;
   }
+  .row-cols-lg-1 > * {
+    -ms-flex: 0 0 100%;
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+  .row-cols-lg-2 > * {
+    -ms-flex: 0 0 50%;
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+  .row-cols-lg-3 > * {
+    -ms-flex: 0 0 33.333333%;
+    flex: 0 0 33.333333%;
+    max-width: 33.333333%;
+  }
+  .row-cols-lg-4 > * {
+    -ms-flex: 0 0 25%;
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+  .row-cols-lg-5 > * {
+    -ms-flex: 0 0 20%;
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+  .row-cols-lg-6 > * {
+    -ms-flex: 0 0 16.666667%;
+    flex: 0 0 16.666667%;
+    max-width: 16.666667%;
+  }
   .col-lg-auto {
     -ms-flex: 0 0 auto;
     flex: 0 0 auto;
@@ -817,6 +940,36 @@ html {
     flex-grow: 1;
     max-width: 100%;
   }
+  .row-cols-xl-1 > * {
+    -ms-flex: 0 0 100%;
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+  .row-cols-xl-2 > * {
+    -ms-flex: 0 0 50%;
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+  .row-cols-xl-3 > * {
+    -ms-flex: 0 0 33.333333%;
+    flex: 0 0 33.333333%;
+    max-width: 33.333333%;
+  }
+  .row-cols-xl-4 > * {
+    -ms-flex: 0 0 25%;
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+  .row-cols-xl-5 > * {
+    -ms-flex: 0 0 20%;
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+  .row-cols-xl-6 > * {
+    -ms-flex: 0 0 16.666667%;
+    flex: 0 0 16.666667%;
+    max-width: 16.666667%;
+  }
   .col-xl-auto {
     -ms-flex: 0 0 auto;
     flex: 0 0 auto;