pact_broker 2.63.0 → 2.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61338a93bd65ffa3ec70f4fdfd9b509a0d5c0608dce8cea3f779e3ac22151412
-  data.tar.gz: 99819023ba051657020d314fe6d3005a04660d70467a57c5b5369a08a5525e2a
+  metadata.gz: 3fee7d96bde4fc04adb41fe041a124e81c9b371336f9308f92c918a2fb4ca914
+  data.tar.gz: 3706e5b3a8fbf6db31c748658a1b0f22713f872889757844c9506250b2cefa54
 SHA512:
-  metadata.gz: 7da446c51346413782377eb409c2d3159fcb322147d675324126243bfb8b115ff042d210b3cf25ee46ebe73093611e4de85db03f243c5ffb06299239d6aff637
-  data.tar.gz: 6b191f39b782bf811d58e15d149fa5e786227e6a86d93c0f8888a6134b992d6f60ad58ff2b2b6cf84ba612b72368cf569471b9214b85f7ce173e18872e89ddec
+  metadata.gz: d1a1046845fb3832062d675ebfa1d49e0fa62ac6ea8acb8edb6c706b53e66888b72a243bc16e94842b89b4b349adf3ac22c3f35f043a75538f9dea7f3d28122a
+  data.tar.gz: fdad352fd207e05717eb127ec0ad0c35de8465b4dfed9a6cdcf862bc5d6f169bf15975a932c8cd355716b90ba3291552fadc35aab1768710179f330592fd5166

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v2.64.0"></a>
+### v2.64.0 (2020-09-25)
+
+#### Features
+
+* add API endpoint for can-i-deploy for latest tagged pacticipant version	 ([88fdc60a](/../../commit/88fdc60a))
+* render matrix UI page for can-i-deploy endpoint	 ([463e9cfd](/../../commit/463e9cfd))
+* change text on can-i-deploy badge	 ([f9e183e9](/../../commit/f9e183e9))
+
 <a name="v2.63.0"></a>
 ### v2.63.0 (2020-09-25)
 

data/lib/pact_broker/api.rb

@@ -71,6 +71,7 @@ module PactBroker
         add ['pacticipants', :pacticipant_name, 'versions'], Api::Resources::Versions, {resource_name: "pacticipant_versions"}
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number], Api::Resources::Version, {resource_name: "pacticipant_version"}
         add ['pacticipants', :pacticipant_name, 'latest-version', :tag], Api::Resources::Version, {resource_name: "latest_tagged_pacticipant_version"}
+        add ['pacticipants', :pacticipant_name, 'latest-version', :tag, 'can-i-deploy', 'to', :to], Api::Resources::CanIDeployPacticipantVersion, { resource_name: "can_i_deploy_latest_tagged_version" }
         add ['pacticipants', :pacticipant_name, 'latest-version', :tag, 'can-i-deploy', 'to', :to, 'badge'], Api::Resources::CanIDeployBadge, { resource_name: "can_i_deploy_badge" }
         add ['pacticipants', :pacticipant_name, 'latest-version'], Api::Resources::Version, {resource_name: "latest_pacticipant_version"}
         add ['pacticipants', :pacticipant_name, 'versions', :pacticipant_version_number, 'tags', :tag_name], Api::Resources::Tag, {resource_name: "pacticipant_version_tag"}

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -204,8 +204,12 @@ module PactBroker
         pacticipant_url_from_params({ pacticipant_name: pacticipant_name }, base_url) + "/labels/{label}"
       end
 
+      def templated_can_i_deploy_url pacticipant_name, base_url = ""
+        pacticipant_url_from_params({ pacticipant_name: pacticipant_name }, base_url) + "/latest-version/{tag}/can-i-deploy/to/{environmentTag}"
+      end
+
       def templated_can_i_deploy_badge_url pacticipant_name, base_url = ""
-        pacticipant_url_from_params({ pacticipant_name: pacticipant_name }, base_url) + "/latest-version/{tag}/can-i-deploy/to/{environmentTag}/badge"
+        templated_can_i_deploy_url(pacticipant_name, base_url) + "/badge"
       end
 
       def label_url label, base_url

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

@@ -46,7 +46,7 @@ module PactBroker
           begin
             if pacticipant
               if version
-                badge_service.can_i_deploy_badge_url(pacticipant_name, identifier_from_path[:tag], identifier_from_path[:to], label, results.deployable?)
+                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

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

