pact_broker 2.50.1 → 2.51.0

data/lib/pact_broker/repositories/helpers.rb

@@ -19,6 +19,10 @@ module PactBroker
         end
       end
 
+      def pacticipant_id_for_name pacticipant_name
+        Sequel::Model.db[:pacticipants].select(:id).where(name_like(:name, pacticipant_name)).limit(1)
+      end
+
       def order_ignore_case column_name = :name
         order(Sequel.function(:lower, column_name))
       end

data/lib/pact_broker/test/test_data_builder.rb

@@ -150,6 +150,7 @@ module PactBroker
         params.delete(:comment)
         tag_names = [params.delete(:tag_names), params.delete(:tag_name)].flatten.compact
         @consumer_version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @consumer)
+        set_created_at_if_set params[:created_at], :versions, { id: @consumer_version.id }
         tag_names.each do | tag_name |
           PactBroker::Domain::Tag.create(name: tag_name, version: @consumer_version)
         end
@@ -210,8 +211,8 @@ module PactBroker
           pact_version_sha: pact_version_sha,
           json_content: prepare_json_content(json_content),
         )
-        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_publications, id: @pact.id)
+        set_created_at_if_set(params[:created_at], :pact_versions, sha: @pact.pact_version_sha)
         @pact = PactBroker::Pacts::PactPublication.find(id: @pact.id).to_domain
         self
       end
@@ -319,9 +320,13 @@ module PactBroker
         @verification = PactBroker::Verifications::Repository.new.create(verification, provider_version_number, @pact)
         @provider_version = PactBroker::Domain::Version.where(pacticipant_id: @provider.id, number: provider_version_number).single_record
 
+        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)
+
         if tag_names.any?
           tag_names.each do | tag_name |
             PactBroker::Domain::Tag.create(name: tag_name, version: @provider_version)
+            set_created_at_if_set(parameters[:created_at], :tags, version_id: @provider_version.id, name: tag_name)
           end
         end
         self
@@ -354,7 +359,7 @@ module PactBroker
       end
 
       def set_now date
-        @now = date
+        @now = date.to_date
         self
       end
 
@@ -363,6 +368,21 @@ module PactBroker
         self
       end
 
+      def add_days(days = 1)
+        @now = @now + days
+        self
+      end
+
+      def subtract_day
+        @now = @now - 1
+        self
+      end
+
+      def subtract_days(days = 1)
+        @now = @now - days
+        self
+      end
+
       def add_minute
         @now = @now + (1.0/(24*60))
         self

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

@@ -1,5 +1,6 @@
 require 'pact_broker/ui/controllers/base_controller'
 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 'haml'
@@ -41,7 +42,7 @@ module PactBroker
         end
 
         get "/provider/:provider_name/consumer/:consumer_name" do
-          selectors = [{ pacticipant_name: params[:consumer_name] }, { pacticipant_name: params[:provider_name] } ]
+          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)

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

@@ -113,11 +113,11 @@ module PactBroker
         end
 
         def orderable_fields
-          [consumer_name, consumer_version_order, pact_revision_number, provider_name, @line.verification_id]
+          [@line.last_action_date, @line.pact_created_at]
         end
 
         def <=> other
-          (self.orderable_fields <=> other.orderable_fields) * -1
+          (orderable_fields <=> other.orderable_fields) * -1
         end
 
         def verification_status

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.50.1'
+  VERSION = '2.51.0'
 end

data/lib/pact_broker/versions/repository.rb

@@ -17,10 +17,8 @@ module PactBroker
       def find_by_pacticipant_name_and_latest_tag pacticipant_name, tag
         PactBroker::Domain::Version
           .select_all_qualified
-          .join(:pacticipants, {id: :pacticipant_id}, {implicit_qualifier: :versions})
-          .join(:tags, {version_id: :id}, {implicit_qualifier: :versions})
-          .where(name_like(Sequel[:tags][:name], tag))
-          .where(name_like(Sequel[:pacticipants][:name], pacticipant_name))
+          .where_tag(tag)
+          .where_pacticipant_name(pacticipant_name)
           .reverse_order(:order)
           .first
       end
