pact_broker 2.94.0 → 2.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15cc9869c313dbadd50a4bcc89d3912717cc5f8512af30326b716d2a3cc636ad
-  data.tar.gz: 5d8c0f7240e7b312e096afb75ab8d2f9b91a9f26284be9e90e680bc59615cb02
+  metadata.gz: e077e361037618a0d58670de46b25753d8755cb1e21ef58e9f73a8fe5705cd7f
+  data.tar.gz: 0e64d6fee6eb4cf36f69dea5bf94c432c088c93984ca51783e68f20b7b2e3130
 SHA512:
-  metadata.gz: 1d223aa03faeac6cda65c71fab594b2bebed430690758ba768b34002e50434acfd556629593909aad8e494e59c26a067abf0243dae0345b482f9f111065e46ff
-  data.tar.gz: db169a6db83b20c37e28bacf7e83975f89fa204e41ed8c75a58708a658b6ae3177f7235a32a54db2138d0a5f9f471a92f3e6934f00d222fa6b8310ba987e55e0
+  metadata.gz: 8c7bbae3ff3736576977f15aaef79a3d6635667de76b994a83c8c4613ce7fa9999808af70838014f7b5d7c26e7ffbda5da5e5813b1394dd6c4557fe597c9a11f
+  data.tar.gz: 4783820b31a355a9c2bf9a36151cc0730dba2a1424a1c68b8da39ac1f658cec3334b18c406b58d1b211cb0a5f3cc72b14a619066ca9d0c2daca828720f144d08

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v2.95.0"></a>
+### v2.95.0 (2022-03-16)
+
+#### Features
+
+* add relation for can-i-deploy branch to environment badge	 ([6ece8e93](/../../commit/6ece8e93))
+* add badge url for 'can I deploy latest version of branch to envionment' endpoint	 ([086b8c10](/../../commit/086b8c10))
+
+#### Bug Fixes
+
+* **pacts for verification**
+  * do not de-duplicate pacts with the same content but different consumers	 ([ae3bb541](/../../commit/ae3bb541))
+
 <a name="v2.94.0"></a>
 ### v2.94.0 (2022-02-22)
 

data/README.md

