pact_broker 2.0.2 → 2.0.3

data/lib/pact_broker/pacticipants/service.rb

@@ -58,7 +58,8 @@ module PactBroker
         pact_repository.find_latest_pacts
           .collect do | pact|
             latest_verification = verification_service.find_latest_verification_for(pact.consumer, pact.provider)
-            PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, latest_verification
+            webhooks = webhook_service.find_by_consumer_and_provider pact.consumer, pact.provider
+            PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, latest_verification, webhooks
           end
       end
 
@@ -75,9 +76,10 @@ module PactBroker
       def self.delete name
         pacticipant = find_pacticipant_by_name name
         connection = PactBroker::Domain::Pacticipant.new.db
-        version_ids = PactBroker::Domain::Version.where(pacticipant_id: pacticipant.id).select(:id)
+        version_ids = PactBroker::Domain::Version.where(pacticipant_id: pacticipant.id).select_for_subquery(:id) #stupid mysql doesn't allow subqueries
         select_pacticipant = "select id from pacticipants where name = '#{name}'"
         tag_repository.delete_by_version_id version_ids
+        webhook_repository.delete_executions_by_pacticipant pacticipant
         pact_repository.delete_by_version_id version_ids
         connection.run("delete from pact_publications where provider_id = #{pacticipant.id}")
         connection.run("delete from verifications where pact_version_id IN (select id from pact_versions where provider_id = #{pacticipant.id})")

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -64,7 +64,7 @@ module PactBroker
 
       def to_domain
         domain = to_domain_without_tags
-        domain.consumer_version.tags = tags
+        domain.consumer_version.tags = tags.sort
         domain
       end
 

data/lib/pact_broker/pacts/repository.rb

@@ -44,7 +44,7 @@ module PactBroker
           .consumer(params.consumer_name)
           .provider(params.provider_name)
           .consumer_version_number(params.consumer_version_number)
-          .select(:id)
+          .select_for_subquery(:id)
         PactPublication.where(id: id).delete
       end
 
@@ -64,9 +64,9 @@ module PactBroker
 
       def find_latest_pact_versions_for_provider provider_name, tag = nil
         if tag
-          LatestTaggedPactPublications.provider(provider_name).order(:consumer_name).where(tag_name: tag).order(:consumer_name).collect(&:to_domain)
+          LatestTaggedPactPublications.provider(provider_name).order_ignore_case(:consumer_name).where(tag_name: tag).collect(&:to_domain)
         else
-          LatestPactPublications.provider(provider_name).order(:consumer_name).collect(&:to_domain)
+          LatestPactPublications.provider(provider_name).order_ignore_case(:consumer_name).collect(&:to_domain)
         end
       end
 

data/lib/pact_broker/repositories/helpers.rb

@@ -11,6 +11,22 @@ module PactBroker
       def case_sensitivity_options
         {case_insensitive: !PactBroker.configuration.use_case_sensitive_resource_names}
       end
+
+      def order_ignore_case column_name = :name
+        order(Sequel.function(:lower, column_name))
+      end
+
+      def mysql?
+        Sequel::Model.db.adapter_scheme.to_s =~ /mysql/
+      end
+
+      def select_for_subquery column
+        if mysql? #stoopid mysql doesn't allow subqueries
+          select(column).collect{ | it | it[column] }
+        else
+          select(column)
+        end
+      end
     end
   end
 end

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

@@ -33,6 +33,15 @@ module PactBroker
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
+        def any_webhooks?
+          @relationship.any_webhooks?
+        end
+
+        def webhooks_url
+          url = PactBroker::Api::PactBrokerUrls.webhooks_for_pact_url @relationship.latest_pact.consumer, @relationship.latest_pact.provider, ''
+          "/hal-browser/browser.html##{url}"
+        end
+
         def last_verified_date
           if @relationship.ever_verified?
             date = @relationship.latest_verification.execution_date

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

@@ -30,6 +30,8 @@
         %th
         %th
           Latest pact published
+        %th
+          Webhooks
         %th
           Last verified
       %tbody
@@ -49,6 +51,13 @@
           %td
           %td
             = relationship.publication_date_of_latest_pact