@@ -28,28 +26,24 @@ module PactBroker
       def find_by_pacticipant_name_and_tag pacticipant_name, tag
         PactBroker::Domain::Version
           .select_all_qualified
-          .join(:pacticipants, {id: :pacticipant_id}, {implicit_qualifier: :versions})
-          .join(:tags, {version_id: :id}, {implicit_qualifier: :versions})
-          .where(name_like(Sequel[:tags][:name], tag))
-          .where(name_like(Sequel[:pacticipants][:name], pacticipant_name))
+          .where_pacticipant_name(pacticipant_name)
+          .where_tag(tag)
           .all
       end
 
       def find_latest_by_pacticpant_name pacticipant_name
         PactBroker::Domain::Version
           .select_all_qualified
-          .join(:pacticipants, {id: :pacticipant_id}, {implicit_qualifier: :versions})
-          .where(name_like(Sequel[:pacticipants][:name], pacticipant_name))
+          .where_pacticipant_name(pacticipant_name)
           .reverse_order(:order)
           .first
       end
 
       def find_by_pacticipant_name_and_number pacticipant_name, number
         PactBroker::Domain::Version
-          .select(Sequel[:versions][:id], Sequel[:versions][:number], Sequel[:versions][:pacticipant_id], Sequel[:versions][:order], Sequel[:versions][:created_at], Sequel[:versions][:updated_at])
-          .join(:pacticipants, {id: :pacticipant_id})
-          .where(name_like(:number, number))
-          .where(name_like(:name, pacticipant_name))
+          .select_all_qualified
+          .where_pacticipant_name(pacticipant_name)
+          .where_number(number)
           .single_record
       end
 
@@ -91,6 +85,10 @@ module PactBroker
           .exclude(id: (version_ids_with_pact_publications + version_ids_with_verifications).uniq)
           .delete
       end
+
+      def find_versions_for_selector(selector)
+        PactBroker::Domain::Version.select_all_qualified.for_selector(selector).all
+      end
     end
   end
 end

data/lib/pact_broker/webhooks/repository.rb

@@ -17,6 +17,8 @@ module PactBroker
       include Repositories
 
       def create uuid, webhook, consumer, provider
+        consumer = pacticipant_repository.find_by_name(webhook.consumer.name) if webhook.consumer
+        provider = pacticipant_repository.find_by_name(webhook.provider.name) if webhook.provider
         db_webhook = Webhook.from_domain webhook, consumer, provider
         db_webhook.uuid = uuid
         db_webhook.save

data/pact_broker.gemspec

@@ -70,13 +70,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler-audit', '~>0.4'
   gem.add_development_dependency 'sqlite3', '~>1.3'
   gem.add_development_dependency 'pry-byebug'
-  gem.add_development_dependency 'rake', '~>10.0'
+  gem.add_development_dependency 'rake', '~>12.3.3'
   gem.add_development_dependency 'fakefs', '~>0.4'
   gem.add_development_dependency 'webmock', '~>2.3'
   gem.add_development_dependency 'rspec', '~>3.0'
   gem.add_development_dependency 'rspec-its', '~>1.2'
   gem.add_development_dependency 'database_cleaner', '~>1.8', '>= 1.8.1'
-  gem.add_development_dependency 'pg', '~>0.21'
+  gem.add_development_dependency 'pg', '~>1.2'
   gem.add_development_dependency 'conventional-changelog', '~>1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
   gem.add_development_dependency 'timecop', '~> 0.9'

data/script/prod/redact-data.sql

@@ -1,7 +1,15 @@
-update pacticipants set name = 'pacticipant-' || id;
-update pact_versions set content = '{}';
-update verifications set test_results = null;
-delete from webhook_executions;
-delete from triggered_webhooks;
-delete from webhooks;
-delete from certificates;
+UPDATE pacticipants SET name = 'pacticipant-' || id;
+UPDATE pact_versions SET content = '{}';
+UPDATE verifications SET test_results = null;
+DELETE FROM webhook_executions;
+DELETE FROM triggered_webhooks;
+DELETE FROM webhooks;
+DELETE FROM certificates;
+
+UPDATE tags
+SET name = temprow.redacted_name
+FROM
+  ( SELECT name, 'tag-' || ROW_NUMBER () OVER (ORDER BY name) as redacted_name FROM (
+    SELECT DISTINCT name FROM tags WHERE lower(name) NOT IN ('master', 'test', 'dev', 'prod', 'production') ORDER BY name
+  ) as x) as temprow
+WHERE tags.name = temprow.name;