@@ -140,15 +140,14 @@ You can use the [Pact Broker Docker image][docker] or [Terraform on AWS][terrafo
 #### Rolling your own
 
 * Are you sure you don't just want to use the [Pact Broker Docker image][docker]? No Docker at your company yet? Ah well, keep reading.
-* Create a PostgreSQL (recommended) or MySQL (not _as_ recommended because of @bethesque's personal prejudices, but still fully supported) database.
- * To ensure you're on a supported version of the database that you choose, check the [travis.yml][travisyml] file to see which versions we're currently running our tests against.
-* If you're using PostgreSQL (did we mention this was _recommended!_) you'll find the database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
-* Install ruby 2.4 or later and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
+* Create a PostgreSQL database.
+  * To ensure you're on a supported version of the database that you choose, check the [travis.yml][travisyml] file to see which versions we're currently running our tests against.
+  * MySQL was supported for the native Ruby application until around 2021, but the official `pactfoundation/pact-broker` Docker image does not support it. New features will not be optimised for MySQL, and some new features may not even be supported on it (eg. the database clean feature).
+* You'll find a sample database creation script in the [example/config.ru](https://github.com/pact-foundation/pact_broker/blob/master/example/config.ru).
+* Install ruby 2.7 or later and the latest version of bundler (if you've come this far, I'm assuming you know how to do both of these. Did I mention there was a [Docker][docker] image?)
 * Copy the [pact\_broker](https://github.com/DiUS/pact_broker-docker/tree/master/pact_broker) directory from the Pact Broker Docker project. This will have the recommended settings for database connections, logging, basic auth etc. Note that the Docker image uses Phusion Passenger as the web application server in front of the Pact Broker Ruby application, which is the recommended set up.
-* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem if using Postgres and the "mysql2" gem if using MySQL)
-    * example Sequel configuration for postgres `{adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}`
-    * example Sequel configuration for mysql `{adapter: "mysql2", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}`
-`
+* Modify the config.ru and Gemfile as desired (eg. choose database driver gem, set your database credentials. Use the "pg" gem for Postgres)
+  * example Sequel configuration for postgres `{ adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8' }`
 * Please ensure you use `encoding: 'utf8'` in your Sequel options to avoid encoding issues.
 * For production usage, use a web application server like [Phusion Passenger](https://www.phusionpassenger.com) or [Nginx](http://nginx.org/) to serve the Pact Broker application. You'll need to read up on the documentation for these yourself as it is beyond the scope of this documentation. See the [wiki][reverse-proxy-docs] for instructions on using a reverse proxy with SSL.
 * Ensure the environment variable `RACK_ENV` is set to `production`.

data/db/migrations/20220303_increase_consumer_version_selector_hashes_column_size.rb

@@ -0,0 +1,14 @@
+require_relative "migration_helper"
+include PactBroker::MigrationHelper
+
+Sequel.migration do
+  up do
+    if mysql?
+      run("ALTER TABLE verifications CHANGE consumer_version_selector_hashes consumer_version_selector_hashes mediumtext")
+    end
+  end
+
+  down do
+
+  end
+end

data/lib/pact_broker/api/authorization/resource_access_policy.rb

@@ -38,11 +38,7 @@ module PactBroker
           ]
 
           if enable_public_badge_access
-            rules.concat([
-              [PUBLIC, READ_METHODS, PACT_BADGE_PATH],
-              [PUBLIC, READ_METHODS, MATRIX_BADGE_PATH],
-              [PUBLIC, READ_METHODS, CAN_I_DEPLOY_BADGE_PATH]
-            ])
+            rules.concat(BADGE_PATHS.collect { | badge_path | [PUBLIC, READ_METHODS, badge_path] })
           end
 
           if allow_public_access_to_heartbeat

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

@@ -8,7 +8,7 @@ module PactBroker
 
         def self.call(date_time)
           if date_time.is_a?(String)
-            DATE_TIME_CLASS.strptime(date_time).to_time.utc.to_datetime.xmlschema
+            Sequel.string_to_datetime(date_time).to_time.utc.to_datetime.xmlschema
           elsif date_time
             date_time.to_time.utc.to_datetime.xmlschema if date_time
           end

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

@@ -90,6 +90,14 @@ module PactBroker
           }
         end
 
+        link :'pb:can-i-deploy-branch-to-environment-badge' do | options |
+          {
+            title: "Can I Deploy #{represented.name} from branch to environment badge",
+            href: templated_can_i_deploy_branch_to_environment_badge_url(represented.name, options[:base_url]),
+            templated: true
+          }
+        end
+
         curies do | options |
           [{
             name: :pb,

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -255,6 +255,10 @@ module PactBroker
         templated_can_i_deploy_url(pacticipant_name, base_url) + "/badge"
       end
 
+      def templated_can_i_deploy_branch_to_environment_badge_url pacticipant_name, base_url = ""
+        pacticipant_url_from_params({ pacticipant_name: pacticipant_name }, base_url) + "/branches/{branch}/latest-version/can-i-deploy/to-environment/{environment}/badge"
+      end
+
       def label_url label, base_url
         "#{labels_url(label.pacticipant, base_url)}/#{url_encode(label.name)}"
       end

data/lib/pact_broker/api/paths.rb

@@ -3,9 +3,12 @@ module PactBroker
     module Paths
       PACT_BADGE_PATH =         %r{^/pacts/provider/[^/]+/consumer/.*/badge(?:\.[A-Za-z]+)?$}.freeze
       MATRIX_BADGE_PATH =       %r{^/matrix/provider/[^/]+/latest/[^/]+/consumer/[^/]+/latest/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
-      CAN_I_DEPLOY_BADGE_PATH = %r{^/pacticipants/[^/]+/latest-version/[^/]+/can-i-deploy/to/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
+      CAN_I_DEPLOY_TAG_BADGE_PATH = %r{^/pacticipants/[^/]+/latest-version/[^/]+/can-i-deploy/to/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
+      CAN_I_DEPLOY_BRANCH_ENV_BADGE_PATH = %r{^/pacticipants/[^/]+/branches/[^/]+/latest-version/can-i-deploy/to-environment/[^/]+/badge(?:\.[A-Za-z]+)?$}.freeze
       VERIFICATION_RESULTS =    %r{^/pacts/provider/[^/]+/consumer/[^/]+/pact-version/[^/]+/verification-results/[^/]+}
 
+      BADGE_PATHS = [PACT_BADGE_PATH, MATRIX_BADGE_PATH, CAN_I_DEPLOY_TAG_BADGE_PATH, CAN_I_DEPLOY_BRANCH_ENV_BADGE_PATH]
+
       extend self
 
       def is_verification_results_path?(path)
@@ -14,7 +17,7 @@ module PactBroker
 
       def is_badge_path?(path)
         # Optimise by checking include? first - regexp slow
-        path.include?("/badge") && (path =~ PACT_BADGE_PATH || path =~ MATRIX_BADGE_PATH || path =~ CAN_I_DEPLOY_BADGE_PATH)
+        path.include?("/badge") && BADGE_PATHS.any?{ | regex | path =~ regex }
       end
     end
   end

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

@@ -1,37 +1,22 @@
 require "pact_broker/api/resources/base_resource"
 require "pact_broker/verifications/pseudo_branch_status"
 require "pact_broker/configuration"
+require "pact_broker/api/resources/badge_methods"
 
 module PactBroker
   module Api
     module Resources
       class Badge < BaseResource
-
-        def allowed_methods
-          ["GET", "OPTIONS"]
-        end
-
-        def content_types_provided
-          [["image/svg+xml", :to_svg]]
-        end
+        include BadgeMethods
 
         def resource_exists?
           !badge_service.can_provide_badge_using_redirect?
         end
 
-        # Only called if resource_exists? returns false
-        def previously_existed?
-          true
-        end
-
         def is_authorized?(authorization_header)
           super || PactBroker.configuration.enable_public_badge_access
         end
 
-        def forbidden?
-          false
-        end
-
         def to_svg
           response.headers["Cache-Control"] = "no-cache"
           comment + badge_service.pact_verification_badge(pact, label, initials, pseudo_branch_verification_status, tags)
@@ -42,10 +27,6 @@ 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
@@ -61,10 +42,6 @@ module PactBroker
           @pseudo_branch_verification_status ||= PactBroker::Verifications::PseudoBranchStatus.new(pact, latest_verification).to_sym
         end
 
-        def label
-          request.query["label"]
-        end
-
         def initials
           request.query["initials"] == "true"
         end

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

@@ -0,0 +1,57 @@
+module PactBroker
+  module Api
+    module Resources
+      module BadgeMethods
+        def allowed_methods
+          ["GET", "OPTIONS"]
+        end
+
+        def content_types_provided
+          [["image/svg+xml", :to_svg]]
+        end
+
+        def resource_exists?
+          false
+        end
+
+        # Only called if resource_exists? returns false
+        def previously_existed?
+          true
+        end
+
+        def forbidden?
+          false
+        end
+
+        def is_authorized?(authorization_header)
+          super || PactBroker.configuration.enable_public_badge_access
+        end
+
+        def policy_name
+          :'badges::badge'
+        end
+
+        def moved_temporarily?
+          response.headers["Cache-Control"] = "no-cache"
+          begin
+            badge_url
+          rescue StandardError => e
+            # Want to render a badge, even if there's an error
+            badge_service.error_badge_url("error", ErrorResponseBodyGenerator.display_message(e, "reference: #{PactBroker::Errors.generate_error_reference}"))
+          end
+        end
+
+        def badge_url
+          raise NotImplementedError
+        end
+
+        private
+
+        def label
+          lab = request.query["label"]
+          lab && !lab.empty? ? lab : nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,21 +1,30 @@
 require "pact_broker/api/resources/matrix"
 require "pact_broker/matrix/can_i_deploy_query_schema"
 require "pact_broker/matrix/parse_can_i_deploy_query"
+require "pact_broker/api/decorators/matrix_decorator"
+require "pact_broker/api/decorators/matrix_text_decorator"
 
 module PactBroker
   module Api
     module Resources
-      class CanIDeployPacticipantVersionByBranchToEnvironment < Matrix
-        def resource_exists?
-          !!(version && environment)
+      class CanIDeployPacticipantVersionByBranchToEnvironment < BaseResource
+        def allowed_methods
+          ["GET", "OPTIONS"]
         end
 
-        def malformed_request?
-          false
+        def content_types_provided
+          [
+            ["application/hal+json", :to_json],
+            ["text/plain", :to_text]
+          ]
+        end
+
+        def resource_exists?
+          !!(version && environment)
         end
 
         def policy_name
-          :'matrix::can_i_deploy'
+          :'versions::version'
         end
 
         private
@@ -37,6 +46,14 @@ module PactBroker
                         }
         end
 
+        def to_json
+          decorator_class(:matrix_decorator).new(results).to_json(decorator_options)
+        end
+
+        def results
+          @results ||= matrix_service.can_i_deploy(selectors, options)
+        end
+
         def version
           @version ||= version_service.find_latest_by_pacticipant_name_and_branch_name(identifier_from_path[:pacticipant_name], identifier_from_path[:branch_name])
         end

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

@@ -0,0 +1,29 @@
+require "pact_broker/api/resources/can_i_deploy_pacticipant_version_by_branch_to_environment"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByBranchToEnvironmentBadge < CanIDeployPacticipantVersionByBranchToEnvironment
+        include BadgeMethods
+
+        private
+
+        def badge_url
+          if pacticipant && version && environment
+            badge_service.can_i_deploy_badge_url(identifier_from_path[:branch_name], identifier_from_path[:environment_name], label, results.deployable?)
+          elsif pacticipant.nil?
+            badge_service.error_badge_url("pacticipant", "not found")
+          elsif version.nil?
+            if branch_service.find_branch(identifier_from_path.slice(:pacticipant_name, :branch_name)).nil?
+              badge_service.error_badge_url("branch", "not found")
+            else
+              badge_service.error_badge_url("version", "not found")
+            end
+          else
+            badge_service.error_badge_url("environment", "not found")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module PactBroker
         end
 
         def policy_name
-          :'matrix::can_i_deploy'
+          :'versions::version'
         end
 
         def malformed_request?

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

@@ -0,0 +1,25 @@
+require "pact_broker/matrix/can_i_deploy_query_schema"
+require "pact_broker/matrix/parse_can_i_deploy_query"
+require "pact_broker/api/resources/badge_methods"
+
+module PactBroker
+  module Api
+    module Resources
+      class CanIDeployPacticipantVersionByTagToTagBadge < CanIDeployPacticipantVersionByTagToTag
+        include BadgeMethods
+
+        def badge_url
+          if pacticipant
+            if version
+              badge_service.can_i_deploy_badge_url(identifier_from_path[:tag], identifier_from_path[:to], label, results.deployable?)
+            else
+              badge_service.error_badge_url("version", "not found")
+            end
+          else
+            badge_service.error_badge_url("pacticipant", "not found")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api.rb

@@ -88,12 +88,12 @@ module PactBroker
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag], Api::Resources::LatestVersion, {resource_name: "latest_tagged_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to], Api::Resources::CanIDeployPacticipantVersionByTagToTag, { resource_name: "can_i_deploy_latest_tagged_version_to_tag" }
-        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to, "badge"], Api::Resources::CanIDeployBadge, { resource_name: "can_i_deploy_latest_tagged_version_to_tag_badge" }
+        add ["pacticipants", :pacticipant_name, "latest-version", :tag, "can-i-deploy", "to", :to, "badge"], Api::Resources::CanIDeployPacticipantVersionByTagToTagBadge, { resource_name: "can_i_deploy_latest_tagged_version_to_tag_badge" }
         add ["pacticipants", :pacticipant_name, "latest-version"], Api::Resources::LatestVersion, {resource_name: "latest_pacticipant_version"}
         add ["pacticipants", :pacticipant_name, "versions", :pacticipant_version_number, "tags", :tag_name], Api::Resources::Tag, {resource_name: "pacticipant_version_tag"}
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "versions", :version_number], Api::Resources::BranchVersion, { resource_name: "branch_version" }
         add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironment, { resource_name: "can_i_deploy_latest_branch_version_to_environment" }
-        #add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name, "badge"], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironment, { resource_name: "can_i_deploy_latest_branch_version_to_environment_badge" }
+        add ["pacticipants", :pacticipant_name, "branches", :branch_name, "latest-version", "can-i-deploy", "to-environment", :environment_name, "badge"], Api::Resources::CanIDeployPacticipantVersionByBranchToEnvironmentBadge, { resource_name: "can_i_deploy_latest_branch_version_to_environment_badge" }
 
         # Webhooks
         add ["webhooks", "provider", :provider_name, "consumer", :consumer_name ], Api::Resources::PacticipantWebhooks, {resource_name: "pacticipant_webhooks"}

data/lib/pact_broker/pacticipants/find_potential_duplicate_pacticipant_names.rb

@@ -1,11 +1,8 @@
 require "pact_broker/domain/group"
 
 module PactBroker
-
   module Pacticipants
-
     class FindPotentialDuplicatePacticipantNames
-
       attr_reader :new_name, :existing_names
 
       def initialize new_name, existing_names
@@ -40,4 +37,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/pacts/verifiable_pact.rb

@@ -29,7 +29,7 @@ module PactBroker
 
       def self.deduplicate(verifiable_pacts)
         verifiable_pacts
-          .group_by { | verifiable_pact | verifiable_pact.pact_version_sha }
+          .group_by { | verifiable_pact | [verifiable_pact.consumer_name, verifiable_pact.pact_version_sha] }
           .values
           .collect { | verifiable_pact | verifiable_pact.reduce(&:+) }
       end
@@ -51,6 +51,10 @@ module PactBroker
           raise PactBroker::Error.new("Can't merge two verifiable pacts with different provider_branch")
         end
 
+        if consumer_name != other.consumer_name
+          raise PactBroker::Error.new("Can't merge two verifiable pacts with different consumer names")
+        end
+
         latest_pact = [self, other].sort_by(&:consumer_version_order).last.__getobj__()
 
         VerifiablePact.new(

data/lib/pact_broker/ui/controllers/can_i_deploy.rb

@@ -16,7 +16,7 @@ module PactBroker
         include PactBroker::UI::Helpers::MatrixHelper
 
         get "/:pacticipant_name/latest-version/:tag/can-i-deploy/to/:environment_tag" do
-          # selector and options must be in sync with lib/pact_broker/api/resources/can_i_deploy_badge.rb
+          # selector and options must be in sync with lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_tag_to_tag_badge.rb
           selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:pacticipant_name], latest: true, tag: params[:tag]) ]
           options = { latestby: "cvp", limit: 100, tag: params[:to] }
           result = matrix_service.find(selectors, options)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.94.0"
+  VERSION = "2.95.0"
 end

data/lib/pact_broker/versions/branch.rb

@@ -8,6 +8,10 @@ module PactBroker
       plugin :insert_ignore, identifying_columns: [:name, :pacticipant_id]
 
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
+
+      dataset_module do
+        include PactBroker::Repositories::Helpers
+      end
     end
   end
 end

data/lib/pact_broker/versions/branch_service.rb

@@ -19,6 +19,16 @@ module PactBroker
         version = version_repository.find_by_pacticipant_id_and_number_or_create(pacticipant.id, version_number)
         branch_version_repository.add_branch(version, branch_name)
       end
+
+      def self.find_branch(pacticipant_name:, branch_name:)
+        Branch
+          .select_all_qualified
+          .join(:pacticipants, { Sequel[:branches][:pacticipant_id] => Sequel[:pacticipants][:id] }) do
+            PactBroker::Repositories::Helpers.name_like(Sequel[:pacticipants][:name], pacticipant_name)
+          end
+          .where(Sequel[:branches][:name] => branch_name)
+          .single_record
+      end
     end
   end
 end

data/lib/webmachine/describe_routes.rb

@@ -3,6 +3,28 @@ require "webmachine/adapters/rack_mapped"
 module Webmachine
   class DescribeRoutes
 
+    Route = Struct.new(
+        :path,
+        :resource_class,
+        :resource_name,
+        :resource_class_location,
+        :allowed_methods,
+        :policy_class,
+        keyword_init: true) do
+
+      def [](key)
+        if respond_to?(key)
+          send(key)
+        else
+          nil
+        end
+      end
+
+      def path_include?(component)
+        path.include?(component)
+      end
+    end
+
     def self.call(webmachine_applications, search_term: nil)
       path_mappings = webmachine_applications.flat_map { | webmachine_application | paths_to_resource_class_mappings(webmachine_application) }
 
@@ -16,12 +38,12 @@ module Webmachine
     def self.paths_to_resource_class_mappings(webmachine_application)
       webmachine_application.routes.collect do | route |
         resource_path_absolute = Pathname.new(source_location_for(route.resource))
-        {
+        Route.new({
           path: "/" + route.path_spec.collect{ |part| part.is_a?(Symbol) ? ":#{part}" : part  }.join("/"),
           resource_class: route.resource,
           resource_name: route.instance_variable_get(:@bindings)[:resource_name],
           resource_class_location: resource_path_absolute.relative_path_from(Pathname.pwd).to_s
-        }.merge(info_from_resource_instance(route))
+        }.merge(info_from_resource_instance(route)))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.94.0
+  version: 2.95.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -589,6 +589,7 @@ files:
 - db/migrations/20211104_switch_integrations_and_temp_integrations.rb
 - db/migrations/20211120_create_pact_version_provider_tag_successful_verifications.rb
 - db/migrations/20211121_migrate_pact_version_provider_tag_successful_verifications_data.rb
+- db/migrations/20220303_increase_consumer_version_selector_hashes_column_size.rb
 - db/migrations/migration_helper.rb
 - docs/CONFIGURATION.md
 - docs/api/WEBHOOKS.md
@@ -697,12 +698,14 @@ files:
 - lib/pact_broker/api/resources/authentication.rb
 - lib/pact_broker/api/resources/authorization.rb
 - lib/pact_broker/api/resources/badge.rb
+- lib/pact_broker/api/resources/badge_methods.rb
 - lib/pact_broker/api/resources/base_resource.rb
 - lib/pact_broker/api/resources/branch_version.rb
 - lib/pact_broker/api/resources/can_i_deploy.rb
-- lib/pact_broker/api/resources/can_i_deploy_badge.rb
 - lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_branch_to_environment.rb
+- lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_branch_to_environment_badge.rb
 - lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_tag_to_tag.rb
+- lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_by_tag_to_tag_badge.rb
 - lib/pact_broker/api/resources/clean.rb
 - lib/pact_broker/api/resources/currently_deployed_versions_for_environment.rb
 - lib/pact_broker/api/resources/currently_supported_versions_for_environment.rb
@@ -1226,7 +1229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: See description

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

@@ -1,85 +0,0 @@
-require "pact_broker/matrix/can_i_deploy_query_schema"
-require "pact_broker/matrix/parse_can_i_deploy_query"
-
-module PactBroker
-  module Api
-    module Resources
-      class CanIDeployBadge < BaseResource
-        def initialize
-          super
-          selector = PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: pacticipant_name, latest: true, tag: identifier_from_path[:tag])
-          @options = {
-            latestby: "cvp",
-            latest: true,
-            tag: identifier_from_path[:to]
-          }
-          @selectors = [selector]
-        end
-
-        def allowed_methods
-          ["GET", "OPTIONS"]
-        end
-
-        def content_types_provided
-          [["image/svg+xml", :to_svg]]
-        end
-
-        def resource_exists?
-          false
-        end
-
-        # Only called if resource_exists? returns false
-        def previously_existed?
-          true
-        end
-
-        def is_authorized?(authorization_header)
-          super || PactBroker.configuration.enable_public_badge_access
-        end
-
-        def forbidden?
-          false
-        end
-
-        def moved_temporarily?
-          response.headers["Cache-Control"] = "no-cache"
-          begin
-            if pacticipant
-              if version
-                badge_service.can_i_deploy_badge_url(identifier_from_path[:tag], identifier_from_path[:to], label, results.deployable?)
-              else
-                badge_service.error_badge_url("version", "not found")
-              end
-            else
-              badge_service.error_badge_url(selectors.first.pacticipant_name, "not found")
-            end
-          rescue StandardError => e
-            # Want to render a badge, even if there's an error
-            badge_service.error_badge_url("error", ErrorResponseBodyGenerator.display_message(e, "reference: #{PactBroker::Errors.generate_error_reference}"))
-          end
-        end
-
-        def policy_name
-          :'badges::badge'
-        end
-
-        private
-
-        attr_reader :selectors, :options
-
-        def results
-          @results ||= matrix_service.can_i_deploy(selectors, options)
-        end
-
-        def version
-          @version ||= version_service.find_by_pacticipant_name_and_latest_tag(identifier_from_path[:pacticipant_name], identifier_from_path[:tag])
-        end
-
-        def label
-          lab = request.query["label"]
-          lab && !lab.empty? ? lab : nil
-        end
-      end
-    end
-  end
-end