+          %td
+            - if relationship.any_webhooks?
+              %a{:href => relationship.webhooks_url}
+                Edit
+            - else
+              %a{:href => relationship.webhooks_url}
+                Create
           %td{class: relationship.verification_status, title: relationship.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left"}
             %div
               = relationship.last_verified_date

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/pact_broker/webhooks/execution.rb

@@ -0,0 +1,17 @@
+require 'sequel'
+
+module PactBroker
+  module Webhooks
+    class Execution < Sequel::Model(:webhook_executions)
+
+      associate(:many_to_one, :webhook, :class => "PactBroker::Webhooks::Webhook", :key => :webhook_id, :primary_key => :id)
+      associate(:many_to_one, :pact_publication, :class => "PactBroker::Pacts::PactPublication", :key => :pact_publication_id, :primary_key => :id)
+      associate(:many_to_one, :provider, :class => "PactBroker::Domain::Pacticipant", :key => :provider_id, :primary_key => :id)
+      associate(:many_to_one, :consumer, :class => "PactBroker::Domain::Pacticipant", :key => :consumer_id, :primary_key => :id)
+
+    end
+
+    Execution.plugin :timestamps
+
+  end
+end

data/lib/pact_broker/webhooks/repository.rb

@@ -3,7 +3,7 @@ require 'pact_broker/domain/webhook'
 require 'pact_broker/domain/pacticipant'
 require 'pact_broker/db'
 require 'pact_broker/webhooks/webhook'
-
+require 'pact_broker/webhooks/execution'
 
 module PactBroker
   module Webhooks
@@ -43,6 +43,24 @@ module PactBroker
         Webhook.where(consumer_id: consumer.id, provider_id: provider.id).collect(&:to_domain)
       end
 
+      def create_execution webhook, webhook_execution_result
+        db_webhook = Webhook.where(uuid: webhook.uuid).single_record
+        execution = Execution.create(
+          webhook: db_webhook,
+          consumer: db_webhook.consumer,
+          provider: db_webhook.provider,
+          success: webhook_execution_result.success?,
+          logs: webhook_execution_result.logs)
+      end
+
+      def delete_executions_by_pacticipant pacticipant
+        Execution.where(consumer: pacticipant).delete
+        Execution.where(provider: pacticipant).delete
+      end
+
+      def unlink_executions_by_webhook_uuid uuid
+        Execution.where(webhook: Webhook.where(uuid: uuid)).update(webhook_id: nil)
+      end
     end
   end
-end
+end

data/lib/pact_broker/webhooks/service.rb

@@ -31,6 +31,7 @@ module PactBroker
       end
 
       def self.delete_by_uuid uuid
+        webhook_repository.delete_executions_by_webhook_uuid uuid
         webhook_repository.delete_by_uuid uuid
       end
 
@@ -43,7 +44,9 @@ module PactBroker
       end
 
       def self.execute_webhook_now webhook
-        webhook.execute
+        webhook_execution_result = webhook.execute
+        webhook_repository.create_execution webhook, webhook_execution_result
+        webhook_execution_result
       end
 
       def self.find_by_consumer_and_provider consumer, provider

data/public/stylesheets/relationships.css

@@ -18,6 +18,7 @@ table#relationships {
 table#relationships td,
 table#relationships th {
   text-align: left;
+  vertical-align: middle
 }
 
 table#relationships th,

data/script/publish-2.sh

@@ -1,3 +1,4 @@
 curl -v -XPUT \-H "Content-Type: application/json" \
 -d@spec/fixtures/a_consumer-a_provider-2.json \
 http://localhost:9292/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1.0.1
+echo ""

data/script/publish-new.sh

@@ -7,3 +7,4 @@ curl -v -XPUT \-H "Content-Type: application/json" \
 -d@tmp.json \
 http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/${next_version}
 rm tmp.json
+echo ""

data/script/publish-not-a-pact.sh

@@ -1,3 +1,4 @@
 curl -v -XPUT \-H "Content-Type: application/json" \
 -d '[1]' \
 http://localhost:9292/pacts/provider/A%20Not%20Pact%20Provider/consumer/A%20Not%20Pact%20Consumer/version/1.0.0
+echo ""

data/script/publish.sh

@@ -1,3 +1,4 @@
 curl -v -XPUT \-H "Content-Type: application/json" \
 -d@script/foo-bar.json \
 http://127.0.0.1:9292/pacts/provider/Bar/consumer/Foo/version/1.0.0
+echo ""

data/script/record_verification.sh

@@ -1,3 +1,4 @@
 curl -v -XPOST \-H "Content-Type: application/json" \
 -d@spec/fixtures/record_verification.json \
 http://127.0.0.1:9292/pacts/provider/Animal%20Service/consumer/Zoo%20App/version/1.0.2/verifications
+echo ""

data/script/recreate-pg-db.sh

@@ -9,3 +9,5 @@ echo "export PACT_BROKER_DATABASE_USERNAME=pact_broker"
 echo "export PACT_BROKER_DATABASE_PASSWORD=pact_broker"
 echo "export PACT_BROKER_DATABASE_NAME=pact_broker"
 echo "export PACT_BROKER_DATABASE_HOST=${ip}"