data/script/seed.rb

@@ -8,7 +8,9 @@ $LOAD_PATH.unshift './tasks'
 ENV['RACK_ENV'] = 'development'
 require 'sequel'
 require 'logger'
-DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}.tap { |it| puts it }
+logger = Logger.new($stdout)
+logger = Logger.new(StringIO.new)
+DATABASE_CREDENTIALS = {logger: logger, adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}.tap { |it| puts it }
 #DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
 
 connection = Sequel.connect(DATABASE_CREDENTIALS)
@@ -42,6 +44,8 @@ webhook_body = {
   'githubVerificationStatus' => '${pactbroker.githubVerificationStatus}'
 }
 
+PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = false
+
   # .create_global_webhook(
   #   method: 'POST',
   #   url: "http://localhost:9292/pact-changed-webhook",
@@ -53,6 +57,16 @@ TestDataBuilder.new
     method: 'POST',
     url: "http://localhost:9292/verification-published-webhook",
     body: webhook_body.to_json)
+  .set_now(Date.today - 101)
+  .tap{ | it |
+    100.times do | i |
+      it.create_pact_with_verification("Foo", i.to_s, "Bar", i.to_s)
+      .create_pact_with_verification("Bar", i.to_s, "Foo", i.to_s)
+      .add_day
+    end
+  }.create_pact_with_hierarchy("Foo", "100", "Bar")
+
+
   # .create_certificate(path: 'spec/fixtures/certificates/self-signed.badssl.com.pem')
   # .create_consumer("Bethtest")
   # .create_verification_webhook(method: 'GET', url: "http://localhost:9292", body: webhook_body, username: "foo", password: "bar", headers: {"Accept" => "application/json"})

data/spec/features/create_webhook_spec.rb

@@ -108,8 +108,19 @@ describe "Creating a webhook" do
   context "with a UUID" do
     let(:path) { "/webhooks/1234123412341234" }
 
+    before do
+      webhook_hash[:provider] = { name: "Some Provider" }
+      webhook_hash[:consumer] = { name: "Some Consumer" }
+    end
+
     subject { put(path, webhook_json, headers) }
 
     its(:status) { is_expected.to be 201 }
+
+    it "is expected to have a consumer and provider" do
+      subject
+      expect(PactBroker::Webhooks::Webhook.first.consumer).to_not be nil
+      expect(PactBroker::Webhooks::Webhook.first.provider).to_not be nil
+    end
   end
 end

data/spec/lib/pact_broker/api/decorators/dashboard_decorator_spec.rb

@@ -36,16 +36,7 @@ module PactBroker
         let(:base_url) { 'http://example.org' }
         let(:options) { { user_options: { base_url: base_url } } }
         let(:dashboard_json) { DashboardDecorator.new([index_item]).to_json(options) }
-        let(:created_at) { in_utc { DateTime.new(2018) } }
-
-        def in_utc
-          begin
-            ENV['TZ'] = 'UTC'
-            yield
-          ensure
-            ENV['TZ'] = ORIGINAL_TZ
-          end
-        end
+        let(:created_at) { td.in_utc { DateTime.new(2018) } }
 
         before do
           allow_any_instance_of(DashboardDecorator).to receive(:pact_url).with(base_url, pact).and_return('pact_url')

data/spec/lib/pact_broker/api/resources/base_resource_spec.rb

@@ -20,6 +20,14 @@ module PactBroker
           end
         end
 
+        describe "resource_url" do
+          let(:uri) { URI('http://example.org/path/?query') }
+
+          it "cleans the query and trailing slash" do
+            expect(subject.resource_url).to eq "http://example.org/path"
+          end
+        end
+
         describe "base_url" do
           context "when PactBroker.configuration.base_url is not nil" do
             before do

