pact_broker 2.59.0 → 2.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b0e297ccfb28aff9a5671f6db509740d72b305ea876c90dd9f43801a29d678
-  data.tar.gz: 2671cd878bcdfa50e841b8f69f40188053f7c65646100b94ea2d700add445132
+  metadata.gz: 3495dd128672a4f4e614b7c60d93734cb3eee3799863af054963c503172d86f2
+  data.tar.gz: be415648babf90774ef011a0485835f386632768fb95b5a1f125ea9bddea2492
 SHA512:
-  metadata.gz: 2a1e25b8199ca7a2ed5940d32f749273d1e9be09bb376440902fd3b72bcfaaa26820b98c177cf22922d1ea325afd821b12b8136e3e0728febbed261ecbe92a12
-  data.tar.gz: 64735e63241058558c290c24e46ff929bb89d7515d7d97413d9e18491b543128a610fc568b711efb9e2fba6bb099d99ed4600aee842c9119e47961a5b99d7a46
+  metadata.gz: aabedcd424d01dfa172424f99feac69d71ce2c55fe97f5c6b25dc1e29247168c14f0aa0d56c144c353a9444cd1cce99e14f7b677161f609ca829d00fdd2cf72c
+  data.tar.gz: a18db48c05cb2f3ae9ebc48b18673d45b4bafe19574633fef2d0ae6c21c2242a7b5cd80dab359eeccedb7044dcb1c2895b8290065fd4e7c7db5ba9c6686fefc4

data/.github/workflows/release_gem.yml

@@ -24,9 +24,22 @@ jobs:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
-    # - name: Trigger release of pact-cli Docker image
-    #   uses: peter-evans/repository-dispatch@v1
-    #   with:
-    #     token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
-    #     repository: pact-foundation/pact-ruby-cli
-    #     event-type: gem-released
+  notify-gem-released:
+    needs: release
+    strategy:
+      matrix:
+        repository: [pact-foundation/pact-broker-docker, DiUS/pact_broker-docker]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify ${{ matrix.repository }} of gem release
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.GHTOKENNOTIFYPBRELEASED }}
+          repository: ${{ matrix.repository }}
+          event-type: gem-released
+          client-payload: |
+              {
+                "name": "${{ needs.release.outputs.gem_name }}",
+                "version": "${{ needs.release.outputs.version }}",
+                "increment": "${{ needs.release.outputs.increment }}"
+              }

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+<a name="v2.61.0"></a>
+### v2.61.0 (2020-09-12)
+
+#### Features
+
+* add back support for GET requests to the 'pacts for verification' API with a deprecation notice in the response	 ([8f45cc9f](/../../commit/8f45cc9f))
+
+<a name="v2.60.1"></a>
+### v2.60.1 (2020-09-10)
+
+#### Bug Fixes
+
+* href for beta:provider-pacts-for-verification	 ([3949fdd1](/../../commit/3949fdd1))
+
+<a name="v2.60.0"></a>
+### v2.60.0 (2020-09-08)
+
+#### Features
+
+* **pacts for verification**
+  * add deprecation title to beta:provider-pacts-for-verification relation	 ([47a61f69](/../../commit/47a61f69))
+  * do not require environment variable feature toggle to enable feature	 ([7d0fe1ea](/../../commit/7d0fe1ea))
+  * allow consumer to be specified with fallback tags, and overall latest to be specified with or without a consumer	 ([2d52d173](/../../commit/2d52d173))
+
+#### Bug Fixes
+
+* correctly handle new test results format when merging test results with pact contents	 ([b35ab71b](/../../commit/b35ab71b))
+
+<a name="v2.59.2"></a>
+### v2.59.2 (2020-08-06)
+
+#### Bug Fixes
+
+* gracefully handle contracts without interactions or messages in deployment status warnings	 ([6c223e69](/../../commit/6c223e69))
+* add missing info level log for business level errors	 ([80a895bf](/../../commit/80a895bf))
+
+<a name="v2.59.1"></a>
+### v2.59.1 (2020-08-04)
+
+#### Bug Fixes
+
+* fix error rendering relationships diagram when the number of index items is greater than one page	 ([93a19982](/../../commit/93a19982))
+
 <a name="v2.59.0"></a>
 ### v2.59.0 (2020-07-30)
 

data/README.md

