pact_broker 2.90.0 → 2.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41b90582f2bdd3705172c79b28f01ca1bf9db3c2a32aa221baf164315017d74
-  data.tar.gz: 3e3c6263edf2440b0fd1003f4a4bc03a4b81df3f85953a56e2dae23bd2b95fa2
+  metadata.gz: c1634d0a3519aae8c805e0c8f13e2e132e86b623c92e019d37285b98ecd7574d
+  data.tar.gz: 2652bd80a29b04e222bad6ffb0513c95618f16185feb98cffc9c7bd283858b79
 SHA512:
-  metadata.gz: 0fdf1ae5f33491587a8a26f730976089a91a763376974f4703df46317b64e9814d2d4c56319c5417ebcad4485b79b9ec3d152175b4470d8021b7e27f9ce6ef6d
-  data.tar.gz: 7a02341d2cd0f63a7168b2d437f4b10346d82243dc0b624af686d74de645c4f611deb756ecd9076eb226666af38600bd6448c8abcb58633f4db10c8a5d5ed468
+  metadata.gz: 8e3bc701ea3fe67d6ffe24330faf61b5def23d7293e2c59bfa1d4c5b8874dd3ef8b622f8adbef202bdfd784804f67a5c9efd39c79c1bba54bb52a8fe2abc7661
+  data.tar.gz: ab7a4c68f71251bbf36e3f58bb18267b28cc1bd72df5f3959caedd8fe1b776439b6ba25fd972f2a819ba5f0872d9861d22284da501a5d921f255aea368bedfab

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v2.91.0"></a>
+### v2.91.0 (2021-11-15)
+
+#### Features
+
+* add environments to matrix response	 ([fd50f22c](/../../commit/fd50f22c))
+* remove feature toggle around change to return the pact for the latest tagged version, rather than the latest pact that has a version with the tag	 ([fac3fc8a](/../../commit/fac3fc8a))
+
+#### Bug Fixes
+
+* load images from the correct path when the Pact Broker application is run from a non root context	 ([a268ef25](/../../commit/a268ef25))
+
 <a name="v2.90.0"></a>
 ### v2.90.0 (2021-11-12)
 

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