data/spec/lib/pact_broker/badges/service_spec.rb

@@ -3,31 +3,46 @@ require 'webmock/rspec'
 
 module PactBroker
   module Badges
-    module Service
-      describe "#pact_verification_badge" do
-        let(:pacticipant_name) { "Foo-Bar_Thing Service" }
-        let(:pact) { double("pact", consumer_name: "Foo-Bar", provider_name: "Thing_Blah") }
-        let(:label) { nil }
-        let(:initials) { false }
-        let(:pseudo_branch_verification_status) { :success }
-        let(:logger) { double('logger').as_null_object }
-        let(:expected_url) { "https://img.shields.io/badge/#{expected_left_text}-#{expected_right_text}-#{expected_color}.svg" }
-        let(:expected_color) { "brightgreen" }
-        let(:expected_right_text) { "verified" }
-        let(:expected_left_text) { "foo--bar%2fthing__blah%20pact" }
-        let(:response_status) { 200 }
-        let!(:http_request) do
-          stub_request(:get, expected_url).to_return(:status => response_status, :body => "svg")
-        end
+    describe Service do
+      let(:pacticipant_name) { "Foo-Bar_Thing Service" }
+      let(:pact) { double("pact", consumer_name: "Foo-Bar", provider_name: "Thing_Blah") }
+      let(:label) { nil }
+      let(:initials) { false }
+      let(:pseudo_branch_verification_status) { :success }
+      let(:logger) { double('logger').as_null_object }
+      let(:expected_url) { "https://img.shields.io/badge/#{expected_left_text}-#{expected_right_text}-#{expected_color}.svg" }
+      let(:expected_color) { "brightgreen" }
+      let(:expected_right_text) { "verified" }
+      let(:expected_left_text) { "foo--bar%2fthing__blah%20pact" }
+      let(:response_status) { 200 }
+      let!(:http_request) do
+        stub_request(:get, expected_url).to_return(:status => response_status, :body => "svg")
+      end
+
+      subject { PactBroker::Badges::Service.pact_verification_badge pact, label, initials, pseudo_branch_verification_status }
 
-        subject { PactBroker::Badges::Service.pact_verification_badge pact, label, initials, pseudo_branch_verification_status }
+      let(:pact_verification_badge_url) { PactBroker::Badges::Service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status) }
 
-        let(:pact_verification_badge_url) { PactBroker::Badges::Service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status) }
+      before do
+        Service.clear_cache
+        allow(Service).to receive(:logger).and_return(logger)
+      end
 
-        before do
-          Service.clear_cache
-          allow(Service).to receive(:logger).and_return(logger)
+      describe "pact_verification_badge_url" do
+        context "with the pact is nil" do
+          let(:pact) { nil }
+          let(:expected_left_text) { "pact%20not%20found" }
+          let(:expected_right_text) { "unknown" }
+          let(:expected_color) { "lightgrey" }
+          let(:pseudo_branch_verification_status) { :never }
+
+          it "returns a link to a 'pact not found' badge" do
+            expect(pact_verification_badge_url).to eq URI(expected_url)
+          end
         end
+      end
+
+      describe "#pact_verification_badge" do
 
         it "returns the svg file" do
            expect(subject).to eq "svg"

data/spec/lib/pact_broker/db/clean_spec.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/db/clean'
+require 'pact_broker/matrix/unresolved_selector'
 
 IS_MYSQL = !!DB.mysql?
 
@@ -12,111 +13,42 @@ module PactBroker
       subject { Clean.call(PactBroker::DB.connection, options) }
 
       describe ".call"do