@@ -0,0 +1,40 @@
+require 'pact_broker/api/resources/matrix'
+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 CanIDeployPacticipantVersion < Matrix
+        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 resource_exists?
+          !!version
+        end
+
+        def policy_name
+          :'matrix::can_i_deploy'
+        end
+
+        private
+
+        def version
+          @version ||= version_service.find_by_pacticipant_name_and_latest_tag(identifier_from_path[:pacticipant_name], identifier_from_path[:tag])
+        end
+
+        def results
+          @results ||= matrix_service.find(selectors, options)
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/badges/service.rb

@@ -33,9 +33,9 @@ module PactBroker
         build_shield_io_uri(title, status, color)
       end
 
-      def can_i_deploy_badge_url(pacticipant_name, tag, environment_tag, label, deployable)
-        title = label || "Can I deploy #{tag} #{pacticipant_name} to #{environment_tag}?"
-        status = deployable ? "yes" : "no"
+      def can_i_deploy_badge_url(tag, environment_tag, label, deployable)
+        title = label || "can-i-deploy"
+        status = "#{tag} to #{environment_tag}"
         color = deployable ? "brightgreen" : "red"
         build_shield_io_uri(title, status, color)
       end

data/lib/pact_broker/ui/app.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/ui/controllers/index'
 require 'pact_broker/ui/controllers/groups'
 require 'pact_broker/ui/controllers/matrix'
+require 'pact_broker/ui/controllers/can_i_deploy'
 require 'pact_broker/ui/controllers/error_test'
 require 'pact_broker/doc/controllers/app'
 
@@ -41,6 +42,11 @@ module PactBroker
             run PactBroker::UI::Controllers::Matrix
           end
 
+          map "/pacticipants/" do
+            use PathInfoFixer
+            run PactBroker::UI::Controllers::CanIDeploy
+          end
+
           map "/test/error" do
             use PathInfoFixer
             run PactBroker::UI::Controllers::ErrorTest

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

@@ -0,0 +1,42 @@
+require 'pact_broker/ui/controllers/base_controller'
+require 'pact_broker/ui/view_models/matrix_lines'
+require 'pact_broker/matrix/unresolved_selector'
+require 'pact_broker/matrix/parse_query'
+require 'pact_broker/logging'
+require 'pact_broker/api/pact_broker_urls'
+require 'pact_broker/ui/helpers/matrix_helper'
+require 'haml'
+
+module PactBroker
+  module UI
+    module Controllers
+      class CanIDeploy < Base
+
+        include PactBroker::Services
+        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
+          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)
+          lines = PactBroker::UI::ViewDomain::MatrixLines.new(result, base_url: base_url)
+          locals = {
+            lines: lines,
+            selectors: create_selector_objects(selectors),
+            options: create_options_model(options),
+            badge_url: badge_url,
+            base_url: base_url
+          }
+          haml :'matrix/show', { locals: locals, layout: :'layouts/main', escape_html: true }
+        end
+
+        def badge_url
+          u = URI(request.url)
+          u.path = u.path + "/badge"
+          u.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require 'pact_broker/matrix/unresolved_selector'
 require 'pact_broker/matrix/parse_query'
 require 'pact_broker/logging'
 require 'pact_broker/api/pact_broker_urls'
-
+require 'pact_broker/ui/helpers/matrix_helper'
 require 'haml'
 
 module PactBroker
@@ -13,13 +13,13 @@ module PactBroker
       class Matrix < Base
 
         include PactBroker::Services
+        include PactBroker::UI::Helpers::MatrixHelper
 
         get "/" do
           selectors = [OpenStruct.new, OpenStruct.new]
           options = { limit: 100, latestby: nil }
           locals = {
             lines: [],
-            title: "The Matrix",
             selectors: create_selector_objects(selectors),
             options: create_options_model(options),
             base_url: base_url
@@ -33,7 +33,7 @@ module PactBroker
               if errors.empty?
                 lines = matrix_service.find(selectors, options)
                 locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines)
-                locals[:badge_url] = matrix_badge_url(selectors, lines)
+                locals[:badge_url] = matrix_badge_url(selectors, lines, base_url)
               else
                 locals[:errors] = errors
               end
@@ -52,7 +52,6 @@ module PactBroker
           lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url)
           locals = {
             lines: lines,
-            title: "The Matrix",
             consumer_name: params[:consumer_name],
             provider_name: params[:provider_name],
             selectors: create_selector_objects(selectors),
@@ -62,36 +61,6 @@ module PactBroker
           }
           haml :'matrix/show', { locals: locals, layout: :'layouts/main', escape_html: true }
         end