@@ -0,0 +1,25 @@
+require_relative "base_decorator"
+require_relative "timestamps"
+
+module PactBroker
+  module Api
+    module Decorators
+      class EmbeddedEnvironmentDecorator < BaseDecorator
+        property :uuid, writeable: false
+        property :name
+        property :display_name, camelize: true
+        property :production
+
+        include Timestamps
+
+        link :self do | user_options |
+          {
+            title: "Environment",
+            name: represented.name,
+            href: environment_url(represented, user_options.fetch(:base_url))
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require "pact_broker/api/pact_broker_urls"
 require "pact_broker/api/decorators/reason_decorator"
 require "pact_broker/api/decorators/format_date_time"
 require "pact_broker/api/decorators/embedded_branch_version_decorator"
+require "pact_broker/api/decorators/embedded_environment_decorator"
 
 module PactBroker
   module Api
@@ -85,7 +86,9 @@ module PactBroker
             version: {
               number: line.consumer_version_number,
               branch: line.consumer_version_branch_versions.last&.branch_name,
-              branches: branches(line.consumer_version_branch_versions, base_url),
+              branches: branches(line.consumer_version_branch_versions, base_url), # TODO delete this
+              branchVersions: branches(line.consumer_version_branch_versions, base_url),
+              environments: environments(line.consumer_version_deployed_versions, line.consumer_version_released_versions, base_url),
               _links: {
                 self: {
                   href: version_url(base_url, consumer_version)
@@ -107,6 +110,16 @@ module PactBroker
           end
         end
 
+        def environments(deployed_versions, released_versions, base_url)
+          (deployed_versions + released_versions).sort_by(&:created_at).collect(&:environment).uniq.collect do | environment |
+            environment_decorator_class.new(environment).to_hash(user_options: { base_url: base_url })
+          end
+        end
+
+        def environment_decorator_class
+          PactBroker::Api::Decorators::EmbeddedEnvironmentDecorator
+        end
+
         def tags(tags, base_url)
           tags.sort_by(&:created_at).collect do | tag |
             {
@@ -136,7 +149,9 @@ module PactBroker
             hash[:version] = {
               number: line.provider_version_number,
               branch: line.provider_version_branch_versions.last&.branch_name,
-              branches: branches(line.provider_version_branch_versions, base_url),
+              branches: branches(line.provider_version_branch_versions, base_url), # TODO delete this
+              branchVersions: branches(line.provider_version_branch_versions, base_url),
+              environments: environments(line.provider_version_deployed_versions, line.provider_version_released_versions, base_url),
               _links: {
                 self: {
                   href: version_url(base_url, provider_version)

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

@@ -7,7 +7,9 @@ module PactBroker
       class VersionDecorator < BaseDecorator
 
         property :number, writeable: false
+        # TODO delete branches in preference for branchVersions
         collection :branch_versions, as: :branches, embedded: true, writeable: false, extend: PactBroker::Api::Decorators::EmbeddedBranchVersionDecorator
+        collection :branch_versions, as: :branchVersions, embedded: true, writeable: false, extend: PactBroker::Api::Decorators::EmbeddedBranchVersionDecorator
         property :build_url, as: :buildUrl
 
         collection :tags, embedded: true, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator, class: OpenStruct

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

@@ -44,6 +44,10 @@ module PactBroker
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/material-menu.css'>
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/pact.css'>
           <link rel='stylesheet' type='text/css' href='#{base_url}/stylesheets/jquery-confirm.min.css'>
+          <script type='text/javascript'>
+            const BASE_URL = '#{base_url}';
+          </script>
+          <script src='#{base_url}/javascripts/set-css-asset-base-url.js'></script>
           <script src='#{base_url}/javascripts/highlight.pack.js'></script>
           <script src='#{base_url}/javascripts/jquery-3.5.1.min.js'></script>
           <script src='#{base_url}/js/bootstrap.min.js'></script>

data/lib/pact_broker/matrix/quick_row.rb

@@ -361,6 +361,14 @@ module PactBroker
         consumer_version.branch_versions
       end
 
+      def consumer_version_deployed_versions
+        consumer_version.current_deployed_versions
+      end
+
+      def consumer_version_released_versions
+        consumer_version.current_supported_released_versions
+      end
+
       def consumer_version_order
         consumer_version.order
       end
@@ -377,6 +385,14 @@ module PactBroker
         provider_version&.branch_versions || []
       end
 
+      def provider_version_deployed_versions
+        provider_version&.current_deployed_versions || []
+      end
+
+      def provider_version_released_versions
+        provider_version&.current_supported_released_versions || []
+      end
+
       def provider_version_order
         provider_version&.order
       end

data/lib/pact_broker/pacts/pact_publication_dataset_module.rb

@@ -204,28 +204,24 @@ module PactBroker
       # The pacts for the latest versions with the specified tag (new logic)
       # NOT the latest pact that belongs to a version with the specified tag.
       def for_latest_consumer_versions_with_tag(tag_name)
-        if PactBroker.feature_enabled?(:fix_issue_494)
-          head_tags = PactBroker::Domain::Tag
-                        .select_group(:pacticipant_id, :name)
-                        .select_append{ max(version_order).as(:latest_version_order) }
-                        .where(name: tag_name)
-
-          head_tags_join = {
-            Sequel[:pact_publications][:consumer_id] => Sequel[:head_tags][:pacticipant_id],
-            Sequel[:pact_publications][:consumer_version_order] => Sequel[:head_tags][:latest_version_order]
-          }
-
-          base_query = self
-          if no_columns_selected?
-            base_query = base_query.select_all_qualified.select_append(Sequel[:head_tags][:name].as(:tag_name))
-          end
-
-          base_query
-            .join(head_tags, head_tags_join, { table_alias: :head_tags })
-           .remove_overridden_revisions_from_complete_query
-        else
-          latest_for_consumer_tag(tag_name)
+        head_tags = PactBroker::Domain::Tag
+                      .select_group(:pacticipant_id, :name)
+                      .select_append{ max(version_order).as(:latest_version_order) }
+                      .where(name: tag_name)
+
+        head_tags_join = {
+          Sequel[:pact_publications][:consumer_id] => Sequel[:head_tags][:pacticipant_id],
+          Sequel[:pact_publications][:consumer_version_order] => Sequel[:head_tags][:latest_version_order]
+        }
+
+        base_query = self
+        if no_columns_selected?
+          base_query = base_query.select_all_qualified.select_append(Sequel[:head_tags][:name].as(:tag_name))
         end
+
+        base_query
+          .join(head_tags, head_tags_join, { table_alias: :head_tags })
+         .remove_overridden_revisions_from_complete_query
       end
 
       def in_environments

data/lib/pact_broker/ui/views/index/_css_and_js.haml

@@ -9,3 +9,4 @@
 %script{type: 'text/javascript', src:"#{base_url}/javascripts/index.js?v=#{PactBroker::VERSION}"}
 %script{type: 'text/javascript', src:"#{base_url}/javascripts/clipboard.js?v=#{PactBroker::VERSION}"}
 %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-confirm.min.js?v=#{PactBroker::VERSION}"}
+%script{type: 'text/javascript', src:"#{base_url}/javascripts/set-css-asset-base-url.js?v=#{PactBroker::VERSION}"}

data/lib/pact_broker/ui/views/layouts/main.haml

@@ -8,4 +8,8 @@
     %link{rel: 'stylesheet', href: "#{base_url}/css/bootstrap.min.css?v=#{PactBroker::VERSION}"}
     %script{type: 'text/javascript', src:"#{base_url}/javascripts/jquery-3.5.1.min.js?v=#{PactBroker::VERSION}"}
     %script{type: 'text/javascript', src:"#{base_url}/js/bootstrap.bundle.min.js?v=#{PactBroker::VERSION}"}
+
+    :javascript
+      const BASE_URL = '#{base_url}';
+
   != yield

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

@@ -9,6 +9,7 @@
   %script{type: 'text/javascript', src: "#{base_url}/javascripts/matrix.js?v=#{PactBroker::VERSION}"}
   %script{type: 'text/javascript', src: "#{base_url}/javascripts/clipboard.js?v=#{PactBroker::VERSION}"}
   %script{type: 'text/javascript', src: "#{base_url}/js/bootstrap.bundle.min.js?v=#{PactBroker::VERSION}"}
+  %script{type: 'text/javascript', src: "#{base_url}/javascripts/set-css-asset-base-url.js?v=#{PactBroker::VERSION}"}
 
   .container
     %nav{'aria-label': 'breadcrumb'}

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.90.0"
+  VERSION = "2.91.0"
 end

data/public/javascripts/set-css-asset-base-url.js

@@ -0,0 +1,23 @@
+/*
+  Set the base URL of the background images
+  so they load from the right path when the base
+  URL of the app is not /
+  Must be loaded after the css but before any of the elements have started to render.
+*/
+
+function setCssAssetBaseUrl(base_url, varName) {
+  const urlVar = getComputedStyle(document.documentElement).getPropertyValue(varName)
+  if (urlVar) {
+    const absoluteUrlVar = urlVar.replace(/\//, (base_url + '/'));
+    const root = document.querySelector(':root');
+    root.style.setProperty(varName, absoluteUrlVar);
+  }
+}
+
+setCssAssetBaseUrl(BASE_URL, '--kebab-url');
+setCssAssetBaseUrl(BASE_URL, '--pact-kebab-url');
+setCssAssetBaseUrl(BASE_URL, '--clock-url');
+setCssAssetBaseUrl(BASE_URL, '--arrow-switch-url');
+setCssAssetBaseUrl(BASE_URL, '--alert-url');
+setCssAssetBaseUrl(BASE_URL, '--copy-url');
+setCssAssetBaseUrl(BASE_URL, '--check-url');

data/public/stylesheets/index.css

@@ -1,3 +1,12 @@
+:root {
+  /* See public/javascripts/set-css-asset-base-url.js */
+  --kebab-url: url('/images/kebab-horizontal.svg');
+  --arrow-switch-url: url('/images/arrow-switch.svg');
+  --alert-url: url('/images/alert.svg');
+  --copy-url:  url('/images/copy.svg');
+  --check-url: url('/images/check.svg');
+}
+
 .table-striped>tbody>tr>td.pact, .table-striped>thead>tr>th.pact {
   border-left: none;
   border-right: none;
@@ -173,7 +182,7 @@ span.integration-settings {
 }
 
 span.kebab-horizontal {
-  background-image: url('/images/kebab-horizontal.svg');
+  background-image: var(--kebab-url);
   background-repeat: no-repeat;
   display:block;
   position: relative;
@@ -183,7 +192,7 @@ span.kebab-horizontal {
 }
 
 span.sort-icon {
-  background-image: url('/images/arrow-switch.svg');
+  background-image: var(--arrow-switch-url);
   background-repeat: no-repeat;
   display:inline-block;
   position: relative;
@@ -194,7 +203,7 @@ span.sort-icon {
 }
 
 span.warning-icon {
- background-image: url('/images/alert.svg');
+ background-image: var(--alert-url);
  background-repeat: no-repeat;
  display:inline-block;
  position: relative;
@@ -213,7 +222,7 @@ span.warning-icon {
 }
 
 span.copy-icon {
-  background-image: url('/images/copy.svg');
+  background-image: var(--copy-url);
   background-size: 16px 16px;
   background-repeat: no-repeat;
   display:block;
@@ -224,7 +233,7 @@ span.copy-icon {
 }
 
 span.copy-success-icon {
-  background-image: url('/images/check.svg');
+  background-image: var(--check-url);
   background-size: 16px 16px;
   background-repeat: no-repeat;
   display:block;

data/public/stylesheets/matrix.css

@@ -1,3 +1,8 @@
+:root {
+  /* See public/javascripts/set-css-asset-base-url.js */
+  --clock-url: url('/images/clock.svg');
+}
+
 div {
   /*border: 1px solid red;*/
  }
@@ -33,7 +38,7 @@ div.tag, div.version {
 
 span.pre-verified-icon {
   color: #337ab7;
-  background-image: url('/images/clock.svg');
+  background-image: var(--clock-url);
   background-repeat: no-repeat;
   display:inline-block;
   position: relative;

data/public/stylesheets/pact.css

@@ -1,3 +1,8 @@
+:root {
+  /* See public/javascripts/set-css-asset-base-url.js */
+  --pact-kebab-url: url('/images/kebab-horizontal.svg');
+}
+
 div.pact-metadata {
   margin-top: 40px;
   float: right;
@@ -30,7 +35,7 @@ div.pact-badge-markdown {
 }
 
 span.kebab-horizontal {
-  background-image: url('/images/kebab-horizontal.svg');
+  background-image: var(--pact-kebab-url);
   background-repeat: no-repeat;
   display:block;
   position: relative;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.90.0
+  version: 2.91.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -633,6 +633,7 @@ files:
 - lib/pact_broker/api/decorators/deployed_version_decorator.rb
 - lib/pact_broker/api/decorators/deployed_versions_decorator.rb
 - lib/pact_broker/api/decorators/embedded_branch_version_decorator.rb
+- lib/pact_broker/api/decorators/embedded_environment_decorator.rb
 - lib/pact_broker/api/decorators/embedded_label_decorator.rb
 - lib/pact_broker/api/decorators/embedded_pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/embedded_tag_decorator.rb
@@ -1144,6 +1145,7 @@ files:
 - public/javascripts/matrix.js
 - public/javascripts/pact.js
 - public/javascripts/pagination.js
+- public/javascripts/set-css-asset-base-url.js
 - public/js/bootstrap.bundle.js
 - public/js/bootstrap.bundle.js.map
 - public/js/bootstrap.bundle.min.js