-
-        before do
-          td.create_pact_with_hierarchy("Foo", "0", "Bar")
-            .create_consumer_version_tag("prod")
-            .create_consumer_version("1")
-            .create_pact
-            .create_consumer_version_tag("prod")
-            .comment("keep")
-            .create_verification(provider_version: "20")
-            .create_consumer_version("2")
-            .create_pact
-            .comment("don't keep")
-            .create_webhook
-            .create_triggered_webhook
-            .create_webhook_execution
-            .create_verification(provider_version: "30")
-            .create_verification_webhook
-            .create_triggered_webhook
-            .create_webhook_execution
-            .create_consumer_version("3")
-            .create_pact
-            .comment("keep")
-            .create_verification(provider_version: "40")
-            .create_verification(provider_version: "40", number: 2)
-            .create_verification(provider_version: "50", number: 3)
-        end
-
-
-        it "does not delete any rows in the head matrix" do
-          head_matrix_before = db[:head_matrix].select_all
-          subject
-          head_matrix_after = db[:head_matrix].select_all
-          expect(head_matrix_before).to eq head_matrix_after
-        end
-
-        it "deletes rows that aren't the latest or latest tagged" do
-          subject
-          expect(db[:matrix].where(consumer_version_number: "2").count).to eq 0
-        end
-
-        it "deletes orphan pact_versions" do
-          subject
-          expect(db[:pact_versions].count).to eq 2
-        end
-
-        it "deletes orphan versions" do
-          subject
-          expect(db[:versions].where(number: "20").count).to be 1
-          expect(db[:versions].where(number: "30").count).to be 0
-          expect(db[:versions].where(number: "40").count).to be 1
-          expect(db[:versions].where(number: "50").count).to be 1
-        end
-
-        it "deletes overwritten verifications" do
-          expect(db[:matrix].where(provider_version_number: "40").count).to eq 2
-          subject
-          expect(db[:matrix].where(provider_version_number: "40", verification_number: 2).count).to eq 1
-        end
-      end
-
-      describe ".call with a date" do
-        before do
-          td.set_now(DateTime.new(2019, 1, 1))
-            .create_pact_with_hierarchy
-            .create_verification
-        end
-        let(:options) { { date: date } }
-
-        context "when the data is older than the given date" do
-          let(:date) { DateTime.new(2019, 1, 2) }
-          let(:expected_report) do
-            {
-              kept: { pact_publications: 0, verification_results: 0 },
-              deleted: { pact_publications: 1, verification_results: 1 }
-            }
+        context "when there are specified versions to keep" do
+          before do
+            td.create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_consumer_version_tag("prod")
+              .create_consumer_version_tag("master")
+              .create_consumer_version("3", tag_names: %w{prod})
+              .create_pact
+              .create_consumer_version("4", tag_names: %w{master})
+              .create_pact
+              .create_consumer_version("5", tag_names: %w{master})
+              .create_pact
+              .create_consumer_version("6", tag_names: %w{foo})
+              .create_pact
           end
 
-          it "is deleted" do
-            subject
-            expect(db[:head_matrix].count).to be 0
-          end
-
-          it "returns a report" do
-            expect(subject).to include(expected_report)
-          end
-        end
-
-        context "when the data is not older than the given date" do
-          let(:date) { DateTime.new(2019, 1, 1) }
-          let(:expected_report) do
+          let(:options) do
             {
-              kept: { pact_publications: 1, verification_results: 1 },
-              deleted: { pact_publications: 0, verification_results: 0 }
+              keep: [
+                PactBroker::Matrix::UnresolvedSelector.new(tag: "prod"),
+                PactBroker::Matrix::UnresolvedSelector.new(tag: "master", latest: true)
+              ]
             }
           end
 
-          it "is not deleted" do
+          it "does not delete the consumer versions specified" do
+            expect(PactBroker::Domain::Version.where(number: "1").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "3").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "4").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "6").count).to be 1
             subject
-            expect(db[:head_matrix].count).to be 1
-            expect(db[:pact_publications].count).to be 1
-            expect(db[:verifications].count).to be 1
-          end
-
-          it "returns a report" do
-            expect(subject).to include(expected_report)
+            expect(PactBroker::Domain::Version.where(number: "1").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "3").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "4").count).to be 0
+            expect(PactBroker::Domain::Version.where(number: "5").count).to be 1
+            expect(PactBroker::Domain::Version.where(number: "6").count).to be 0
           end
         end
       end