+echo "To test:"
+echo "psql -h \$PACT_BROKER_DATABASE_HOST -d \$PACT_BROKER_DATABASE_NAME -U \$PACT_BROKER_DATABASE_USERNAME"

data/spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb

@@ -5,8 +5,13 @@ module PactBroker
   module Api
     module Contracts
       describe PutPactParamsContract do
+        before do
+          allow(PactBroker.configuration).to receive(:order_versions_by_date).and_return(order_versions_by_date)
+        end
+
         let(:json_content) { {'some' => 'json' }.to_json }
         let(:pact_params) { Pacts::PactParams.new(attributes) }
+        let(:order_versions_by_date) { false }
 
         let(:valid_attributes) do
           {
@@ -65,6 +70,21 @@ module PactBroker
             end
           end
 
+          context "when order_versions_by_date is true" do
+            let(:order_versions_by_date) { true }
+
+            context "with an invalid version number" do
+              let(:attributes) do
+                valid_attributes.merge(consumer_version_number: 'blah')
+              end
+
+              it "does not return an error" do
+                expect(subject.errors[:consumer_version_number]).to be_empty
+              end
+            end
+          end
+
+
           context "with a consumer name in the pact that does not match the consumer name in the path" do
             let(:attributes) do
               valid_attributes.merge(consumer_name: "another consumer")

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

@@ -8,7 +8,8 @@ module PactBroker
 
         describe "to_json" do
 
-          let(:webhook_execution_result) { PactBroker::Domain::WebhookExecutionResult.new(response, error)}
+          let(:webhook_execution_result) { PactBroker::Domain::WebhookExecutionResult.new(response, logs, error)}
+          let(:logs) { "logs" }
           let(:headers) { { "Something" => ["blah", "thing"]} }
           let(:response) { double('http_response', code: '200', body: response_body, to_hash: headers) }
           let(:response_body) { 'body' }

data/spec/lib/pact_broker/domain/order_versions_spec.rb

@@ -4,20 +4,22 @@ require 'pact_broker/domain/order_versions.rb'
 
 describe PactBroker::Domain::OrderVersions do
 
+  before do
+    allow(PactBroker.configuration).to receive(:order_versions_by_date).and_return(false)
+  end
   context "when order_versions_by_date is false (the default)" do
     before do
       ProviderStateBuilder.new
         .create_condor
-        .create_condor_version('1.3.0')
         .create_condor_version('1.5.0')
         .create_condor_version('1.4.0')
+        .create_condor_version('1.3.0')
         .create_condor_version('1.6.0')
     end
 
     let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
-    let(:condor) { PactBroker::Domain::Pacticipant.where(name: 'Condor').single_record }
 
-    it "orders the versions so they can be loaded from the database in order" do
+    it "orders the versions semantically" do
       expect(ordered_versions).to eq(['1.3.0', '1.4.0', '1.5.0', '1.6.0'])
     end
   end
@@ -27,15 +29,15 @@ describe PactBroker::Domain::OrderVersions do
       allow(PactBroker.configuration).to receive(:order_versions_by_date).and_return(true)
     end
     let(:consumer) { ProviderStateBuilder.new.create_consumer.and_return(:consumer) }
-    let!(:version_1) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '2', created_at: DateTime.new(2017)) }
-    let!(:version_2) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '1', created_at: DateTime.new(2017)) }
-    let!(:version_3) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '3', created_at: DateTime.new(2016)) }
-    let!(:version_4) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '4', created_at: DateTime.new(2018)) }
+    let!(:version_1) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '2') }
+    let!(:version_2) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '1') }
+    let!(:version_3) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '3') }
+    let!(:version_4) { PactBroker::Domain::Version.create(pacticipant_id: consumer.id, number: '4') }
 
     let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
 
-    it "orders by date, then id" do
-      expect(ordered_versions).to eq(['3', '2', '1', '4'])
+    it "orders by insertion order" do
+      expect(ordered_versions).to eq(['2', '1', '3', '4'])
     end
 
   end
@@ -53,12 +55,32 @@ describe PactBroker::Domain::OrderVersions do
 
     let(:ordered_versions) { PactBroker::Domain::Version.order(:order).all.collect(&:number) }
 
