pact_broker 2.6.0 → 2.7.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9029e88952b1175c690a65568eb507d2acf08c81
-  data.tar.gz: adf028a7f196fb7e78ae80cec9733fa8eecfc3fe
+  metadata.gz: 90467fc2becb470c346b1ebd5be1491fdbdcab06
+  data.tar.gz: 055474c47b67937de5c7dae44262cd0b9352b11c
 SHA512:
-  metadata.gz: c9454daa54e8d1abe94458d753376f76a3381d7d02041671649426dcd2de243a0f0e6557d18ebec40b4db803b23ae0b70811f9fb19aea1bec7799f30e025f1b2
-  data.tar.gz: 0efc0461b3d6a84ea6a78ead513ad850427acb31a8c21c6a3f18ac3c741119554037b041f2d9751fec51e88118c137db7f1cff4e6347da5bf769d6437d3cd1e4
+  metadata.gz: 509f76090bfc2164c0c2d7e45c7bd0a191c1843f8fbc4966dcc097c4a154625e756cb52f659751969938b55018684b10c4313e7a3c202495fbaad1120127b215
+  data.tar.gz: 6f8c7ffffc1343040ce1f2ae9e96114bc13ba4bb01cd1ef02ff6104a4282015ef04a1d23110e63123b70b09864e34897c6bc525ee7018ff6cd4e5df913616603

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v2.7.0.beta.1"></a>
+### v2.7.0.beta.1 (2017-10-16)
+
+#### Features
+
+* **prod pacts in index**
+  * show pacts tagged as the 'prod' or 'production' versions on the index page	 ([b58b7a3](/../../commit/b58b7a3))
+
 <a name="v2.6.0"></a>
 ### v2.6.0 (2017-10-06)
 

data/db/migrations/42_delete_orphan_webhook_data.rb

@@ -1,5 +1,3 @@
-require 'securerandom'
-
 Sequel.migration do
   up do
     from(:triggered_webhooks).where(webhook_id: nil).each do | triggered_webhook |

data/db/migrations/43_add_provider_version_to_verification.rb

@@ -0,0 +1,12 @@
+Sequel.migration do
+  change do
+    alter_table(:verifications) do
+      add_foreign_key(:provider_version_id, :versions, foreign_key_constraint_name: 'fk_verifications_versions')
+    end
+  end
+
+  # TODO
+  # alter_table(:verifications) do
+  #   set_column_not_null(:provider_version_id)
+  # end
+end

data/db/migrations/44_populate_verifications_provider_version_id.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    from(:verifications)
+      .select(Sequel[:verifications][:id], :provider_version, :provider_id, Sequel[:verifications][:created_at])
+      .join(:pact_versions, {id: :pact_version_id})
+      .each do | line |
+        version = from(:versions)
+          .where(number: line[:provider_version], pacticipant_id: line[:provider_id]).single_record
+        version_id = if version
+          version[:id]
+        else
+          from(:versions).insert(
+              number: line[:provider_version],
+              pacticipant_id: line[:provider_id],
+              created_at: line[:created_at],
+              updated_at: line[:created_at]
+          )
+        end
+        from(:verifications).where(id: line[:id]).update(provider_version_id: version_id)
+      end
+  end
+
+  down do
+  end
+end

data/db/migrations/45_set_verification_provider_number_nullable.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:verifications) do
+      set_column_allow_null(:provider_version)
+    end
+  end
+end

data/db/migrations/46_recreate_latest_verifications.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_numbers,
+      "SELECT pact_version_id, MAX(number) latest_number
+          FROM verifications
+          GROUP BY pact_version_id")
+
+    # The most recent verification for each pact version
+    # provider_version is DEPRECATED, use provider_version_number
+    create_or_replace_view(:latest_verifications,
+      "SELECT v.id, v.number, v.success, s.number as provider_version, v.build_url, v.pact_version_id, v.execution_date, v.created_at, v.provider_version_id, s.number as provider_version_number
+        FROM verifications v
+        INNER JOIN latest_verification_numbers lv
+          ON v.pact_version_id = lv.pact_version_id AND v.number = lv.latest_number
+        INNER JOIN versions s on v.provider_version_id = s.id"
+    )
+  end
+end

data/db/migrations/47_create_all_verifications.rb

