pact_broker 2.71.0 → 2.72.0

data/lib/pact_broker/test/test_data_builder.rb

@@ -40,6 +40,7 @@ module PactBroker
       attr_reader :provider_version
       attr_reader :version
       attr_reader :pact
+      attr_reader :pact_version
       attr_reader :verification
       attr_reader :webhook
       attr_reader :webhook_execution
@@ -96,6 +97,15 @@ module PactBroker
         self
       end
 
+      def create_pact_with_verification_and_tags consumer_name = "Consumer", consumer_version = "1.0.#{model_counter}", consumer_version_tags = [], provider_name = "Provider", provider_version = "1.0.#{model_counter}", provider_version_tags = []
+        create_pact_with_hierarchy(consumer_name, consumer_version, provider_name)
+        consumer_version_tags.each do | tag |
+          create_consumer_version_tag(tag)
+        end
+        create_verification(number: model_counter, provider_version: provider_version, tag_names: provider_version_tags)
+        self
+      end
+
       def create_version_with_hierarchy pacticipant_name, pacticipant_version
         pacticipant = pacticipant_service.create(:name => pacticipant_name)
         version = PactBroker::Domain::Version.create(:number => pacticipant_version, :pacticipant => pacticipant)
@@ -237,6 +247,20 @@ module PactBroker
         self
       end
 
+      def create_pact_version_without_publication(json_content = nil )
+        json_content = json_content ? json_content : {random: rand}.to_json
+        pact_version_sha = generate_pact_version_sha(json_content)
+
+        @pact_version = PactBroker::Pacts::PactVersion.new(
+          consumer_id: consumer.id,
+          provider_id: provider.id,
+          sha: pact_version_sha,
+          content: json_content,
+          created_at: Sequel.datetime_class.now
+        ).save
+        self
+      end
+
       def create_webhook parameters = {}
         params = parameters.dup
         consumer = params.key?(:consumer) ? params.delete(:consumer) : @consumer

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.71.0'
+  VERSION = '2.72.0'
 end

data/script/docker-container/test.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rake

data/script/docker/db-psql.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker exec -it pact-broker-postgres psql -U postgres postgres

data/script/docker/db-reload.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+: "${1:?Please specify file to restore}"
+
+script/docker/db-rm.sh
+sleep 2
+script/docker/db-start.sh
+sleep 3
+
+echo "restoring"
+script/docker/db-restore.sh "$1"

data/script/pry.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# raise "Please supply database path" unless ARGV[0]
+
+$LOAD_PATH.unshift './lib'
+$LOAD_PATH.unshift './spec'
+$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 }
+DATABASE_CREDENTIALS = {adapter: "postgres", database: "postgres", username: 'postgres', password: 'postgres', host: "localhost", :encoding => 'utf8'}
+
+connection = Sequel.connect(DATABASE_CREDENTIALS)
+connection.timezone = :utc
+# Uncomment these lines to open a pry session for inspecting the database
+
+
+require 'pact_broker/db'
+require 'pact_broker'
+require 'support/test_data_builder'
+puts "bout to pry"
+
+require 'pry'; pry(binding);
+puts "fater pry"

data/script/seed.rb

@@ -8,6 +8,7 @@ $LOAD_PATH.unshift './tasks'
 ENV['RACK_ENV'] = 'development'
 require 'sequel'
 require 'logger'
+require 'stringio'
 logger = Logger.new($stdout)
 logger = Logger.new(StringIO.new)
 DATABASE_CREDENTIALS = {logger: logger, adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}.tap { |it| puts it }

data/script/test/run-rake-on-docker-compose-mysql.sh

@@ -0,0 +1,8 @@
+#/bin/sh
+
+cleanup() {
+  docker-compose -f docker-compose-ci-mysql.yml down
+}
+
+trap cleanup EXIT
+docker-compose -f docker-compose-ci-mysql.yml up --exit-code-from tests --abort-on-container-exit --remove-orphans

data/spec/features/delete_tagged_pact_versions_spec.rb

@@ -15,8 +15,8 @@ describe "Deleting tagged pact versions" do
       expect{ subject }.to change{ PactBroker::Pacts::PactPublication.count }.by(-1)
     end
 
-    it "returns a 204" do
-      expect(subject.status).to be 204
+    it "returns a 200" do
+      expect(subject.status).to be 200
     end
   end
 

data/spec/features/get_pact_spec.rb

@@ -1,6 +1,5 @@
 describe "retrieving a pact" do
-
-  subject { get path; last_response  }
+  subject { get(path)  }
 
   context "when differing case is used in the consumer and provider names" do
 
@@ -30,6 +29,7 @@ describe "retrieving a pact" do
       end
     end
   end
+
   context "when differing case is used in the tag name" do
 
     let(:path) { "/pacts/provider/a%20provider/consumer/a%20consumer/latest/PROD" }