-
-        def create_selector_objects(selector_hashes)
-          selector_hashes.collect do | selector_hash |
-            o = OpenStruct.new(selector_hash)
-            o.specify_latest_tag = o.tag && o.latest ? 'checked' : nil
-            o.specify_all_tagged = o.tag && !o.latest ? 'checked' : nil
-            o.specify_latest = o.latest ? 'checked' : nil
-            o.specify_version = o.pacticipant_version_number ? 'checked' : nil
-            o.specify_all_versions = !(o.tag || o.pacticipant_version_number) ? 'checked' : nil
-            o
-          end
-        end
-
-        def create_options_model(options)
-          o = OpenStruct.new(options)
-          o.cvpv_checked = o.latestby == 'cvpv' ? 'checked' : nil
-          o.cvp_checked = o.latestby == 'cvp' ? 'checked' : nil
-          o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
-          o
-        end
-
-        def matrix_badge_url(selectors, lines)
-          if lines.any? && selectors.size == 2 && selectors.all?{ | selector| selector.latest_for_pacticipant_and_tag? }
-            consumer_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.consumer_name }
-            provider_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.provider_name }
-            if consumer_selector && provider_selector
-              PactBroker::Api::PactBrokerUrls.matrix_badge_url_for_selectors(consumer_selector, provider_selector, base_url)
-            end
-          end
-        end
       end
     end
   end

data/lib/pact_broker/ui/helpers/matrix_helper.rb

@@ -0,0 +1,40 @@
+module PactBroker
+  module UI
+    module Helpers
+      module MatrixHelper
+
+        extend self
+
+        def create_selector_objects(selector_hashes)
+          selector_hashes.collect do | selector_hash |
+            o = OpenStruct.new(selector_hash)
+            o.specify_latest_tag = o.tag && o.latest ? 'checked' : nil
+            o.specify_all_tagged = o.tag && !o.latest ? 'checked' : nil
+            o.specify_latest = o.latest ? 'checked' : nil
+            o.specify_version = o.pacticipant_version_number ? 'checked' : nil
+            o.specify_all_versions = !(o.tag || o.pacticipant_version_number) ? 'checked' : nil
+            o
+          end
+        end
+
+        def create_options_model(options)
+          o = OpenStruct.new(options)
+          o.cvpv_checked = o.latestby == 'cvpv' ? 'checked' : nil
+          o.cvp_checked = o.latestby == 'cvp' ? 'checked' : nil
+          o.all_rows_checked = o.latestby.nil? ? 'checked' : nil
+          o
+        end
+
+        def matrix_badge_url(selectors, lines, base_url)
+          if lines.any? && selectors.size == 2 && selectors.all?{ | selector| selector.latest_for_pacticipant_and_tag? }
+            consumer_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.consumer_name }
+            provider_selector = selectors.find{ | selector| selector.pacticipant_name == lines.first.provider_name }
+            if consumer_selector && provider_selector
+              PactBroker::Api::PactBrokerUrls.matrix_badge_url_for_selectors(consumer_selector, provider_selector, base_url)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -13,7 +13,7 @@
       %a{href: "#{base_url}/"}
         Home
     %h1.page-header
-      = title
+      The Matrix
       - if defined?(badge_url) && badge_url
         %img{src: badge_url, class: 'pact_badge' }
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.63.0'
+  VERSION = '2.64.0'
 end

data/spec/lib/pact_broker/api/resources/can_i_deploy_badge_spec.rb

@@ -32,7 +32,7 @@ module PactBroker
 
         context "when the pacticipant exists" do
           it "returns a redirect to the badge" do
-            expect(badge_service).to receive(:can_i_deploy_badge_url).with("Foo", "main", "prod", nil, true)
+            expect(badge_service).to receive(:can_i_deploy_badge_url).with("main", "prod", nil, true)
             expect(subject.status).to eq 307
           end
         end
@@ -59,7 +59,7 @@ module PactBroker
           subject { get(path, label: "some custom label") }
 
           it "returns a redirect to a badge with a custom label" do
-            expect(badge_service).to receive(:can_i_deploy_badge_url).with("Foo", "main", "prod", "some custom label", true)
+            expect(badge_service).to receive(:can_i_deploy_badge_url).with("main", "prod", "some custom label", true)
             subject
           end
         end

data/spec/lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_spec.rb