@@ -0,0 +1,19 @@
+Sequel.migration do
+  up do
+    # provider_version is DEPRECATED, use provider_version_number
+    create_or_replace_view(:all_verifications,
+      from(:verifications).select(
+        Sequel[:verifications][:id],
+        Sequel[:verifications][:number],
+        :success,
+        :provider_version_id,
+        Sequel[:v][:number].as(:provider_version_number),
+        Sequel[:v][:order].as(:provider_version_order),
+        :build_url,
+        :pact_version_id,
+        :execution_date,
+        Sequel[:verifications][:created_at]
+        ).join(:versions, {id: :provider_version_id}, {:table_alias => :v})
+    )
+  end
+end

data/lib/pact_broker/api.rb

@@ -59,6 +59,10 @@ module PactBroker
         add ['relationships'], Api::Resources::Relationships, {resource_name: "relationships"}
         add ['groups', :pacticipant_name], Api::Resources::Group, {resource_name: "group"}
 
+        # matrix
+        add ['matrix', 'provider', :provider_name, 'consumer', :consumer_name], Api::Resources::MatrixForConsumerAndProvider, {resource_name: "matrix_consumer_provider"}
+        add ['matrix'], Api::Resources::Matrix, {resource_name: "matrix"}
+
         add [], Api::Resources::Index, {resource_name: "index"}
       end
     end

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

@@ -0,0 +1,114 @@
+require 'ostruct'
+require 'pact_broker/api/pact_broker_urls'
+
+module PactBroker
+  module Api
+    module Decorators
+      class MatrixPactDecorator
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize(lines)
+          @lines = lines
+        end
+
+        def to_json(options)
+          to_hash(options).to_json
+        end
+
+        def to_hash(options)
+          {
+            matrix: matrix(lines, options[:user_options][:base_url])
+          }
+        end
+
+        private
+
+        attr_reader :lines
+
+        def matrix(lines, base_url)
+          provider = nil
+          consumer = nil
+          lines.collect do | line |
+            provider ||= OpenStruct.new(name: line[:provider_name])
+            consumer ||= OpenStruct.new(name: line[:consumer_name])
+            consumer_version = OpenStruct.new(number: line[:consumer_version_number], pacticipant: consumer)
+            line_hash(consumer, provider, consumer_version, line, base_url)
+          end
+        end
+
+        def line_hash(consumer, provider, consumer_version, line, base_url)
+          {
+            consumer: consumer_hash(line, consumer, consumer_version, base_url),
+            provider: provider_hash(line, provider, base_url),
+            pact: pact_hash(line, base_url),
+            verificationResult: verification_hash(line, base_url)
+          }
+        end
+
+        def consumer_hash(line, consumer, consumer_version, base_url)
+          {
+            name: line[:consumer_name],
+            version: {
+              number: line[:consumer_version_number],
+              _links: {
+                self: {
+                  href: version_url(base_url, consumer_version)
+                }
+              }
+            },
+            _links: {
+              self: {
+                href: pacticipant_url(base_url, consumer)
+              }
+            }
+          }
+        end
+
+        def provider_hash(line, provider, base_url)
+          hash = {
+            name: line[:provider_name],
+            version: nil,
+            _links: {
+              self: {
+                href: pacticipant_url(base_url, provider)
+              }
+            }
+          }
+
+          if !line[:provider_version_number].nil?
+            hash[:version] = { number: line[:provider_version_number] }
+          end
+
+          hash
+        end
+
+        def pact_hash(line, base_url)
+          {
+            createdAt: line[:pact_created_at].to_datetime.xmlschema,
+            _links: {
+              self: {
+                href: pact_url_from_params(base_url, line)
+              }
+            }
+          }
+        end
+
+        def verification_hash(line, base_url)
+          if !line[:success].nil?
+            {
+              success: line[:success],
+              verifiedAt: line[:verification_executed_at].to_datetime.xmlschema,
+              _links: {
+                self: {
+                  href: verification_url(OpenStruct.new(line), base_url)
+                }
+              }
+            }
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module PactBroker
       class VerificationDecorator < BaseDecorator
 
         property :provider_name, as: :providerName, writeable: :false
-        property :provider_version, as: :providerApplicationVersion
+        property :provider_version_number, as: :providerApplicationVersion, writeable: false
         property :success
         property :execution_date, as: :verificationDate
         property :build_url, as: :buildUrl

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -76,11 +76,11 @@ module PactBroker
         ].join('/')
       end
 
-      def verification_url verification, base_url
+      def verification_url verification, base_url = ''
         [ base_url, 'pacts',
           'provider', url_encode(verification.provider_name),
           'consumer', url_encode(verification.consumer_name),
-          'pact-version', verification.pact_version.sha,
+          'pact-version', verification.pact_version_sha,
           'verification-results', verification.number
         ].join('/')
       end

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

@@ -58,7 +58,8 @@ module PactBroker
                 href: base_url + '/webhooks',
                 title: 'Webhooks',
                 templated: false
-              },'curies' =>
+              },
+              'curies' =>
               [{
                 name: 'pb',
                 href: base_url + '/doc/{rel}',
@@ -67,10 +68,7 @@ module PactBroker
             }
           }.to_json
         end
-
-
       end
     end
-
   end
-end
+end

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

@@ -0,0 +1,48 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/decorators/matrix_decorator'
+require 'cgi'
+
+module PactBroker
+  module Api
+    module Resources
+      class Matrix < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def malformed_request?
+          error_messages = matrix_service.validate_selectors(selectors)
+          if error_messages.any?
+            set_json_validation_error_messages error_messages
+            true
+          else
+            false
+          end
+        end
+
+        def to_json
+          criteria = selected_versions.each_with_object({}) { | version, hash | hash[version.pacticipant.name] = version.number }
+          lines = matrix_service.find_compatible_pacticipant_versions(criteria)
+          PactBroker::Api::Decorators::MatrixPactDecorator.new(lines).to_json(user_options: { base_url: base_url })
+        end
+
+        def selectors
+          @selectors ||= CGI.parse(CGI.unescape(request.uri.query))['selectors[]']
+        end
+
+        def version_selectors
+          @version_selectors ||= selectors.select{ | selector| selector.include?("/version/") }
+        end
+
+        def selected_versions
+          @selected_versions ||= version_service.find_versions_by_selector(version_selectors)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/decorators/matrix_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+      class MatrixForConsumerAndProvider < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          consumer && provider
+        end
+
+        def to_json
+          lines = matrix_service.find(identifier_from_path)
+          PactBroker::Api::Decorators::MatrixPactDecorator.new(lines).to_json(user_options: { base_url: base_url })
+        end
+
+        def consumer
+          @consumer ||= find_pacticipant(identifier_from_path[:consumer_name], "consumer")
+        end
+
+        def provider
+          @provider ||= find_pacticipant(identifier_from_path[:provider_name], "provider")
+        end
+
+        def find_pacticipant name, role
+          pacticipant_service.find_pacticipant_by_name(name).tap do | pacticipant |
+            set_json_error_message("No #{role} with name '#{name}' found") if pacticipant.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/domain/relationship.rb

@@ -7,22 +7,26 @@ module PactBroker
 
       attr_reader :consumer, :provider, :latest_pact, :latest_verification, :webhooks
 
-      def initialize consumer, provider, latest_pact = nil, latest_verification = nil, webhooks = [], triggered_webhooks = []
+      def initialize consumer, provider, latest_pact = nil, latest = true, latest_verification = nil, webhooks = [], triggered_webhooks = [], tags = []
         @consumer = consumer
         @provider = provider
         @latest_pact = latest_pact
+        @latest = latest
         @latest_verification = latest_verification
         @webhooks = webhooks
         @triggered_webhooks = triggered_webhooks
+        @tags = tags
       end
 
-      def self.create consumer, provider, latest_pact, latest_verification, webhooks = [], triggered_webhooks = []
-        new consumer, provider, latest_pact, latest_verification, webhooks, triggered_webhooks
+      def self.create consumer, provider, latest_pact, latest, latest_verification, webhooks = [], triggered_webhooks = [], tags = []
+        new consumer, provider, latest_pact, latest, latest_verification, webhooks, triggered_webhooks, tags
       end
 
       def eq? other
         Relationship === other && other.consumer == consumer && other.provider == provider &&
-          other.latest_pact == latest_pact && other.latest_verification == latest_verification &&
+          other.latest_pact == latest_pact &&
+          other.latest? == latest? &&
+          other.latest_verification == latest_verification &&
           other.webhooks == webhooks
       end
 
@@ -42,6 +46,22 @@ module PactBroker
         @latest_pact
       end
 
+      def latest?
+        @latest
+      end
+
+      def consumer_version_number
+        @latest_pact.consumer_version_number
+      end
+
+      def provider_version_number
+        @latest_verification ? @latest_verification.provider_version_number : nil
+      end
+
+      def tag_names
+        @tags
+      end
+
       def any_webhooks?
         @webhooks.any?
       end
@@ -74,8 +94,8 @@ module PactBroker
         latest_verification.pact_version_sha != latest_pact.pact_version_sha
       end
 
-      def latest_verification_provider_version
-        latest_verification.provider_version
+      def latest_verification_provider_version_number
+        latest_verification.provider_version.number
       end
 
       def pacticipants