data/spec/features/get_pact_version.rb

@@ -1,8 +1,7 @@
-describe "retrieving a pact" do
-  subject { get path; last_response  }
+RSpec.describe "retrieving a pact" do
+  subject { get(path)  }
 
   context "when differing case is used in the consumer and provider names" do
-    let(:td) { TestDataBuilder.new }
     let(:pact) { td.create_pact_with_hierarchy("Foo", "1", "Bar").and_return(:pact) }
     let!(:path) { "/pacts/provider/Bar/consumer/Foo/pact-version/#{pact.pact_version_sha}" }
 
@@ -10,4 +9,28 @@ describe "retrieving a pact" do
       expect(subject.status).to be 200
     end
   end
+
+  context "when there are multiple consumer versions for the same sha" do
+    before do
+      td.create_pact_with_hierarchy("Foo", "1", "Bar")
+        .create_consumer_version("2")
+        .republish_same_pact
+    end
+
+    let(:pact) { PactBroker::Pacts::PactPublication.order(:id).first.to_domain }
+    let(:path) { PactBroker::Api::PactBrokerUrls.pact_version_url(pact) }
+
+    it "returns the latest" do
+      expect(JSON.parse(subject.body)['_links']['pb:consumer-version']['name']).to eq "2"
+    end
+
+    context "when there is metadata specifying the consumer version number" do
+      let(:pact) { PactBroker::Pacts::PactPublication.order(:id).first.to_domain }
+      let(:path) { PactBroker::Api::PactBrokerUrls.pact_version_url_with_webhook_metadata(pact) }
+
+      it "returns the pact with the matching consumer version number" do
+        expect(JSON.parse(subject.body)['_links']['pb:consumer-version']['name']).to eq "1"
+      end
+    end
+  end
 end

data/spec/fixtures/approvals/clean_incremental_dry_run.approved.json

@@ -0,0 +1,100 @@
+{
+  "counts": {
+    "totalVersions": 9,
+    "versionsToDelete": 3,
+    "versionsNotToKeep": 6,
+    "versionsToKeep": 3,
+    "versionsToKeepBySelector": [
+      {
+        "selector": {
+          "tag": "prod"
+        },
+        "count": 2
+      },
+      {
+        "selector": {
+          "tag": "dev",
+          "latest": true
+        },
+        "count": 1
+      }
+    ]
+  },
+  "versionSummary": {
+    "Bar": {
+      "toDelete": {
+        "count": 0
+      },
+      "toKeep": {
+        "count": 0
+      }
+    },
+    "Foo": {
+      "toDelete": {
+        "count": 3,
+        "fromVersion": {
+          "number": "2",
+          "created": "1 day ago",
+          "tags": [
+
+          ]
+        },
+        "toVersion": {
+          "number": "6",
+          "created": "5 days ago",
+          "tags": [
+            "foo"
+          ]
+        }
+      },
+      "toKeep": {
+        "count": 4,
+        "latestVersion": {
+          "number": "1",
+          "created": "less than a minute ago",
+          "tags": [
+            "dev",
+            "prod"
+          ]
+        },
+        "firstVersion": {
+          "number": "7",
+          "created": "6 days ago",
+          "tags": [
+
+          ]
+        }
+      }
+    },
+    "Meep": {
+      "toDelete": {
+        "count": 0
+      },
+      "toKeep": {
+        "count": 2,
+        "latestVersion": {
+          "number": "2",
+          "created": "6 days ago",
+          "tags": [
+            "foop"
+          ]
+        },
+        "firstVersion": {
+          "number": "3",
+          "created": "6 days ago",
+          "tags": [
+            "blah"
+          ]
+        }
+      }
+    },
+    "Moop": {
+      "toDelete": {
+        "count": 0
+      },
+      "toKeep": {
+        "count": 0
+      }
+    }
+  }
+}

data/spec/lib/pact_broker/api/pact_broker_urls_spec.rb

@@ -123,6 +123,12 @@ module PactBroker
           end
         end
 
+        context "when the metadata is empty" do
+          it "returns an empty hash" do
+            expect(PactBrokerUrls.decode_pact_metadata("")).to eq({})
+          end
+        end
+
         context "when the metadata is not valid base64" do
           it "returns an empty hash" do
             expect(PactBrokerUrls.decode_pact_metadata("foo==,")).to eq({})

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

@@ -13,7 +13,6 @@ module PactBroker::Api
       let(:json) { {some: 'json'}.to_json }
 
       describe "GET" do
-
         context "Accept: text/html" do
 
           let(:json_content) { 'json_content' }
@@ -130,20 +129,20 @@ module PactBroker::Api
       end
 
       describe "DELETE" do