@@ -0,0 +1,31 @@
+require 'pact_broker/api/resources/can_i_deploy_pacticipant_version'
+require 'pact_broker/matrix/service'
+
+module PactBroker
+  module Api
+    module Resources
+      describe CanIDeployPacticipantVersion do
+        include_context "stubbed services"
+
+        before do
+          allow(PactBroker::Matrix::Service).to receive(:find).and_return([])
+          allow(pacticipant_service).to receive(:find_pacticipant_by_name).and_return(pacticipant)
+          allow(version_service).to receive(:find_by_pacticipant_name_and_latest_tag).and_return(version)
+          allow(PactBroker::Api::Decorators::MatrixDecorator).to receive(:new).and_return(decorator)
+        end
+
+        let(:pacticipant) { double('pacticipant') }
+        let(:version) { double('version') }
+        let(:path) { "/pacticipants/Foo/latest-version/main/can-i-deploy/to/prod" }
+        let(:json_response_body) { JSON.parse(subject.body, symbolize_names: true) }
+        let(:decorator) { double('decorator', to_json: 'response_body') }
+        let(:selectors) { double('selectors') }
+        let(:options) { double('options') }
+
+        subject { get(path, nil, 'Content-Type' => 'application/hal+json') }
+
+        it { is_expected.to be_a_hal_json_success_response }
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/badges/service_spec.rb

@@ -29,6 +29,12 @@ module PactBroker
         allow(Service).to receive(:logger).and_return(logger)
       end
 
+      describe "can_i_deploy_badge_url" do
+        subject { Service.can_i_deploy_badge_url("main", "prod", nil, true) }
+
+        it { is_expected.to eq URI("https://img.shields.io/badge/can--i--deploy-main%20to%20prod-brightgreen.svg") }
+      end
+
       describe "pact_verification_badge_url" do
         context "with the pact is nil" do
           let(:pact) { nil }

data/spec/lib/pact_broker/ui/controllers/can_i_deploy_spec.rb

@@ -0,0 +1,26 @@
+require 'pact_broker/ui/controllers/can_i_deploy'
+
+module PactBroker
+  module UI
+    module Controllers
+      describe CanIDeploy do
+
+        let(:app) { CanIDeploy }
+
+        describe "GET" do
+          before do
+            TestDataBuilder.new
+              .create_pact_with_hierarchy("Foo", "1", "Bar")
+              .create_consumer_version_tag("main")
+          end
+
+          subject { get("/Foo/latest-version/main/can-i-deploy/to/prod") }
+
+          it "renders the matrix page" do
+            expect(subject.body).to include "The Matrix"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.63.0
+  version: 2.64.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -643,6 +643,7 @@ files:
 - lib/pact_broker/api/resources/base_resource.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.rb
 - lib/pact_broker/api/resources/dashboard.rb
 - lib/pact_broker/api/resources/default_base_resource.rb
 - lib/pact_broker/api/resources/error_handler.rb
@@ -869,11 +870,13 @@ files:
 - lib/pact_broker/ui.rb
 - lib/pact_broker/ui/app.rb
 - lib/pact_broker/ui/controllers/base_controller.rb
+- lib/pact_broker/ui/controllers/can_i_deploy.rb
 - lib/pact_broker/ui/controllers/clusters.rb
 - lib/pact_broker/ui/controllers/error_test.rb
 - lib/pact_broker/ui/controllers/groups.rb
 - lib/pact_broker/ui/controllers/index.rb
 - lib/pact_broker/ui/controllers/matrix.rb
+- lib/pact_broker/ui/helpers/matrix_helper.rb
 - lib/pact_broker/ui/helpers/url_helper.rb
 - lib/pact_broker/ui/view_models/clusters.rb
 - lib/pact_broker/ui/view_models/index_item.rb
@@ -1170,6 +1173,7 @@ files:
 - 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/can_i_deploy_badge_spec.rb
+- spec/lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_spec.rb
 - spec/lib/pact_broker/api/resources/dashboard_spec.rb
 - spec/lib/pact_broker/api/resources/default_base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/error_handler_spec.rb
@@ -1274,6 +1278,7 @@ files:
 - spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
+- spec/lib/pact_broker/ui/controllers/can_i_deploy_spec.rb
 - spec/lib/pact_broker/ui/controllers/clusters_spec.rb
 - spec/lib/pact_broker/ui/controllers/index_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_item_spec.rb
@@ -1558,6 +1563,7 @@ test_files:
 - 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/can_i_deploy_badge_spec.rb
+- spec/lib/pact_broker/api/resources/can_i_deploy_pacticipant_version_spec.rb
 - spec/lib/pact_broker/api/resources/dashboard_spec.rb
 - spec/lib/pact_broker/api/resources/default_base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/error_handler_spec.rb
@@ -1662,6 +1668,7 @@ test_files:
 - spec/lib/pact_broker/relationships/groupify_spec.rb
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
+- spec/lib/pact_broker/ui/controllers/can_i_deploy_spec.rb
 - spec/lib/pact_broker/ui/controllers/clusters_spec.rb
 - spec/lib/pact_broker/ui/controllers/index_spec.rb
 - spec/lib/pact_broker/ui/view_models/index_item_spec.rb