@@ -6,7 +6,7 @@
  [![Code Climate](https://codeclimate.com/github/pact-foundation/pact_broker/badges/gpa.svg)](https://codeclimate.com/github/pact-foundation/pact_broker)
  [![Test Coverage](https://codeclimate.com/github/pact-foundation/pact_broker/badges/coverage.svg)](https://codeclimate.com/github/pact-foundation/pact_broker/coverage)
 
-The Pact Broker is an application for sharing for consumer driven contracts and verification results. It is optimised for use with "pacts" (contracts created by the [Pact][pact-docs] framework), but can be used for any type of contract that can be serialized to JSON.
+The Pact Broker is an application for sharing of consumer driven contracts and verification results. It is optimised for use with "pacts" (contracts created by the [Pact][pact-docs] framework), but can be used for any type of contract that can be serialized to JSON.
 
 <br/>
 <a href="https:/pactflow.io/?utm_source=github&utm_campaign=pact_broker_intro"><img src="docs/images/Pactflow logo - black small.png"></a>

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

@@ -1,5 +1,6 @@
 require 'dry-validation'
 require 'pact_broker/hash_refinements'
+require 'pact_broker/string_refinements'
 require 'pact_broker/api/contracts/dry_validation_workarounds'
 require 'pact_broker/api/contracts/dry_validation_predicates'
 
@@ -9,6 +10,7 @@ module PactBroker
       class VerifiablePactsJSONQuerySchema
         extend DryValidationWorkarounds
         using PactBroker::HashRefinements
+        using PactBroker::StringRefinements
 
         SCHEMA = Dry::Validation.Schema do
           configure do
@@ -24,7 +26,7 @@ module PactBroker
               #   end
               # end
 
-              required(:tag).filled(:str?)
+              optional(:tag).filled(:str?)
               optional(:latest).filled(included_in?: [true, false])
               optional(:fallbackTag).filled(:str?)
               optional(:consumer).filled(:str?, :not_blank?)
@@ -54,8 +56,9 @@ module PactBroker
                 errors << "fallbackTag can only be set if latest is true (at index #{index})"
               end
 
-              if selector[:consumer] && selector[:latest]
-                errors << "specifying a consumer with latest == true is not yet supported (at index #{index})"
+
+              if not_provided?(selector[:tag]) && selector[:latest] != true
+                errors << "latest must be true, or a tag must be provided (at index #{index})"
               end
             end
             if errors.any?
@@ -64,6 +67,10 @@ module PactBroker
             end
           end
         end
+
+        def self.not_provided?(value)
+          value.nil? || value.blank?
+        end
       end
     end
   end

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

@@ -30,6 +30,7 @@ module PactBroker
         def self.call(params)
           select_first_message(flatten_indexed_messages(SCHEMA.call(params&.symbolize_keys).messages(full: true)))
         end
+
       end
     end
   end

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

@@ -14,14 +14,14 @@ module PactBroker
 
           property :pending,
             if: ->(context) { context[:options][:user_options][:include_pending_status] }
-          property :wip, if: -> (context) { context[:represented].wip }
-
-          property :notices, getter: -> (context) { context[:decorator].notices(context[:options][:user_options]) }
-          property :noteToDevelopers, getter: -> (_) { "Please print out the text from the 'notices' rather than using the inclusionReason and the pendingReason fields. These will be removed when this API moves out of beta."}
+          property :wip,
+            if: -> (context) { context[:represented].wip }
+          property :notices,
+            getter: -> (context) { context[:decorator].notices(context[:options][:user_options]) }
 
           def notices(user_options)
             pact_url = pact_version_url(represented, user_options[:base_url])
-            PactBroker::Pacts::BuildVerifiablePactNotices.call(represented, pact_url, include_pending_status: user_options[:include_pending_status])
+            PactBroker::Pacts::BuildVerifiablePactNotices.call(represented, pact_url, user_options)
           end
         end
 

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

@@ -46,12 +46,7 @@ module PactBroker
         end
 
         def policy_name
-          :'webhooks::webooks'
-        end
-
-        def policy_record
-          # Note: consumer and provider not yet set on new webhook
-          request.post? ? webhook : webhooks
+          :'webhooks::webhooks'
         end
 
         private

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

@@ -25,10 +25,6 @@ module PactBroker
           :'matrix::can_i_deploy'
         end
 
-        def policy_record
-          selectors
-        end
-
         private
 
         attr_reader :query_params, :selectors, :options

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

@@ -202,6 +202,15 @@ module PactBroker
           @pact ||= pact_service.find_pact(pact_params)
         end
 
+        # Not necessarily an existing integration
+        def integration
+          if consumer_specified? && provider_specified?
+            OpenStruct.new(consumer: consumer, provider: provider)
+          else
+            nil
+          end
+        end
+
         def database_connector
           request.env["pactbroker.database_connector"]
         end

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

@@ -5,11 +5,8 @@ module PactBroker
   module Api
     module Resources
       class ErrorHandler
-
         include PactBroker::Logging
 
-        WARNING_ERROR_CLASSES = [Sequel::ForeignKeyConstraintViolation]
-
         def self.call e, request, response
           error_reference = generate_error_reference
           if log_as_warning?(e)
@@ -17,6 +14,7 @@ module PactBroker
           elsif reportable?(e)
             log_error(e, "Error reference #{error_reference}")
             report(e, error_reference, request)
+          else
             logger.info("Error reference #{error_reference}", e)
           end
           response.body = response_body_hash(e, error_reference).to_json
@@ -31,7 +29,7 @@ module PactBroker
         end
 
         def self.log_as_warning?(e)
-          WARNING_ERROR_CLASSES.any? { |clazz| e.is_a?(clazz) }
+          PactBroker.configuration.warning_error_classes.any? { |clazz| e.is_a?(clazz) }
         end
 
         def self.display_message(e, error_reference)

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

@@ -4,9 +4,7 @@ require 'pact_broker/error'
 module PactBroker
   module Api
     module Resources
-
       class ErrorTest < BaseResource
-
         def content_types_provided
           [
             ["application/hal+json", :to_json]
@@ -24,6 +22,10 @@ module PactBroker
         def process_post
           raise PactBroker::TestError.new("Don't panic. This is a test API error.")
         end
+
+        def policy_name
+          :'default'
+        end
       end
     end
   end

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

@@ -26,10 +26,6 @@ module PactBroker
           :'groups::group'
         end
 
-        def policy_record
-          pacticipant
-        end
-
         private
 
         def group

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

@@ -121,6 +121,17 @@ module PactBroker
               title: "Determine if an application can be safely deployed to an environment identified by the given tag",
               templated: true
             },
+            'pb:provider-pacts-for-verification' => {
+              href: base_url + '/pacts/provider/{provider}/for-verification',
+              title: 'Pact versions to be verified for the specified provider',
+              templated: true
+            },
+            'beta:provider-pacts-for-verification' => {
+              name: 'beta',
+              href: base_url + '/pacts/provider/{provider}/for-verification',
+              title: 'DEPRECATED - please use pb:provider-pacts-for-verification',
+              templated: true
+            },
             'curies' =>
             [{
               name: 'pb',
@@ -133,14 +144,6 @@ module PactBroker
             }]
           }
 
-          if PactBroker.feature_enabled?(:pacts_for_verification)
-            links_hash['beta:provider-pacts-for-verification'] = {
-                href: base_url + '/pacts/provider/{provider}/for-verification',
-                title: 'Pact versions to be verified for the specified provider',
-                templated: true
-              }
-          end
-
           links_hash
         end
 

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

@@ -21,10 +21,6 @@ module PactBroker
           :'integrations::integration'
         end
 
-        def policy_resource
-          integration
-        end
-
         def integration
           @integration ||= OpenStruct.new(consumer: consumer, provider: provider)
         end

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

@@ -37,10 +37,6 @@ module PactBroker
         def policy_name
           :'integrations::integrations'
         end
-
-        def policy_resource
-          integrations
-        end
       end
     end
   end

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

@@ -30,18 +30,10 @@ module PactBroker
           !!label
         end
 
-        def resource_object
-          label
-        end
-
         def policy_name
           :'labels::label'
         end
 
-        def policy_record
-          label
-        end
-
         def to_json
           PactBroker::Api::Decorators::LabelDecorator.new(label).to_json(decorator_options)
         end

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

@@ -25,11 +25,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts:pact'
-        end
-
-        def policy_record
-          pact
+          :'pacts::pact'
         end
 
         def to_json

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

@@ -22,11 +22,7 @@ module PactBroker
         end
 
         def policy_name
-          :'pacts:pacts'
-        end
-
-        def policy_record
-          pacts
+          :'pacts::pacts'
         end
       end
     end

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

@@ -30,10 +30,6 @@ module PactBroker
           :'verifications::verifications'
         end
 
-        def policy_record
-          version
-        end
-
         private
 
         def version

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

@@ -43,6 +43,10 @@ module PactBroker
           PactBroker::Api::Decorators::MatrixTextDecorator.new(results).to_text(decorator_options)
         end
 
+        def policy_name
+          :'matrix::matrix'
+        end
+
         def results
           @results ||= matrix_service.find(selectors, options)
         end

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

@@ -27,6 +27,10 @@ module PactBroker
           PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
         end
 
+        def policy_name
+          :'matrix::matrix'
+        end
+
         private
 
         attr_reader :options

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

@@ -15,6 +15,10 @@ module PactBroker
         def to_json
           metrics_service.metrics.to_json
         end
+
+        def policy_name
+          :'metrics::metrics'
+        end
       end
     end
   end

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

@@ -53,14 +53,6 @@ module PactBroker
           !!pact
         end
 
-        def resource_object
-          pact
-        end
-
-        def policy_resource
-          pact
-        end
-
         def from_json
           response_code = pact ? 200 : 201
 
@@ -96,6 +88,10 @@ module PactBroker
           true
         end
 
+        def policy_name
+          :'pacts::pact'
+        end
+
         private
 
         def pact