pact_broker 2.35.0 → 2.36.0

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

@@ -5,7 +5,6 @@ module PactBroker
   module Api
     module Decorators
       describe PactDecorator do
-
         before do
           allow(decorator).to receive(:templated_diff_url).and_return('templated-diff-url')
           allow(decorator).to receive(:verification_publication_url).and_return('verification-publication-url')
@@ -25,7 +24,9 @@ module PactBroker
           content_hash: content_hash,
           created_at: created_at,
           consumer: consumer,
+          consumer_name: consumer.name,
           provider: provider,
+          provider_name: provider.name,
           consumer_version: consumer_version,
           consumer_version_number: '1234',
           pact_version_sha: '9999',

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

@@ -19,7 +19,8 @@ module PactBroker
             build_url: 'http://build-url',
             pact_version_sha: '1234',
             latest_pact_publication: pact_publication,
-            execution_date: DateTime.now)
+            execution_date: DateTime.now,
+            provider_version_tags: provider_version_tags)
         end
 
         let(:pact_publication) do
@@ -31,6 +32,8 @@ module PactBroker
           )
         end
 
+        let(:provider_version_tags) { [instance_double(PactBroker::Tags::TagWithLatestFlag, name: 'prod', latest?: true)] }
+
         let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
         let(:json) { VerificationDecorator.new(verification).to_json(options) }

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

@@ -20,12 +20,14 @@ module PactBroker
             pact_version_sha: '1234',
             latest_pact_publication: pact,
             test_results: nil,
-            execution_date: DateTime.now)
+            execution_date: DateTime.now,
+            provider_version_tags: provider_version_tags)
         end
         let(:pact_version) do
           instance_double("PactBroker::Pacts::PactVersion", name: 'Name')
         end
 
+        let(:provider_version_tags) { [instance_double(PactBroker::Tags::TagWithLatestFlag, name: 'prod', latest?: true)] }
         let(:pact) { instance_double("PactBroker::Domain::Pact", name: "Some pact", consumer_name: "Foo", provider_name: "Bar", consumer_version_number: "1.2.3") }
         let(:options) { {base_url: 'http://example.org', consumer_name: "Foo", consumer_version_number: "1.2.3", resource_url: "http://self"} }
 

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

@@ -233,10 +233,35 @@ module PactBroker
 
           let(:options) { { tags: true } }
 
-          it "returns the latest of the feat-x and feat-y verifications" do
-            expect(rows.last.consumer_version_number).to eq "3"
-            expect(rows.last.tag_names.sort).to eq ["feat-x", "feat-y"]
-            expect(rows.last.provider_version_number).to eq "2"
+          context "with tags=true" do
+            it "returns the tags for the pacts" do
+              expect(rows.last.tag_names.sort).to eq ["feat-x", "feat-y"]
+            end
+          end
+
+          context "with tags=false" do
+            let(:options) { { tags: false } }
+
+            it "does not return the tags for the pacts" do
+              expect(rows.last.tag_names.sort).to eq []
+            end
+          end
+
+          context "with dashboard=true" do
+            let(:options) { { dashboard: true } }
+
+            it "returns the latest verification as nil as the pact version itself has not been verified" do
+              expect(rows.last.provider_version_number).to be nil
+            end
+          end
+
+          context "with dashboard=false" do
+            let(:options) { { } }
+
+            it "returns the latest of the feat-x and feat-y verifications because we are summarising the entire integration (backwards compat for OSS index)" do
+              expect(rows.last.consumer_version_number).to eq "4"
+              expect(rows.last.provider_version_number).to eq "2"
+            end
           end
         end
       end

data/spec/lib/pact_broker/matrix/aggregated_row_spec.rb

@@ -3,7 +3,7 @@ require 'pact_broker/matrix/aggregated_row'
 module PactBroker
   module Matrix
     describe AggregatedRow do
-      describe "latest_verification" do
+      describe "latest_verification_for_pseudo_branch" do
         let(:row_1) do
           instance_double('PactBroker::Matrix::HeadRow',
             consumer_name: "Foo",
@@ -27,7 +27,7 @@ module PactBroker
         let(:rows) { [row_1, row_2] }
         let(:aggregated_row) { AggregatedRow.new(rows) }
 
-        subject { aggregated_row.latest_verification }
+        subject { aggregated_row.latest_verification_for_pseudo_branch }
 
         context "when the rows have verifications" do
           it "returns the verification with the largest id" do
@@ -74,6 +74,27 @@ module PactBroker
           end
         end
       end
+
+      describe "latest_verification_for_pact_version" do
+        let(:row_1) do
+          instance_double('PactBroker::Matrix::HeadRow',
+            verification: verification_1)
+        end
+        let(:row_2) do
+          instance_double('PactBroker::Matrix::HeadRow',
+            verification: verification_2)
+        end
+        let(:verification_1) { instance_double('PactBroker::Domain::Verification', id: 2) }
+        let(:verification_2) { instance_double('PactBroker::Domain::Verification', id: 1) }
+        let(:rows) { [row_1, row_2] }
+        let(:aggregated_row) { AggregatedRow.new(rows) }
+
+        subject { aggregated_row.latest_verification_for_pact_version }
+
+        it "returns the verification with the largest id" do
+          expect(subject.id).to eq 2
+        end
+      end
     end
   end
 end

data/spec/lib/pact_broker/matrix/deployment_status_summary_spec.rb

@@ -190,6 +190,8 @@ module PactBroker
               pacticipant_name: "Bar",
               pacticipant_version_id: 10,
               pacticipant_version_number: "14131c5da3abf323ccf410b1b619edac76231243",
+              pact_publication_ids: [],
+              verification_ids: [],
               latest: nil,
               tag: nil,
               type: :inferred

data/spec/lib/pact_broker/matrix/repository_query_limit_spec.rb

@@ -0,0 +1,44 @@
+require 'pact_broker/matrix/repository'
+
+module PactBroker
+  module Matrix
+    describe Repository do
+      # See https://github.com/pact-foundation/pact_broker-client/issues/53
+      # The problem occurs when a pact has so many verifications for the same provider
+      # version that relevant rows do get returned in the result set because the specified limit
+      # causes them to be truncated.
+      # The most elegant solution is to create views have the data already grouped by
+      # consumer version/provider version, consumer version/provider, and consumer/provider,
+      # however, I don't have the time to work out how to make that view query efficient - I suspect
+      # it will require lots of full table scans, as it will have to work out the latest pact revision
+      # and latest verification for each pact publication and I'm not sure if it will have to do it
+      # for the entire table, or whether it will apply the consumer/provider filters...
+      # The quick and dirty solution is to do a pre-query to get the latest pact revision and latest
+      # verifications for the pact versions before we do the matrix query.
+      describe "Querying for can-i-deploy when there are more matrix rows than the specified query limit" do
+        before do
+          td.create_consumer("Foo")
+            .create_provider("Bar")
+            .create_consumer_version("1")
+            .create_pact
+            .create_verification(number: 1, provider_version: "2", tag_names: ['staging'])
+            .create_verification(number: 2, provider_version: "2")
+            .create_verification(number: 3, provider_version: "2")
+            .create_verification(number: 4, provider_version: "2")
+            .create_verification(number: 5, provider_version: "3")
+            .create_provider("Wiffle")
+            .create_pact
+            .create_verification(number: 1, provider_version: "6", tag_names: ['staging'])
+        end
+
+        let(:path) { "/matrix?q[][pacticipant]=Foo&q[][version]=1&tag=staging&latestby=cvp&limit=2" }
+
+        subject { get(path) }
+
+        it "does not remove relevant rows from the query due to the specified limit" do
+          expect(JSON.parse(subject.body)['summary']['deployable']).to be true
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/pacts/pact_publication_spec.rb

@@ -64,7 +64,25 @@ module PactBroker
         end
       end
 
-      describe "#latest_tag_names" do
+      describe "#consumer_version_tags" do
+        before do
+          td.create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+            .create_consumer_version_tag("no")
+            .create_consumer_version("3.4.5")
+            .create_consumer_version_tag("yes")
+            .create_pact
+            .create_consumer_version("5.6.7")
+            .create_consumer_version_tag("no")
+        end
+
+        let(:pact_publication) { PactPublication.find(id: td.pact.id) }
+
+        it "" do
+          expect(pact_publication.consumer_version_tags.collect(&:name)).to eq ["yes"]
+        end
+      end
+
+      describe "#head_tag_names" do
         before do
           td.create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
             .create_consumer_version_tag("no")
@@ -80,13 +98,13 @@ module PactBroker
 
         context "when the pact is the latest for a tag" do
           it "returns the relevant tag names" do
-            expect(pact_publication.latest_tag_names).to eq ["yes"]
+            expect(pact_publication.head_tag_names).to eq ["yes"]
           end
         end
 
         context "when the pact is not the latest for a tag" do
           it "returns the relevant tag names" do
-            expect(pact_publication.latest_tag_names).to eq ["yes"]
+            expect(pact_publication.head_tag_names).to eq ["yes"]
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.36.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -784,6 +784,8 @@ files:
 - lib/pact_broker/api/decorators/embedded_label_decorator.rb
 - lib/pact_broker/api/decorators/embedded_tag_decorator.rb
 - lib/pact_broker/api/decorators/embedded_version_decorator.rb
+- lib/pact_broker/api/decorators/extended_pact_decorator.rb
+- lib/pact_broker/api/decorators/extended_verification_decorator.rb
 - lib/pact_broker/api/decorators/format_date_time.rb
 - lib/pact_broker/api/decorators/integration_decorator.rb
 - lib/pact_broker/api/decorators/integrations_decorator.rb
@@ -838,10 +840,12 @@ files:
 - lib/pact_broker/api/resources/latest_pact.rb
 - lib/pact_broker/api/resources/latest_pacts.rb
 - lib/pact_broker/api/resources/latest_provider_pacts.rb
+- lib/pact_broker/api/resources/latest_verification_for_pact.rb
 - lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb
 - lib/pact_broker/api/resources/matrix.rb
 - lib/pact_broker/api/resources/matrix_badge.rb
 - lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb
+- lib/pact_broker/api/resources/metrics.rb
 - lib/pact_broker/api/resources/pact.rb
 - lib/pact_broker/api/resources/pact_content_diff.rb
 - lib/pact_broker/api/resources/pact_triggered_webhooks.rb
@@ -974,6 +978,7 @@ files:
 - lib/pact_broker/matrix/row.rb
 - lib/pact_broker/matrix/service.rb
 - lib/pact_broker/messages.rb
+- lib/pact_broker/metrics/service.rb
 - lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb
 - lib/pact_broker/pacticipants/repository.rb
 - lib/pact_broker/pacticipants/service.rb
@@ -1194,6 +1199,7 @@ files:
 - spec/features/get_latest_tagged_pact_spec.rb
 - spec/features/get_latest_untagged_pact_badge_spec.rb
 - spec/features/get_latest_untagged_pact_spec.rb
+- spec/features/get_latest_verification_for_pact_spec.rb
 - spec/features/get_matrix_badge_spec.rb
 - spec/features/get_matrix_for_consumer_and_provider_spec.rb
 - spec/features/get_matrix_spec.rb
@@ -1213,6 +1219,7 @@ files:
 - spec/features/get_wip_provider_pacts_spec.rb
 - spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
+- spec/features/metrics_spec.rb
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
@@ -1256,6 +1263,7 @@ files:
 - spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/extended_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/integration_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/integrations_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
@@ -1353,6 +1361,7 @@ files:
 - spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_dependency_spec.rb
+- spec/lib/pact_broker/matrix/repository_query_limit_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb
@@ -1546,6 +1555,7 @@ test_files:
 - spec/features/get_latest_tagged_pact_spec.rb
 - spec/features/get_latest_untagged_pact_badge_spec.rb
 - spec/features/get_latest_untagged_pact_spec.rb
+- spec/features/get_latest_verification_for_pact_spec.rb
 - spec/features/get_matrix_badge_spec.rb
 - spec/features/get_matrix_for_consumer_and_provider_spec.rb
 - spec/features/get_matrix_spec.rb
@@ -1565,6 +1575,7 @@ test_files:
 - spec/features/get_wip_provider_pacts_spec.rb
 - spec/features/label_pacticipant_spec.rb
 - spec/features/merge_pact_spec.rb
+- spec/features/metrics_spec.rb
 - spec/features/publish_not_a_pact_spec.rb
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
@@ -1608,6 +1619,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/extended_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/integration_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/integrations_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
@@ -1705,6 +1717,7 @@ test_files:
 - spec/lib/pact_broker/matrix/integration_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_dependency_spec.rb
+- spec/lib/pact_broker/matrix/repository_query_limit_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb