pact_broker 2.26.0 → 2.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e43696e1c9a252d26f05be46f19e7f910cd650
-  data.tar.gz: bbb46247b66bd65e71050febede804ccd1ef864c
+  metadata.gz: d3741742cfc8f29b64fd8bde01c62c9bdf445b9c
+  data.tar.gz: 204bd0c2317882a9ce4c50d0cfab2cb9829278ea
 SHA512:
-  metadata.gz: 2ff7ce9c2676c8f7331ba593a14eeb8f1533e9317be37b85d8ecb3cc8d2d009286f340894161d1a1419361f03133cf8cf551d6f4f87c13e453cac3c6068df0ea
-  data.tar.gz: 23dc70cc6b048b29b8a577d41e2fadbaf7bba02d0f82c3f3f5d7c7c7ac5d6a0cd4abbc19578aa70148a6e817d9b1ff8667c5f9614662c75a4f0f4703ff4dfccd
+  metadata.gz: 591321838ff5732fb86fd4383ce4a603cd6f7f35c6337a1554343675c2d33d03bb80481eab609eec311d6e4a79f78961aa027cdf51100d7cb6f3b8a8949e255a
+  data.tar.gz: aa3ebf059c8d4d0bfb04ffb13c8da4380596c8bbe532daecea1efdcaecff28a1da2546de0567493ce8e06a2799e6899400a90c86214bb493ce89851ca74ff3ae

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="v2.26.1"></a>
+### v2.26.1 (2018-09-07)
+
+
+#### Features
+
+* allow integrations to be exported in dot format (text/vnd.graphviz)	 ([ac609081](/../../commit/ac609081))
+* eager load latest version for /pacticipants resource	 ([9ac2ba9b](/../../commit/9ac2ba9b))
+* eager load pacticipant labels for /pacticipants resource	 ([01dd8669](/../../commit/01dd8669))
+
+
+#### Bug Fixes
+
+* **matrix**
+  * gracefully handle and log when version is unresolved	 ([82fe19f1](/../../commit/82fe19f1))
+
+* gracefully handle attempt to create a duplicate tag	 ([53bea8b4](/../../commit/53bea8b4))
+* correct :false to false in verification decorator to correctly handle read only property providerName	 ([4af4ed1c](/../../commit/4af4ed1c))
+* gracefully handle scenario where URL supplied in JSON body is not a String	 ([b0bb6044](/../../commit/b0bb6044))
+
+
 <a name="v2.26.0"></a>
 ### v2.26.0 (2018-08-23)
 

data/db/migrations/20180828_create_latest_versions.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    latest_version_orders = from(:versions)
+                              .select_group(:pacticipant_id)
+                              .select_append{ max(order).as(latest_version_order) }
+
+    create_or_replace_view(:latest_version_orders, latest_version_orders)
+
+    join = {
+      Sequel[:versions][:pacticipant_id] => Sequel[:latest_version_orders][:pacticipant_id],
+      Sequel[:versions][:order] => Sequel[:latest_version_orders][:latest_version_order]
+    }
+
+    latest_versions = from(:versions)
+      .select(Sequel[:versions].*)
+      .join(:latest_version_orders, join)
+
+    create_or_replace_view(:latest_versions, latest_versions)
+  end
+
+  down do
+    drop_view(:latest_version_orders)
+    drop_view(:latest_versions)
+  end
+end

data/lib/pact_broker/api.rb

@@ -83,6 +83,8 @@ module PactBroker
 
         add ['dashboard'], Api::Resources::Dashboard, {resource_name: "dashboard"}
         add ['test','error'], Api::Resources::ErrorTest, {resource_name: "error_test"}
+
+        add ['integrations'], Api::Resources::Integrations, {resource_name: "integrations"}
         add [], Api::Resources::Index, {resource_name: "index"}
       end
     end

data/lib/pact_broker/api/contracts/request_validations.rb

@@ -25,7 +25,7 @@ module PactBroker
 
         def uri
           URI(url)
-        rescue URI::InvalidURIError
+        rescue URI::InvalidURIError, ArgumentError
           nil
         end
       end

data/lib/pact_broker/api/contracts/verification_contract.rb

@@ -21,7 +21,7 @@ module PactBroker
 
             def valid_url? url
               URI(url)
-            rescue URI::InvalidURIError
+            rescue URI::InvalidURIError, ArgumentError
               nil
             end
 

data/lib/pact_broker/api/contracts/webhook_contract.rb

@@ -109,8 +109,8 @@ module PactBroker
               def valid_url?(url)
                 uri = parse_uri(url)
                 uri.scheme && uri.host
-              rescue URI::InvalidURIError
-                false
+              rescue URI::InvalidURIError, ArgumentError
+                nil
               end
 
               def allowed_webhook_method?(http_method)

data/lib/pact_broker/api/decorators/verification_decorator.rb

@@ -5,7 +5,7 @@ module PactBroker
     module Decorators
       class VerificationDecorator < BaseDecorator
 
-        property :provider_name, as: :providerName, writeable: :false
+        property :provider_name, as: :providerName, writeable: false
         property :provider_version_number, as: :providerApplicationVersion, writeable: false
         property :success
         property :execution_date, as: :verificationDate

data/lib/pact_broker/api/renderers/integrations_dot_renderer.rb

@@ -0,0 +1,36 @@
+module PactBroker
+  module Api
+    module Renderers
+      class IntegrationsDotRenderer
+        def initialize(integrations)
+          @integrations = integrations
+        end
+
+        def self.call(integrations)
+          new(integrations).call
+        end
+
+        def call
+          "digraph { ranksep=3; ratio=auto; overlap=false; node [  shape = plaintext, fontname = Helvetica ];
+#{integrations_graph}
+}
+"
+        end
+
+        private
+
+        attr_reader :integrations
+
+        def integrations_graph
+          integrations
+            .collect{ | integration| "  #{escape_name(integration.consumer_name)} -> #{escape_name(integration.provider_name)}" }
+            .join("\n")
+        end
+
+        def escape_name(name)
+          name.gsub(" ", "_")
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/index.rb

@@ -83,6 +83,11 @@ module PactBroker
               title: 'Webhooks',
               templated: false
             },
+            'pb:integrations' => {
+              href: base_url + '/integrations',
+              title: 'Integrations',
+              templated: false
+            },
             'beta:pending-provider-pacts' =>
             {
               href: base_url + '/pacts/provider/{provider}/pending',

data/lib/pact_broker/api/resources/integrations.rb

@@ -0,0 +1,26 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/renderers/integrations_dot_renderer'
+
+module PactBroker
+  module Api
+    module Resources
+      class Integrations < BaseResource
+        def content_types_provided
+          [["text/vnd.graphviz", :to_dot]]
+        end
+
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def to_dot
+          PactBroker::Api::Renderers::IntegrationsDotRenderer.call(integrations)
+        end
+
+        def integrations
+          pact_service.find_latest_pacts
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/doc/views/integrations.markdown

@@ -0,0 +1,7 @@
+# Integrations
+
+Allowed methods: `GET`
+
+Content types: `text/vnd.graphviz`
+
+A list of all the integrations (consumer/provider pairs) stored in the Pact Broker.

data/lib/pact_broker/domain/pacticipant.rb

@@ -1,11 +1,11 @@
 require 'pact_broker/db'
 require 'pact_broker/messages'
 require 'pact_broker/repositories/helpers'
+require 'pact_broker/versions/latest_version'
+require 'pact_broker/domain/label'
 
 module PactBroker
-
   module Domain
-
     class Pacticipant < Sequel::Model
 
       include Messages
@@ -15,6 +15,7 @@ module PactBroker
       one_to_many :versions, :order => :order, :reciprocal => :pacticipant
       one_to_many :labels, :order => :name, :reciprocal => :pacticipant
       one_to_many :pacts
+      one_to_one :latest_version, :class => "PactBroker::Versions::LatestVersion", primary_key: :id, key: :pacticipant_id
 
       dataset_module do
         include PactBroker::Repositories::Helpers

data/lib/pact_broker/matrix/deployment_status_summary.rb

@@ -1,3 +1,5 @@
+require 'pact_broker/logging'
+
 module PactBroker
   module Matrix
     class DeploymentStatusSummary
@@ -82,7 +84,13 @@ module PactBroker
       end
 
       def resolved_version_for(pacticipant_id)
-        resolved_selectors.find{ | s| s[:pacticipant_id] == pacticipant_id }[:pacticipant_version_number]
+        resolved_selector = resolved_selectors.find{ | s| s[:pacticipant_id] == pacticipant_id }
+        if resolved_selector
+          resolved_selector[:pacticipant_version_number]
+        else
+          PactBroker.logger.warn "Could not find the resolved version for pacticipant_id #{pacticipant_id} from integrations #{integrations.collect(&:to_s).join(", ")} in resolved selectors #{resolved_selectors.inspect}"
+          "unresolved version"
+        end
       end
     end
   end

data/lib/pact_broker/pacticipants/repository.rb

@@ -23,7 +23,7 @@ module PactBroker
       def find options = {}
         query = PactBroker::Domain::Pacticipant.select_all_qualified
         query = query.label(options[:label_name]) if options[:label_name]
-        query.order_ignore_case(Sequel[:pacticipants][:name]).all
+        query.order_ignore_case(Sequel[:pacticipants][:name]).eager(:labels).eager(:latest_version).all
       end
 
       def find_all_pacticipant_versions_in_reverse_order name

data/lib/pact_broker/tags/repository.rb

@@ -9,7 +9,14 @@ module PactBroker
       include PactBroker::Repositories::Helpers
 
       def create args
-        Domain::Tag.new(name: args.fetch(:name), version: args.fetch(:version)).save
+        params = {
+          name: args.fetch(:name),
+          version_id: args.fetch(:version).id,
+          created_at: Sequel.datetime_class.now,
+          updated_at: Sequel.datetime_class.now
+        }
+        Domain::Tag.dataset.insert_ignore.insert(params)
+        Domain::Tag.find(name: args[:name], version_id: args[:version].id)
       end
 
       def find args
@@ -24,7 +31,7 @@ module PactBroker
       end
 
       def delete_by_version_id version_id
-        Sequel::Model.db[:tags].where(version_id: version_id).delete
+        Domain::Tag.where(version_id: version_id).delete
       end
 
       def find_all_tag_names_for_pacticipant pacticipant_name

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.26.0'
+  VERSION = '2.26.1'
 end

data/lib/pact_broker/versions/latest_version.rb

@@ -0,0 +1,11 @@
+require 'pact_broker/domain/version'
+
+module PactBroker
+  module Versions
+    include PactBroker::Repositories::Helpers
+
+    class LatestVersion < PactBroker::Domain::Version
+      set_dataset(:latest_versions)
+    end
+  end
+end

data/lib/pact_broker/versions/repository.rb

@@ -60,7 +60,7 @@ module PactBroker
           created_at: Sequel.datetime_class.now,
           updated_at: Sequel.datetime_class.now
         }
-        id = PactBroker::Domain::Version.db[:versions].insert_ignore.insert(version_params)
+        id = PactBroker::Domain::Version.dataset.insert_ignore.insert(version_params)
         version = PactBroker::Domain::Version.find(number: args[:number], pacticipant_id: args[:pacticipant_id])
         PactBroker::Domain::OrderVersions.(version)
         version.refresh # reload with the populated order
@@ -75,7 +75,7 @@ module PactBroker
       end
 
       def delete_by_id version_ids
-        Sequel::Model.db[:versions].where(id: version_ids).delete
+        Domain::Version.where(id: version_ids).delete
       end
     end
   end

data/lib/rack/pact_broker/invalid_uri_protection.rb

@@ -23,7 +23,7 @@ module Rack
         begin
           parse(::Rack::Request.new(env).url)
           true
-        rescue URI::InvalidURIError
+        rescue URI::InvalidURIError, ArgumentError
           false
         end
       end

data/spec/features/get_integrations_dot_file_spec.rb

@@ -0,0 +1,23 @@
+describe "Get integrations dot file" do
+  before do
+    TestDataBuilder.new
+      .create_pact_with_hierarchy("Foo", "1", "Bar")
+  end
+
+  let(:path) { "/integrations" }
+  let(:response_body_hash) { JSON.parse(subject.body, symbolize_names: true) }
+
+  subject { get path, nil, {'HTTP_ACCEPT' => 'text/vnd.graphviz' }; last_response  }
+
+  it "returns a 200 OK" do
+    expect(subject.status).to eq 200
+  end
+
+  it "returns a dot file content type" do
+    expect(subject.headers['Content-Type']).to eq 'text/vnd.graphviz;charset=utf-8'
+  end
+
+  it "returns dot file content" do
+    expect(subject.body).to include "Foo -> Bar"
+  end
+end

data/spec/fixtures/expected.gv

@@ -0,0 +1,4 @@
+digraph { ranksep=3; ratio=auto; overlap=false; node [  shape = plaintext, fontname = Helvetica ];
+  Foo -> Bar
+  Wiffle -> Foo_Thing
+}

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

@@ -64,6 +64,14 @@ module PactBroker
             its(:errors) { is_expected.to be_empty }
           end
 
+          context "when the buildURL is not stringable" do
+            let(:build_url) { {} }
+
+            it "has an error" do
+              expect(subject.errors[:build_url]).to include(match("URL"))
+            end
+          end
+
           context "when the providerApplicationVersion is not present" do
             let(:params) { modify valid_params, without: :providerApplicationVersion }
             it "has an error" do

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

@@ -34,7 +34,9 @@ module PactBroker
         let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
 
-        subject { JSON.parse VerificationDecorator.new(verification).to_json(options), symbolize_names: true }
+        let(:json) { VerificationDecorator.new(verification).to_json(options) }
+
+        subject { JSON.parse json, symbolize_names: true }
 
         it "includes the success status" do
           expect(subject[:success]).to eq true

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

@@ -0,0 +1,29 @@
+require 'pact_broker/api/renderers/integrations_dot_renderer'
+
+module PactBroker
+  module Api
+    module Renderers
+      describe IntegrationsDotRenderer do
+
+        # TODO work out how to handle apostrophes etc
+
+        let(:integrations) do
+          [
+            double('integration', consumer_name: "Foo", provider_name: "Bar"),
+            double('integration', consumer_name: "Wiffle", provider_name: "Foo Thing")
+          ]
+        end
+
+        let(:expected_content) { load_fixture('expected.gv') }
+
+        describe "#call" do
+          subject { IntegrationsDotRenderer.call(integrations) }
+
+          it "renders a dot file" do
+            expect(subject).to eq expected_content
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,6 @@ module PactBroker
   module Matrix
     describe DeploymentStatusSummary do
       describe ".call" do
-
         let(:rows) { [row_1, row_2] }
         let(:row_1) do
           double(Row,
@@ -52,7 +51,6 @@ module PactBroker
           ]
         end
 
-
         subject { DeploymentStatusSummary.new(rows, resolved_selectors, integrations) }
 
         context "when there is a row for all integrations" do
@@ -92,6 +90,26 @@ module PactBroker
           its(:reasons) { is_expected.to eq ["There is no verified pact between Foo (ddec8101dabf4edf9125a69f9a161f0f294af43c) and Baz (4ee06460f10e8207ad904fa9fa6c4842e462ab59)"] }
           its(:counts) { is_expected.to eq success: 1, failed: 0, unknown: 1 }
         end
+
+        context "when there is something unexpected about the data and the resolved selector cannot be found" do
+          let(:rows) { [row_1] }
+
+          let(:resolved_selectors) do
+            [
+              {
+                pacticipant_id: 3, pacticipant_version_number: "4ee06460f10e8207ad904fa9fa6c4842e462ab59"
+              }
+            ]
+          end
+
+          its(:deployable?) { is_expected.to be nil }
+          its(:reasons) { is_expected.to eq ["There is no verified pact between Foo (unresolved version) and Baz (4ee06460f10e8207ad904fa9fa6c4842e462ab59)"] }
+
+          it "logs a warning" do
+            expect(PactBroker.logger).to receive(:warn).with(/Could not find the resolved version/)
+            subject.reasons
+          end
+        end
       end
     end
   end

data/spec/lib/pact_broker/tags/repository_spec.rb

@@ -4,9 +4,42 @@ require 'pact_broker/tags/repository'
 module PactBroker
   module Tags
     describe Repository do
-
       let(:td) { TestDataBuilder.new }
 
+      describe ".create" do
+        before do
+          td.create_pacticipant("foo")
+            .create_version("1")
+        end
+
+        let(:params) { { name: "prod", version: td.version } }
+
+        subject { Repository.new.create(params) }
+
+        it "returns a tag" do
+          expect(subject).to be_a(Domain::Tag)
+        end
+
+        it "sets the properties" do
+          expect(subject.name).to eq "prod"
+          expect(subject.version.id).to eq td.version.id
+        end
+
+        context "when the tag already exists" do
+          before do
+            td.create_tag("prod")
+          end
+
+          it "does nothing" do
+            expect { subject }.to_not change { Domain::Tag.count }
+          end
+
+          it "returns a tag" do
+            expect(subject).to be_a(Domain::Tag)
+          end
+        end
+      end
+
       describe ".find" do
 
         let(:pacticipant_name) { "test_pacticipant" }

data/spec/support/test_data_builder.rb

@@ -35,6 +35,7 @@ class TestDataBuilder
   attr_reader :provider
   attr_reader :consumer_version
   attr_reader :provider_version
+  attr_reader :version
   attr_reader :pact
   attr_reader :verification
   attr_reader :webhook

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.26.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -653,6 +653,7 @@ files:
 - db/migrations/20180729_create_latest_verification_ids_for_provider_versions.rb
 - db/migrations/20180730_create_latest_verifications_for_provider_versions.rb
 - db/migrations/20180731_update_head_matrix.rb
+- db/migrations/20180828_create_latest_versions.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -753,6 +754,7 @@ files:
 - lib/pact_broker/api/decorators/webhooks_decorator.rb
 - lib/pact_broker/api/pact_broker_urls.rb
 - lib/pact_broker/api/renderers/html_pact_renderer.rb
+- lib/pact_broker/api/renderers/integrations_dot_renderer.rb
 - lib/pact_broker/api/resources.rb
 - lib/pact_broker/api/resources/all_webhooks.rb
 - lib/pact_broker/api/resources/authentication.rb
@@ -763,6 +765,7 @@ files:
 - lib/pact_broker/api/resources/error_test.rb
 - lib/pact_broker/api/resources/group.rb
 - lib/pact_broker/api/resources/index.rb
+- lib/pact_broker/api/resources/integrations.rb
 - lib/pact_broker/api/resources/label.rb
 - lib/pact_broker/api/resources/latest_pact.rb
 - lib/pact_broker/api/resources/latest_pacts.rb
@@ -835,6 +838,7 @@ files:
 - lib/pact_broker/doc/views/index/provider-pacts.markdown
 - lib/pact_broker/doc/views/index/publish-pact.markdown
 - lib/pact_broker/doc/views/index/self.markdown
+- lib/pact_broker/doc/views/integrations.markdown
 - lib/pact_broker/doc/views/layouts/main.haml
 - lib/pact_broker/doc/views/not_found.markdown
 - lib/pact_broker/doc/views/pact-versions.markdown
@@ -950,6 +954,7 @@ files:
 - lib/pact_broker/verifications/verification_status.rb
 - lib/pact_broker/version.rb
 - lib/pact_broker/versions/abbreviate_number.rb
+- lib/pact_broker/versions/latest_version.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/service.rb
@@ -1049,6 +1054,7 @@ files:
 - spec/features/execute_webhook_spec.rb
 - spec/features/get_dashboard_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_integrations_dot_file_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
@@ -1091,6 +1097,7 @@ files:
 - spec/fixtures/certificates/self-signed.badssl.com.pem
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/dashboard.json
+- spec/fixtures/expected.gv
 - spec/fixtures/foo-bar.json
 - spec/fixtures/renderer_pact.json
 - spec/fixtures/update_pacticipant.json
@@ -1138,6 +1145,7 @@ files:
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
+- spec/lib/pact_broker/api/renderers/integrations_dot_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/all_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb
@@ -1359,6 +1367,7 @@ test_files:
 - spec/features/execute_webhook_spec.rb
 - spec/features/get_dashboard_spec.rb
 - spec/features/get_diff_spec.rb
+- spec/features/get_integrations_dot_file_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
@@ -1401,6 +1410,7 @@ test_files:
 - spec/fixtures/certificates/self-signed.badssl.com.pem
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/dashboard.json
+- spec/fixtures/expected.gv
 - spec/fixtures/foo-bar.json
 - spec/fixtures/renderer_pact.json
 - spec/fixtures/update_pacticipant.json
@@ -1448,6 +1458,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
+- spec/lib/pact_broker/api/renderers/integrations_dot_renderer_spec.rb
 - spec/lib/pact_broker/api/resources/all_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb