pact_broker 2.27.2 → 2.27.3

data/lib/pact_broker/verifications/service.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/repositories'
 require 'pact_broker/api/decorators/verification_decorator'
 require 'pact_broker/verifications/summary_for_consumer_version'
+require 'pact_broker/logging'
 
 module PactBroker
 
@@ -11,13 +12,14 @@ module PactBroker
 
       extend PactBroker::Repositories
       extend PactBroker::Services
+      include PactBroker::Logging
 
       def next_number
         verification_repository.next_number
       end
 
       def create next_verification_number, params, pact
-        PactBroker.logger.info "Creating verification #{next_verification_number} for pact_id=#{pact.id} from params #{params}"
+        logger.info "Creating verification #{next_verification_number} for pact_id=#{pact.id} from params #{params}"
         verification = PactBroker::Domain::Verification.new
         provider_version_number = params.fetch('providerApplicationVersion')
         PactBroker::Api::Decorators::VerificationDecorator.new(verification).from_hash(params)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.27.2'
+  VERSION = '2.27.3'
 end

data/lib/pact_broker/versions/repository.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'pact_broker/logging'
 require 'pact_broker/domain/version'
 require 'pact_broker/tags/repository'
 
@@ -6,6 +7,7 @@ module PactBroker
   module Versions
     class Repository
 
+      include PactBroker::Logging
       include PactBroker::Repositories::Helpers
 
       def find_by_pacticipant_id_and_number pacticipant_id, number
@@ -53,7 +55,7 @@ module PactBroker
 
       # There may be a race condition if two simultaneous requests come in to create the same version
       def create args
-        PactBroker.logger.info "Upserting version #{args[:number]} for pacticipant_id=#{args[:pacticipant_id]}"
+        logger.info "Upserting version #{args[:number]} for pacticipant_id=#{args[:pacticipant_id]}"
         version_params = {
           number: args[:number],
           pacticipant_id: args[:pacticipant_id],

data/lib/pact_broker/webhooks/job.rb

@@ -8,6 +8,7 @@ module PactBroker
 
       include SuckerPunch::Job
       include PactBroker::Logging
+      include PactBroker::Logging
 
       def perform data
         @data = data

data/pact_broker.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rack-protection', '~>2.0'
   gem.add_runtime_dependency 'dry-types', '~> 0.10.3' # https://travis-ci.org/pact-foundation/pact_broker/jobs/249448621
   gem.add_runtime_dependency 'table_print', '~> 1.5'
+  gem.add_runtime_dependency 'semantic_logger', '~> 4.3'
 
   gem.add_development_dependency 'pact', '~>1.14'
   gem.add_development_dependency 'rspec-pact-matchers', '~>0.1'

data/script/db-spec.sh

@@ -12,3 +12,5 @@ rake_exit_code=$?
 if [ $rake_exit_code -ne 0 ] && [ -n "$TRAVIS" ]; then
   cat log/pact_broker.log
 fi
+
+exit $rake_exit_code

data/spec/features/delete_tagged_pact_versions_spec.rb

@@ -0,0 +1,28 @@
+describe "Deleting tagged pact versions" do
+
+  let(:path) { "/pacts/provider/Bar/consumer/Foo/tag/prod" }
+
+  subject { delete(path)  }
+
+  context "when the pact exists" do
+    before do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .create_consumer_version_tag("prod")
+    end
+
+    it "deletes the pact" do
+      expect{ subject }.to change{ PactBroker::Pacts::PactPublication.count }.by(-1)
+    end
+
+    it "returns a 204" do
+      expect(subject.status).to be 204
+    end
+  end
+
+  context "when the pact does not exist" do
+    it "returns a 404 Not Found" do
+      expect(subject.status).to be 404
+    end
+  end
+end

data/spec/features/get_tagged_pact_versions_spec.rb

@@ -0,0 +1,26 @@
+describe "retrieving tagged pact versions" do
+
+  let(:path) { "/pacts/provider/Provider/consumer/Consumer/tag/prod"}
+
+  subject { get(path) }
+  let(:json_response_body) { JSON.parse(subject.body) }
+
+  before do
+    TestDataBuilder.new
+      .create_consumer("Consumer")
+      .create_provider("Provider")
+      .create_consumer_version("1.2.3")
+      .create_consumer_version_tag("prod")
+      .create_pact
+      .create_consumer_version("4.5.6")
+      .create_pact
+  end
+
+  it "returns a 200 HAL JSON response" do
+    expect(subject).to be_a_hal_json_success_response
+  end
+
+  it "returns the list of tagged pact versions" do
+    expect(json_response_body['_links']['pb:pact-versions']).to be_a Array
+  end
+end

data/spec/integration/ui/index_spec.rb

@@ -22,14 +22,14 @@ describe "UI index" do
     end
 
     it "returns a table of pacts" do
-      expect(subject.body.scan('<tr').to_a.count).to eq 1
+      expect(subject.body.scan('<tr').to_a.count).to eq 2
     end
 
     context "with an array of tags" do
       let(:params) { { tags: ['prod'] } }
 
       it "returns a table of pacts with the specfied tags" do
-        expect(subject.body.scan('<tr').to_a.count).to eq 2
+        expect(subject.body.scan('<tr').to_a.count).to eq 3
       end
     end
   end

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

@@ -2,11 +2,8 @@ require 'spec_helper'
 require 'pact_broker/api/decorators/pact_version_decorator'
 
 module PactBroker
-
   module Api
-
     module Decorators
-
       describe PactVersionDecorator do
 
         let(:json_content) {

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

@@ -0,0 +1,79 @@
+require 'pact_broker/api/decorators/tagged_pact_versions_decorator'
+
+module PactBroker
+  module Api
+    module Decorators
+      describe TaggedPactVersionsDecorator do
+        before do
+          allow(PactBroker::Api::Decorators::PactVersionDecorator).to receive(:new).and_return(_version_decorator)
+          allow_any_instance_of(TaggedPactVersionsDecorator).to receive(:pact_url).and_return('pact_url')
+          allow_any_instance_of(TaggedPactVersionsDecorator).to receive(:pacticipant_url).and_return('pacticipant_url')
+          allow_any_instance_of(TaggedPactVersionsDecorator).to receive(:pacticipant_url).and_return('pacticipant_url')
+        end
+
+        let(:user_options) do
+          register_fixture(:tagged_pact_versions_decorator_user_options) do
+            {
+              base_url: "http://example.org",
+              resource_url: "http://example.org/pacts/provider/Bar/consumer/Foo/tag/prod",
+              consumer_name: "Foo",
+              provider_name: "Bar",
+              tag: "prod"
+            }
+          end
+        end
+
+        let(:_version_decorator) do
+          instance_double(PactBroker::Api::Decorators::VersionDecorator, to_hash: { some: "pact" } )
+        end
+        let(:pact_versions) { [pact_version] }
+        let(:pact_version) do
+          instance_double("PactBroker::Domain::Pact").as_null_object
+        end
+
+        let(:decorator) { TaggedPactVersionsDecorator.new(pact_versions) }
+        let(:json) { decorator.to_json(user_options: user_options) }
+        subject { JSON.parse(json) }
+
+        let(:expected) do
+          {
+           "_embedded" => {
+             "pacts" => [
+               {
+                 "some" => "pact"
+               }
+             ]
+           },
+           "_links" => {
+             "self" => {
+               "href" => "http://example.org/pacts/provider/Bar/consumer/Foo/tag/prod",
+               "title" => "All versions of the pact between Foo and Bar with tag prod"
+             },
+             "pb:consumer" => {
+               "href" => "pacticipant_url",
+               "title" => "Consumer",
+               "name" => "Foo"
+             },
+             "pb:provider" => {
+               "href" => "pacticipant_url",
+               "title" => "Provider",
+               "name" => "Bar"
+             },
+             "pb:pact-versions" => [
+               {
+                 "href" => "pact_url",
+                 "title" => "Pact version",
+                 "name" => "#[InstanceDouble(PactBroker::Domain::Pact) (anonymous)]"
+               }
+             ]
+           }
+          }
+        end
+
+        it "matches the expected JSON" do
+          expect(subject).to match_pact(expected, allow_unexpected_keys: false)
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb

@@ -11,6 +11,8 @@ module PactBroker
           ENV['BACKUP_TZ'] = ENV['TZ']
           ENV['TZ'] = "Australia/Melbourne"
           PactBroker.configuration.enable_public_badge_access = true
+          allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).with('', pact).and_return(pact_url)
+          allow_any_instance_of(HtmlPactRenderer).to receive(:logger).and_return(logger)
 
           Timecop.freeze(created_at + 3)
         end
@@ -32,10 +34,7 @@ module PactBroker
             badge_url: 'http://badge'
            }
         end
-
-        before do
-          allow(PactBroker::Api::PactBrokerUrls).to receive(:pact_url).with('', pact).and_return(pact_url)
-        end
+        let(:logger) { double('logger').as_null_object }
 
         subject { HtmlPactRenderer.call pact, options }
 
@@ -95,8 +94,8 @@ module PactBroker
             end
 
             it "logs a warning" do
-              allow(PactBroker.logger).to receive(:warn).with(/Error/)
-              expect(PactBroker.logger).to receive(:warn).with(/Could not parse/)
+              allow(logger).to receive(:warn).with(/Error/)
+              expect(logger).to receive(:warn).with(/Could not parse/)
               subject
             end
           end

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

@@ -5,6 +5,12 @@ module PactBroker
     module Resources
       describe ErrorHandler do
         describe "call" do
+
+          before do
+            allow(ErrorHandler).to receive(:logger).and_return(logger)
+          end
+
+          let(:logger) { double('logger').as_null_object }
           let(:error) { StandardError.new('test error') }
           let(:thing) { double('thing', call: nil, another_call: nil) }
           let(:options) { { env: env } }
@@ -91,7 +97,7 @@ module PactBroker
             end
 
             it "logs the error" do
-              expect(PactBroker.logger).to receive(:error).at_least(1).times
+              expect(logger).to receive(:error).at_least(1).times
               subject
             end
 

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

@@ -0,0 +1,88 @@
+require 'pact_broker/api/resources/tagged_pact_versions'
+
+module PactBroker
+  module Api
+    module Resources
+      describe TaggedPactVersions do
+        include_context "stubbed services"
+
+        before do
+          allow(pacticipant_service).to receive(:find_pacticipant_by_name).with("Foo").and_return(consumer)
+          allow(pacticipant_service).to receive(:find_pacticipant_by_name).with("Bar").and_return(provider)
+        end
+
+        let(:path) { "/pacts/provider/Bar/consumer/Foo/tag/prod" }
+        let(:consumer) { double('Bar') }
+        let(:provider) { double('Foo') }
+
+        context "GET" do
+          before do
+            allow(PactBroker::Api::Decorators::TaggedPactVersionsDecorator).to receive(:new).and_return(decorator)
+            allow(pact_service).to receive(:find_all_pact_versions_between).and_return(pact_versions)
+          end
+
+          let(:decorator) { instance_double(PactBroker::Api::Decorators::TaggedPactVersionsDecorator, to_json: 'json') }
+          let(:pact_versions) { double('pacts') }
+
+          subject { get(path) }
+
+          let(:user_options) do
+            register_fixture(:tagged_pact_versions_decorator_user_options) do
+              {
+                base_url: "http://example.org",
+                resource_url: "http://example.org/pacts/provider/Bar/consumer/Foo/tag/prod",
+                consumer_name: "Foo",
+                provider_name: "Bar",
+                tag: "prod"
+              }
+            end
+          end
+
+          it "finds all the pacts with the given consumer/provider/tag" do
+            expect(pact_service).to receive(:find_all_pact_versions_between).with("Foo", and: "Bar", tag: "prod")
+            subject
+          end
+
+          it "returns a 200 OK hal+json response" do
+            expect(subject).to be_a_hal_json_success_response
+          end
+
+          it "creates a JSON representation of the pact versions" do
+            expect(PactBroker::Api::Decorators::TaggedPactVersionsDecorator).to receive(:new).with(pact_versions)
+            expect(decorator).to receive(:to_json).with(user_options: hash_including(user_options))
+            subject
+          end
+
+          it "returns the JSON representation of the pact versions" do
+            expect(subject.body).to eq 'json'
+          end
+
+          context "with the consumer or provider do not exist" do
+            let(:consumer) { nil }
+
+            it "returns a 404" do
+              expect(subject).to be_a_404_response
+            end
+          end
+        end
+
+        context "DELETE" do
+          before do
+            allow(pact_service).to receive(:delete_all_pact_versions_between)
+          end
+
+          subject { delete(path) }
+
+          it "deletes all the pacts with the given consumer/provider/tag" do
+            expect(pact_service).to receive(:delete_all_pact_versions_between).with("Foo", and: "Bar", tag: "prod")
+            subject
+          end
+
+          it "returns a 204" do
+            expect(subject.status).to eq 204
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module PactBroker
         let(:label) { nil }
         let(:initials) { false }
         let(: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" }
@@ -24,6 +24,7 @@ module PactBroker
 
         before do
           Service.clear_cache
+          allow(Service).to receive(:logger).and_return(logger)
         end
 
         it "returns the svg file" do
@@ -224,7 +225,7 @@ module PactBroker
           end
 
           it "logs the error" do
-            expect(PactBroker.logger).to receive(:error).with(/Error retrieving badge from.*shield.*an error/)
+            expect(logger).to receive(:error).with(/Error retrieving badge from.*shield.*an error/)
             subject
           end
 

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

@@ -4,6 +4,11 @@ module PactBroker
   module Certificates
     describe Service do
       let(:certificate_content) { File.read('spec/fixtures/certificate.pem') }
+      let(:logger) { double('logger').as_null_object }
+
+      before do
+        allow(Service).to receive(:logger).and_return(logger)
+      end
 
       describe "#cert_store" do
         subject { Service.cert_store }
@@ -19,7 +24,7 @@ module PactBroker
           end
 
           it "logs the error" do
-            expect(PactBroker.logger).to receive(:error).with(/Error adding certificate/).at_least(1).times
+            expect(Service).to receive(:log_error).with(anything, /Error adding certificate/).at_least(1).times
             subject
           end
 
@@ -46,7 +51,7 @@ module PactBroker
           let(:certificate_content) { File.read('spec/fixtures/certificates/cacert.pem') }
 
           it "returns all the X509 Certificate objects" do
-            expect(PactBroker.logger).to_not receive(:error).with(/Error.*1234/)
+            expect(logger).to_not receive(:error).with(/Error.*1234/)
             expect(subject.size).to eq 1
           end
         end
@@ -55,7 +60,7 @@ module PactBroker
           let(:certificate_content) { File.read('spec/fixtures/certificate-invalid.pem') }
 
           it "logs an error" do
-            expect(PactBroker.logger).to receive(:error).with(/Error.*1234/)
+            expect(logger).to receive(:error).with(/Error.*1234/)
             subject
           end