-    it "sorts the unparseable version as being first and maintains their relative order" do
-      Sequel::Model.db[:versions].where(number: '1').update(number: 'z')
-      Sequel::Model.db[:versions].where(number: '2').update(number: 'a')
-      Sequel::Model.db[:versions].where(number: '4').update(number: 'h')
-      PactBroker::Domain::Version.create(number: '5', pacticipant_id: consumer.id)
-      expect(ordered_versions).to eq(['z', 'a', 'h', '3', '5'])
+    context "when the new version is considered to be the latest" do
+      before do
+        Sequel::Model.db[:versions].where(number: '1').update(number: 'z')
+        Sequel::Model.db[:versions].where(number: '2').update(number: 'a')
+        Sequel::Model.db[:versions].where(number: '4').update(number: 'h')
+      end
+
+      it "just uses the next order number for the new version" do
+        PactBroker::Domain::Version.create(number: '5', pacticipant_id: consumer.id)
+        expect(ordered_versions).to eq(['z', 'a', '3', 'h', '5'])
+      end
+    end
+
+    context "when the new version is considered to be earlier than the previous latest version" do
+
+      before do
+        Sequel::Model.db[:versions].where(number: '2').update(number: 'z')
+        Sequel::Model.db[:versions].where(number: '3').update(number: 'a')
+      end
+
+      it "inserts the new version in the right place" do
+        # 1 z a 4
+        PactBroker::Domain::Version.create(number: '2', pacticipant_id: consumer.id)
+        expect(ordered_versions).to eq(['1', 'z', 'a', '2', '4'])
+      end
+
     end
   end
 

data/spec/lib/pact_broker/domain/version_spec.rb

@@ -21,6 +21,20 @@ module PactBroker
           expect(version.latest_pact_publication.id).to eq pact.id
         end
       end
+
+      describe "uq_ver_ppt_ord" do
+        let(:consumer) do
+          ProviderStateBuilder.new
+            .create_consumer
+            .and_return(:consumer)
+        end
+
+        it "does not allow two versions with the same pacticipant and order" do
+          Sequel::Model.db[:versions].insert(number: '1', order: 0, pacticipant_id: consumer.id, created_at: DateTime.new(2017), updated_at: DateTime.new(2017))
+          expect { Sequel::Model.db[:versions].insert(number: '2', order: 0, pacticipant_id: consumer.id, created_at: DateTime.new(2017), updated_at: DateTime.new(2017)) }
+            .to raise_error(Sequel::UniqueConstraintViolation)
+        end
+      end
     end
   end
 end

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -12,12 +12,14 @@ module PactBroker
       let(:password) { nil }
       let(:url) { 'http://example.org/hook' }
       let(:body) { 'body' }
+      let(:logs) { StringIO.new }
+      let(:execution_logger) { Logger.new(logs) }
 
       subject do
         WebhookRequest.new(
           method: 'post',
           url: url,
-          headers: {'Content-type' => 'text/plain'},
+          headers: {'Content-Type' => 'text/plain'},
           username: username,
           password: password,
           body: body)
@@ -48,7 +50,7 @@ module PactBroker
         let!(:http_request) do
           stub_request(:post, "http://example.org/hook").
             with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').
-            to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+            to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
         end
 
         it "executes the configured request" do
@@ -70,6 +72,47 @@ module PactBroker
           subject.execute
         end
 
+        describe "execution logs" do
+          before do
+
+          end
+
+          let(:logs) { subject.execute.logs }
+
+          it "logs the request method and path" do
+            expect(logs).to include "POST http://example.org/hook"
+          end
+
+          it "logs the request headers" do
+            expect(logs).to include "Content-Type: text/plain"
+          end
+
+          it "logs the request body" do
+            expect(logs).to include body
+          end
+
+          it "logs the response status" do
+            expect(logs).to include "HTTP/1.0 302"
+          end
+
+          it "logs the response headers" do
+            expect(logs).to include "Content-Type: text/foo, blah"
+          end
+
+          it "logs the response body" do
+            expect(logs).to include "respbod"
+          end
+
+          context "with basic auth" do
+            let(:username) { 'username' }
+            let(:password) { 'password' }
+
+            it "logs the username and a starred password" do
+              expect(logs).to include "POST http://username:**********@example.org/hook"
+            end
+          end
+        end
+
         context "when a username and password are specified" do
 
           let(:username) { 'username' }
@@ -81,7 +124,7 @@ module PactBroker
                 basic_auth: [username, password],
                 :headers => {'Content-Type'=>'text/plain'},
                 :body => 'body').
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "uses the credentials" do
@@ -97,7 +140,7 @@ module PactBroker
             # webmock will set the request signature scheme to 'https' _only_ if the use_ssl option is set
             stub_request(:post, "https://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => 'body').
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "uses SSL" do
@@ -112,7 +155,7 @@ module PactBroker
           let!(:http_request) do
             stub_request(:post, "http://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => body.to_json).
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "converts the body to JSON before submitting the request" do
@@ -127,7 +170,7 @@ module PactBroker
           let!(:http_request) do
             stub_request(:post, "http://example.org/hook").
               with(:headers => {'Content-Type'=>'text/plain'}, :body => nil).
-              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/plain, blah'})
+              to_return(:status => 302, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
           end
 
           it "executes the request without a body" do