-
-        subject { delete "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
-
-        let(:pact) { double('pact') }
-        let(:pact_service) { PactBroker::Pacts::Service }
-        let(:response) { subject; last_response }
-
         before do
           allow(pact_service).to receive(:find_pact).and_return(pact)
           allow(pact_service).to receive(:delete)
+          allow(pact_service).to receive(:find_latest_pact).and_return(latest_pact)
+          allow_any_instance_of(described_class).to receive(:latest_pact_url).and_return("http://latest-pact")
         end
 
-        context "when the pact exists" do
+        let(:pact) { double('pact') }
+        let(:pact_service) { PactBroker::Pacts::Service }
+        let(:latest_pact) { double('latest pact') }
+
+        subject { delete "/pacts/provider/Provider/consumer/Consumer/version/1.2", json, {'CONTENT_TYPE' => "application/json"} ; last_response }
 
+        context "when the pact exists" do
           it "deletes the pact using the pact service" do
             expect(pact_service).to receive(:delete).with(instance_of(PactBroker::Pacts::PactParams))
             subject
@@ -152,6 +151,18 @@ module PactBroker::Api
           it "returns a 200" do
             expect(subject.status).to eq 200
           end
+
+          it "returns a link to the latest pact" do
+            expect(JSON.parse(subject.body)["_links"]["pb:latest-pact-version"]["href"]).to eq "http://latest-pact"
+          end
+
+          context "with there are no more pacts" do
+            let(:latest_pact) { nil }
+
+            it "does not return a link" do
+              expect(JSON.parse(subject.body)["_links"]).to_not have_key("pb:latest-pact-version")
+            end
+          end
         end
 
         context "when the pact does not exist" do

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

@@ -69,8 +69,12 @@ module PactBroker
         context "DELETE" do
           before do
             allow(pact_service).to receive(:delete_all_pact_publications_between)
+            allow(pact_service).to receive(:find_latest_pact).and_return(latest_pact)
+            allow_any_instance_of(described_class).to receive(:latest_pact_url).and_return("http://latest-pact")
           end
 
+          let(:latest_pact) { double('pact') }
+
           subject { delete(path) }
 
           it "deletes all the pacts with the given consumer/provider/tag" do
@@ -78,8 +82,12 @@ module PactBroker
             subject
           end
 
-          it "returns a 204" do
-            expect(subject.status).to eq 204
+          it "returns a 200" do
+            expect(subject.status).to eq 200
+          end
+
+          it "returns a link to the latest pact" do
+            expect(JSON.parse(subject.body)["_links"]["pb:latest-pact-version"]["href"]).to eq "http://latest-pact"
           end
         end
       end

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

@@ -17,7 +17,7 @@ module PactBroker
           let(:database_connector) { double('database_connector' )}
           let(:verification) { double(PactBroker::Domain::Verification) }
           let(:errors_empty) { true }
-          let(:parsed_metadata) { { the: 'metadata' } }
+          let(:parsed_metadata) { { the: 'metadata', consumer_version_number: "2"} }
           let(:base_url) { "http://example.org" }
           let(:webhook_execution_configuration) { instance_double(PactBroker::Webhooks::ExecutionConfiguration) }
 
@@ -29,10 +29,14 @@ module PactBroker
             allow(webhook_execution_configuration).to receive(:with_webhook_context).and_return(webhook_execution_configuration)
           end
 
-          subject { post url, request_body, rack_env; last_response }
+          subject { post(url, request_body, rack_env) }
 
           it "looks up the specified pact" do
-            allow(Pacts::Service).to receive(:find_pact).with(instance_of(PactBroker::Pacts::PactParams))
+            expect(Pacts::Service).to receive(:find_pact) do | arg |
+              expect(arg).to be_a(PactBroker::Pacts::PactParams)
+              expect(arg[:consumer_version_number]).to eq "2"
+            end
+            subject
           end
 
           context "when the pact does not exist" do

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

@@ -6,7 +6,7 @@ IS_MYSQL = !!DB.mysql?
 module PactBroker
   module DB
     # Inner queries don't work on MySQL. Seriously, MySQL???
-    describe CleanIncremental, pending: IS_MYSQL  do
+    describe CleanIncremental, skip: IS_MYSQL  do
 
       def pact_publication_count_for(consumer_name, version_number)
         PactBroker::Pacts::PactPublication.where(consumer_version: PactBroker::Domain::Version.where_pacticipant_name(consumer_name).where(number: version_number)).count
@@ -74,12 +74,20 @@ module PactBroker
           context "when dry_run: true" do
             before do
               td.create_pact_with_hierarchy("Meep", "2", "Moop")
+                .create_consumer_version_tag("foop")
+                .create_consumer_version("3")
+                .create_consumer_version_tag("blah")
             end
+
             let(:dry_run) { true }
 
             it "doesn't delete anything" do
               expect { subject }.to_not change { PactBroker::Domain::Version.count }
             end
+
+            it "returns info on what will be deleted" do
+              Approvals.verify(subject, :name => 'clean_incremental_dry_run', format: :json)
+            end
           end
         end
 

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

@@ -2,11 +2,14 @@ require 'pact_broker/db/delete_overwritten_data'
 
 module PactBroker
   module DB
-    describe DeleteOverwrittenData, pending: !!DB.mysql? do
+    describe DeleteOverwrittenData, skip: !!DB.mysql? do
       describe ".call" do
         let(:db) { PactBroker::DB.connection }
-        subject { DeleteOverwrittenData.call(db, before: before_date) }
-        let(:before_date) { nil }
+        let(:max_age) { nil }
+        let(:dry_run) { nil }
+        let(:limit) { nil }
+
+        subject { DeleteOverwrittenData.call(db, max_age: max_age, limit: limit, dry_run: dry_run) }
 
         context "when a pact is overwritten" do
           let!(:pact_to_delete) { td.create_everything_for_an_integration.and_return(:pact) }
@@ -25,6 +28,14 @@ module PactBroker
             expect(subject[:deleted][:pact_publications]).to eq 1
             expect(subject[:kept][:pact_publications]).to eq 1
           end
+
+          context "when dry_run is true" do
+            let(:dry_run) { true }
+
+            it "does not delete anything" do
+              expect { subject }.to_not change{ db[:pact_publications].count }
+            end
+          end
         end
 
         context "when a pact has multiple verifications" do
@@ -53,10 +64,12 @@ module PactBroker
         context "when a pact version is orphaned" do
           before do
             td.create_pact_with_verification.comment("this one will still have the verification, so can't be deleted")
-              .revise_pact.comment("this one can be deleted")
-              .revise_pact.comment("this one will still have a pact publication, so can't be deleted")
+              .create_pact_version_without_publication.comment("will be deleted")
+              .create_pact_version_without_publication.comment("will be kept because of limit")
           end
 
+          let(:limit) { 1 }
+
           it "is deleted" do
             expect { subject }.to change{ db[:pact_versions].count }.by(-1)
           end
@@ -65,36 +78,83 @@ module PactBroker
             expect(subject[:deleted][:pact_versions]).to eq 1
             expect(subject[:kept][:pact_versions]).to eq 2
           end
+
+          context "when dry_run is true" do
+            let(:dry_run) { true }
+
+            it "does not delete anything" do
+              expect { subject }.to_not change{ db[:pact_versions].count }
+            end
+          end
         end
 
-        context "when the pact publication is created after the before date" do
+        context "when the pact publication is younger than the max age" do
           before do
-            td.set_now(before_date + 1)
+            td.set_now(DateTime.now - 3)
               .create_pact_with_hierarchy
               .revise_pact
           end
 
-          let(:before_date) { DateTime.new(2010, 2, 5) }
+          let(:max_age) { 4 }
 
           it "doesn't delete the data" do
             expect { subject }.to_not change { db[:pact_publications].count }
           end
         end
 
-        context "when the verification is created after the before date" do
+        context "when the verification is younger than the max age" do
           before do
-            td.set_now(before_date + 1)
+            td.set_now(DateTime.now - 3)
               .create_pact_with_hierarchy
               .create_verification(provider_version: "1", success: false)
               .create_verification(provider_version: "1", success: true, number: 2)
           end
 
-          let(:before_date) { DateTime.new(2010, 2, 5) }
+          let(:max_age) { 4 }
 
           it "doesn't delete the data" do
             expect { subject }.to_not change { db[:verifications].count }
           end
         end
+
+        context "when there are triggered webhooks and executions" do
+          before do
+            td.create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_webhook
+              .create_triggered_webhook
+              .create_webhook_execution
+              .create_triggered_webhook.comment("latest")
+              .create_webhook_execution
+              .create_pact_with_hierarchy("Foo1", "1", "Bar1")
+              .create_webhook
+              .create_triggered_webhook
+              .create_webhook_execution
+              .create_triggered_webhook.comment("latest")
+              .create_webhook_execution
+          end
+
+          let(:limit) { 3 }
+
+          it "deletes all but the latest triggered webhooks, considering the limit" do
+            expect { subject }.to change { PactBroker::Webhooks::TriggeredWebhook.count }.by(-2)
+          end
+
+          context "when dry_run is true" do
+            let(:dry_run) { true }
+
+            it "does not delete anything" do
+              expect { subject }.to_not change{ PactBroker::Webhooks::TriggeredWebhook.count }
+            end
+          end
+
+          context "when all the records are younger than the max age" do
+            let(:max_age) { 1 }
+
+            it "doesn't delete anything" do
+              expect { subject }.to_not change { PactBroker::Webhooks::TriggeredWebhook.count }
+            end
+          end
+        end
       end
     end
   end