pact_broker 2.58.2 → 2.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2dc3ce078c6b984d9e17ec748d50487434740c1b4cc828ffe93c222bb64709e
-  data.tar.gz: 20b4316a8e3ecc24902b82e5c600c6d2bb9b3e861e6574317c2704ce952d7f26
+  metadata.gz: dbaaee53f1641458eb110582a96bf0be98d7078ef1fa681ffee934c6e8007347
+  data.tar.gz: 84a2f6e6785acc85cf7053b86a54574746cb06de917bd11a0dff23403046aff5
 SHA512:
-  metadata.gz: bed27eae0215a6d2f499bfa99b9717c0085c825cf8e7b721a66c27d91d4d2ecac56aedeba2e42989399d50a5d45a938b1c4ac9cede35ce70956bbb0d3de0d6e3
-  data.tar.gz: f5b82be7ede7645c77182541a99d9c69ff7047bd7d6c7ddb7e01870ed12ae859ee7a08f8b8a8cbbc66c6e407adef34ab136674258c0664c7b2fba0e899509814
+  metadata.gz: de93223c0a1d52af6563bf31b2ae733c41b6cec65afb4a61be741d78f47cf18484ee2fa292c9660b8db09cb3a1a66c549decb145a0b7a036477a9ac73b70f8c6
+  data.tar.gz: 04d3a59551f4fe9f46af8b65cd6c0dc3326ac86a594298eb22d529e33f6a98e39cdf6f9c682bd69bd9bbb85f4f290fe3e2f706d71cfa766b61def28c0dbd7bfc

data/.github/workflows/release_gem.yml

@@ -6,20 +6,40 @@ on:
       - release-triggered
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    # - name: 'Wait for status checks'
+    #   id: wait-for-status-checks
+    #   uses: "WyriHaximus/github-action-wait-for-status@v2"
+    #   with:
+    #     checkInterval: 15
+    #   env:
+    #     GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     - uses: pact-foundation/release-gem@v0.0.11
       env:
         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.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)
+
+#### Features
+
+* add timestamps to version resource	 ([818a0c2c](/../../commit/818a0c2c))
+
+<a name="v2.58.3"></a>
+### v2.58.3 (2020-07-25)
+
+#### Bug Fixes
+
+* correctly encode user entered data in attributes, Javascript, and HTML	 ([523980e2](/../../commit/523980e2))
+
 <a name="v2.58.2"></a>
 ### v2.58.2 (2020-07-17)
 

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/decorators/version_decorator.rb

@@ -10,6 +10,8 @@ module PactBroker
 
         collection :tags, embedded: true, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator
 
+        include Timestamps
+
         link :self do | options |
           {
             title: 'Version',

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

@@ -4,6 +4,7 @@ require 'redcarpet'
 require 'pact/doc/markdown/consumer_contract_renderer'
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/logging'
+require 'rack'
 
 module PactBroker
   module Api
@@ -58,8 +59,8 @@ module PactBroker
               #{badge_list_item}
               #{badge_markdown_item}
               <li>
-                <span class='name'>#{@pact.consumer.name} version:</span>
-                <span class='value'>#{@pact.consumer_version_number}#{tags}</span>
+                <span class='name'>#{consumer_name} version:</span>
+                <span class='value'>#{consumer_version_number}#{tags}</span>
               </li>
               <li>
                 <span class='name' title='#{published_date}'>Date published:</span>
@@ -75,9 +76,9 @@ module PactBroker
                 <a href=\"#{base_url}/\">Home</a>
               </li>
               <li>
-                <span data-consumer-name=\"#{@pact.consumer.name}\"
-                      data-provider-name=\"#{@pact.provider.name}\"
-                      data-consumer-version-number=\"#{@pact.consumer_version_number}\"
+                <span data-consumer-name=\"#{consumer_name}\"
+                      data-provider-name=\"#{provider_name}\"
+                      data-consumer-version-number=\"#{consumer_version_number}\"
                       data-pact-url=\"#{pact_url}\"
                       class='more-options glyphicon glyphicon-option-horizontal'
                       aria-hidden='true'></span>
@@ -88,7 +89,7 @@ module PactBroker
 
         def badge_list_item
             "<li class='pact-badge'>
-              <img src='#{badge_url}'/>
+              <img src=\"#{badge_url}\"/>
             </li>
             "
         end
@@ -117,7 +118,19 @@ module PactBroker
         end
 
         def title
-          "Pact between #{@pact.consumer.name} and #{@pact.provider.name}"
+          "Pact between #{consumer_name} and #{provider_name}"
+        end
+
+        def consumer_version_number
+          h(@pact.consumer_version_number)
+        end
+
+        def consumer_name
+          h(@pact.consumer.name)
+        end
+
+        def provider_name
+          h(@pact.provider.name)
         end
 
         def published_date
@@ -154,7 +167,8 @@ module PactBroker
 
         def tags
           if @pact.consumer_version_tag_names.any?
-            " (#{@pact.consumer_version_tag_names.join(", ")})"
+            tag_names = @pact.consumer_version_tag_names.collect{ |t| h(t) }.join(", ")
+            " (#{tag_names})"
           else
             ""
           end
@@ -179,6 +193,10 @@ module PactBroker
           logger.info "Could not parse the following content to a Pact due to #{e.class} #{e.message}, showing raw content instead: #{@json_content}"
           raise NotAPactError
         end
+
+        def h string
+          Rack::Utils.escape_html(string)
+        end
       end
     end
   end

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

@@ -45,6 +45,15 @@ module PactBroker
           response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(decorator_options)
         end
 
+        def policy_name
+          :'webhooks::webooks'
+        end
+
+        def policy_record
+          # Note: consumer and provider not yet set on new webhook
+          request.post? ? webhook : webhooks
+        end
+
         private
 
         def validation_errors? webhook

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

@@ -42,6 +42,10 @@ module PactBroker
           badge_service.pact_verification_badge_url(pact, label, initials, pseudo_branch_verification_status, tags)
         end
 
+        def policy_name
+          :'badges::badge'
+        end
+
         private
 
         def pact

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

@@ -21,6 +21,14 @@ module PactBroker
           end
         end
 
+        def policy_name
+          :'matrix::can_i_deploy'
+        end
+
+        def policy_record
+          selectors
+        end
+
         private
 
         attr_reader :query_params, :selectors, :options

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

@@ -25,6 +25,10 @@ module PactBroker
           PactBroker::Api::Decorators::DashboardTextDecorator.new(index_items).to_text(user_options: decorator_context)
         end
 
+        def policy_name
+          :'dashboard::dashboard'
+        end
+
         private
 
         def index_items

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/group.rb

@@ -22,6 +22,14 @@ module PactBroker
           PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(group).to_csv
         end
 
+        def policy_name
+          :'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 + '/doc/{rel}?context=index',
+              title: 'DEPRECATED - please use pb:provider-pacts-for-verification',
+              templated: true
+            },
             'curies' =>
             [{
               name: 'pb',
@@ -133,16 +144,12 @@ 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
+
+        def policy_name
+          :'index::index'
+        end
       end
     end
   end

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

@@ -16,6 +16,18 @@ module PactBroker
           integration_service.delete(consumer_name, provider_name)
           true
         end
+
+        def policy_name
+          :'integrations::integration'
+        end
+
+        def policy_resource
+          integration
+        end
+
+        def integration
+          @integration ||= OpenStruct.new(consumer: consumer, provider: provider)
+        end
       end
     end
   end

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

@@ -26,13 +26,21 @@ module PactBroker
         end
 
         def integrations
-          integration_service.find_all
+          @integrations ||= integration_service.find_all
         end
 
         def delete_resource
           integration_service.delete_all
           true
         end
+
+        def policy_name
+          :'integrations::integrations'
+        end
+
+        def policy_resource
+          integrations
+        end
       end
     end
   end

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

@@ -19,7 +19,7 @@ module PactBroker
 
         def from_json
           unless label
-            @label = label_service.create identifier_from_path
+            @label = label_service.create(identifier_from_path)
             # Make it return a 201 by setting the Location header
             response.headers["Location"] = label_url(label, base_url)
           end
@@ -27,26 +27,33 @@ module PactBroker
         end
 
         def resource_exists?
-          !!resource_object
+          !!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
 
         def label
-          @label ||= label_service.find identifier_from_path
+          @label ||= label_service.find(identifier_from_path)
         end
 
         def delete_resource
-          label_service.delete identifier_from_path
+          label_service.delete(identifier_from_path)
           true
         end
-
       end
     end