pact_broker 2.111.0 → 2.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e21e3c2fc82cfe4697582921613bd435e026cf6f381c64c33d703b8c31c586be
-  data.tar.gz: 6b6bc75a486f936441b172c7a80a7e8541f3bbb1731be03b1e33a869327014bf
+  metadata.gz: c7da30c01ac5c3b656df24282a63fe7d18e42d83ed7ffdda14d3919481497f39
+  data.tar.gz: 71c525bd8ac9ed56c8d15f3f2d6c274a32c925be65e75f889d351033d759c400
 SHA512:
-  metadata.gz: 2afe779170a4910f06ace0a29b8ee66fa81bc355fc1a1c22a532fb3f9f64f5775309543c23b3b7ae4c4c837c1a66d0b10ddb0f62e8e9f586b7fd4942dc29d33c
-  data.tar.gz: 3b2738f3785dc1c272d4e1ba24104b4786bd467780808d41bdf2dd7f2ce0e83f0f11645a8ca3b8fd16642055a897d60b573ea7fc8392751cf0a59ecafeba6130
+  metadata.gz: 95f5eed3bcda08ad27274d0bf858ea78319455ca45f783b0cd21a3709ee1ac3a1956325713466b8f1438cda86f83f51a35cccb875c81f864d2f53b054f7c0807
+  data.tar.gz: e51971781ce0679309cd60a8bb0eb281b2fc9a01872db91a4cd6f3f00b575805e7b5244d2b0f4d68a699140799e8cf50fca9940ddd72c77b207ca749de468fda

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v2.112.0"></a>
+### v2.112.0 (2024-09-09)
+
+#### Features
+
+* implemented setting cache for can-i-merge badges based on default configuration	 ([e2bce55e](/../../commit/e2bce55e))
+* add application/hal+json content type for webhook logs (#679)	 ([e84de4f4](/../../commit/e84de4f4))
+
+#### Bug Fixes
+
+* make clean_task.rb print the payload correctly	 ([10fd69e2](/../../commit/10fd69e2))
+
 <a name="v2.111.0"></a>
 ### v2.111.0 (2024-07-26)
 

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 
 gem "rake", "~>12.3.3"
-gem "sqlite3", "~>1.3"
+gem "sqlite3", ">=2.0.0"
 gem "conventional-changelog", "~>1.3"
 gem "bump", "~> 0.5"
 

data/docs/CONFIGURATION.md

@@ -248,8 +248,8 @@ The number of seconds after which an SQL query will be aborted. Only supported f
 
 **Environment variable name:** `PACT_BROKER_DATABASE_STATEMENT_TIMEOUT`<br/>
 **YAML configuration key name:** `database_statement_timeout`<br/>
-**Default:** `15`<br/>
-**Allowed values:** A positive integer or float.<br/>
+**Default:** `15000`<br/>
+**Allowed values:** A positive integer in milliseconds<br/>
 **More information:** https://www.postgresql.org/docs/9.3/runtime-config-client.html<br/>
 
 ### metrics_sql_statement_timeout

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

@@ -0,0 +1,38 @@
+require_relative "base_decorator"
+
+module PactBroker
+  module Api
+    module Decorators
+      class TriggeredWebhookLogsDecorator < BaseDecorator
+        class WebhookExecutionDecorator < BaseDecorator
+          property  :success
+          property  :logs
+          property  :created_at, as: :createdAt
+        end
+
+
+        nested :triggeredWebhook, embedded: true do
+          property :uuid
+        end
+
+        collection :webhook_executions, as: :executions, :class => PactBroker::Webhooks::Execution, :extend => WebhookExecutionDecorator
+
+        link :self do | options |
+          {
+            title: "Triggered webhook logs",
+            href: options[:resource_url]
+          }
+        end
+
+        link :'pb:webhook' do | context |
+          if represented.webhook
+            {
+              href: webhook_url(represented.webhook.uuid, context[:base_url]),
+              title: "Webhook"
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module PactBroker
         end
 
         def moved_temporarily?
-          response.headers["Cache-Control"] = "no-cache"
+          set_cache_control("no-cache")
           begin
             badge_url
           rescue StandardError => e
@@ -46,6 +46,10 @@ module PactBroker
           raise NotImplementedError
         end
 
+        def set_cache_control(cache_control_str)
+          response.headers["Cache-Control"] = cache_control_str
+        end
+
         private
 
         def label

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

@@ -15,6 +15,8 @@ module PactBroker
             # when there is no main branch version, we return an error badge url
             badge_service.error_badge_url("main branch version", "not found")
           else
+            # when badge is available, set cache based on configuration
+            set_cache_control(default_cache_for_succesful_badge)
             # we call badge_service to build the badge url
             badge_service.can_i_merge_badge_url(deployable: results)
           end
@@ -22,6 +24,10 @@ module PactBroker
         
         private
 
+        def default_cache_for_succesful_badge
+          PactBroker.configuration.badge_default_cache_setting
+        end
+
         def results
           # can_i_merge returns true or false if the main branch version is compatible with all the integrations
           @results ||= matrix_service.can_i_merge(pacticipant: pacticipant, latest_main_branch_version: version)

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

@@ -16,6 +16,10 @@ module PactBroker
           ["GET", "OPTIONS"]
         end
 
+        def malformed_request?
+          super || request.get? && validation_errors_for_schema?(schema, request.query)
+        end
+
         def policy_name
           :'labels::labels'
         end
@@ -28,6 +32,15 @@ module PactBroker
           )
         end
 
+        private
+
+        def schema
+          if request.get?
+            PactBroker::Api::Contracts::PaginationQueryParamsSchema
+          end
+        end
+
+
         def labels
           label_service.get_all_unique_labels(pagination_options)
         end

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

@@ -7,7 +7,7 @@ module PactBroker
       class TriggeredWebhookLogs < BaseResource
 
         def content_types_provided
-          [["text/plain", :to_text]]
+          [["text/plain", :to_text], ["application/hal+json", :to_json]]
         end
 
         def allowed_methods
@@ -27,6 +27,10 @@ module PactBroker
           end
         end
 
+        def to_json
+          decorator_class(:triggered_webhook_logs_decorator).new(triggered_webhook).to_json(**decorator_options)
+        end
+
         def policy_name
           :'webhooks::triggered_webhook'
         end

data/lib/pact_broker/config/runtime_configuration.rb

@@ -76,6 +76,7 @@ module PactBroker
         badge_provider_mode: :redirect,
         enable_public_badge_access: false,
         shields_io_base_url: "https://img.shields.io",
+        badge_default_cache_setting: "max-age=30",
         use_case_sensitive_resource_names: true,
         pact_content_diff_timeout: 15
       )

data/lib/pact_broker/deployments/deployed_version.rb

@@ -129,8 +129,9 @@ end
 #  target_for_index | text                        | NOT NULL DEFAULT ''::text
 #  auto_created     | boolean                     | DEFAULT false
 # Indexes:
-#  deployed_versions_pkey       | PRIMARY KEY btree (id)
-#  deployed_versions_uuid_index | UNIQUE btree (uuid)
+#  deployed_versions_pkey           | PRIMARY KEY btree (id)
+#  deployed_versions_uuid_index     | UNIQUE btree (uuid)
+#  deployed_versions_version_id_ndx | btree (version_id)
 # Foreign key constraints:
 #  deployed_versions_environment_id_fkey | (environment_id) REFERENCES environments(id)
 #  deployed_versions_version_id_fkey     | (version_id) REFERENCES versions(id)

data/lib/pact_broker/deployments/released_version.rb

@@ -87,6 +87,7 @@ end
 #  released_versions_uuid_index                      | UNIQUE btree (uuid)
 #  released_versions_version_id_environment_id_index | UNIQUE btree (version_id, environment_id)
 #  released_version_support_ended_at_index           | btree (support_ended_at)
+#  released_versions_version_id_ndx                  | btree (version_id)
 # Foreign key constraints:
 #  released_versions_environment_id_fkey | (environment_id) REFERENCES environments(id)
 #  released_versions_version_id_fkey     | (version_id) REFERENCES versions(id)

data/lib/pact_broker/domain/verification.rb

@@ -266,6 +266,7 @@ end
 #  verifications_pact_version_id_id_index      | btree (pact_version_id, id)
 #  verifications_provider_id_consumer_id_index | btree (provider_id, consumer_id)
 #  verifications_provider_id_index             | btree (provider_id)
+#  verifications_provider_version_id_index     | btree (provider_version_id)
 # Foreign key constraints:
 #  fk_verifications_versions          | (provider_version_id) REFERENCES versions(id)
 #  verifications_consumer_id_fkey     | (consumer_id) REFERENCES pacticipants(id)

data/lib/pact_broker/integrations/integration.rb

@@ -149,9 +149,11 @@ end
 
 # Table: integrations
 # Columns:
-#  id          | integer | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
-#  consumer_id | integer | NOT NULL
-#  provider_id | integer | NOT NULL
+#  id                       | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  consumer_id              | integer                     | NOT NULL
+#  provider_id              | integer                     | NOT NULL
+#  created_at               | timestamp without time zone | NOT NULL
+#  contract_data_updated_at | timestamp without time zone |
 # Indexes:
 #  integrations_pkey                           | PRIMARY KEY btree (id)
 #  integrations_consumer_id_provider_id_unique | UNIQUE btree (consumer_id, provider_id)

data/lib/pact_broker/pacts/latest_pact_publication_id_for_consumer_version.rb

@@ -24,6 +24,7 @@ end
 # Indexes:
 #  latest_pact_publication_ids_for_consume_pact_publication_id_key | UNIQUE btree (pact_publication_id)
 #  unq_latest_ppid_prov_conver                                     | UNIQUE btree (provider_id, consumer_version_id)
+#  latest_pp_ids_for_cons_ver_con_ver_id_ndx                       | btree (consumer_version_id)
 #  lpp_provider_id_consumer_id_index                               | btree (provider_id, consumer_id)
 # Foreign key constraints:
 #  latest_pact_publication_ids_for_consum_consumer_version_id_fkey | (consumer_version_id) REFERENCES versions(id) ON DELETE CASCADE

data/lib/pact_broker/tasks/clean_task.rb

@@ -105,7 +105,7 @@ module PactBroker
 
       def output(string, payload = {})
         prefix = dry_run ? "[DRY RUN] " : ""
-        logger ? logger.info("#{prefix}#{string}") : puts("#{prefix}#{string} #{payload.to_json}")
+        logger ? logger.info("#{prefix}#{string}", payload) : puts("#{prefix}#{string} #{payload.to_json}")
       end
 
       def add_defaults_to_keep_selectors

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -23,9 +23,10 @@ end
 #  verification_id     | integer                     | NOT NULL
 #  created_at          | timestamp without time zone |
 # Indexes:
-#  latest_v_id_for_pv_and_pv_pv_id_pv_id_unq | UNIQUE btree (pact_version_id, provider_version_id)
-#  latest_v_id_for_pv_and_pv_v_id_unq        | UNIQUE btree (verification_id)
-#  latest_v_id_for_pv_and_pv_pv_id_v_id      | btree (pact_version_id, verification_id)
+#  latest_v_id_for_pv_and_pv_pv_id_pv_id_unq                 | UNIQUE btree (pact_version_id, provider_version_id)
+#  latest_v_id_for_pv_and_pv_v_id_unq                        | UNIQUE btree (verification_id)
+#  latest_v_id_for_pv_and_pv_pv_id_v_id                      | btree (pact_version_id, verification_id)
+#  latest_verif_id_for_pact_ver_and_prov_ver_prov_ver_id_ndx | btree (provider_version_id)
 # Foreign key constraints:
 #  latest_v_id_for_pv_and_pv_consumer_id_fk         | (consumer_id) REFERENCES pacticipants(id) ON DELETE CASCADE
 #  latest_v_id_for_pv_and_pv_pact_version_id_fk     | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE

data/lib/pact_broker/verifications/pact_version_provider_tag_successful_verification.rb

@@ -22,6 +22,7 @@ end
 # Indexes:
 #  pact_version_provider_tag_successful_verifications_pkey    | PRIMARY KEY btree (id)
 #  pact_version_provider_tag_verifications_pv_pvtn_wip_unique | UNIQUE btree (pact_version_id, provider_version_tag_name, wip)
+#  pact_ver_prov_tag_success_verif_verif_id_ndx               | btree (verification_id)
 # Foreign key constraints:
 #  pact_version_provider_tag_successful_verifications_pv_id_fk | (pact_version_id) REFERENCES pact_versions(id) ON DELETE CASCADE
 #  pact_version_provider_tag_successful_verifications_v_id_fk  | (verification_id) REFERENCES verifications(id) ON DELETE SET NULL

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.111.0"
+  VERSION = "2.112.0"
 end

data/lib/pact_broker/versions/branch_head.rb

@@ -32,10 +32,11 @@ end
 #  pacticipant_id    | integer | NOT NULL
 #  branch_name       | text    | NOT NULL
 # Indexes:
-#  branch_heads_branch_id_index      | UNIQUE btree (branch_id)
-#  branch_heads_branch_name_index    | btree (branch_name)
-#  branch_heads_pacticipant_id_index | btree (pacticipant_id)
-#  branch_heads_version_id_index     | btree (version_id)
+#  branch_heads_branch_id_index         | UNIQUE btree (branch_id)
+#  branch_heads_branch_name_index       | btree (branch_name)
+#  branch_heads_branch_version_id_index | btree (branch_version_id)
+#  branch_heads_pacticipant_id_index    | btree (pacticipant_id)
+#  branch_heads_version_id_index        | btree (version_id)
 # Foreign key constraints:
 #  branch_heads_branch_id_fkey         | (branch_id) REFERENCES branches(id) ON DELETE CASCADE
 #  branch_heads_branch_version_id_fkey | (branch_version_id) REFERENCES branch_versions(id) ON DELETE CASCADE

data/lib/pact_broker/webhooks/execution.rb

@@ -29,12 +29,13 @@ end
 # Table: webhook_executions
 # Columns:
 #  id                   | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
-#  triggered_webhook_id | integer                     |
 #  success              | boolean                     | NOT NULL
 #  logs                 | text                        |
 #  created_at           | timestamp without time zone | NOT NULL
+#  triggered_webhook_id | integer                     |
 # Indexes:
 #  webhook_executions_pkey                       | PRIMARY KEY btree (id)
+#  webhook_executions_pact_publication_id_index  | btree (pact_publication_id)
 #  webhook_executions_triggered_webhook_id_index | btree (triggered_webhook_id)
 # Foreign key constraints:
 #  webhook_executions_consumer_id_fkey          | (consumer_id) REFERENCES pacticipants(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.111.0
+  version: 2.112.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -685,6 +685,7 @@ files:
 - lib/pact_broker/api/decorators/tagged_pact_versions_decorator.rb
 - lib/pact_broker/api/decorators/timestamps.rb
 - lib/pact_broker/api/decorators/triggered_webhook_decorator.rb
+- lib/pact_broker/api/decorators/triggered_webhook_logs_decorator.rb
 - lib/pact_broker/api/decorators/triggered_webhooks_decorator.rb
 - lib/pact_broker/api/decorators/validation_errors_decorator.rb
 - lib/pact_broker/api/decorators/validation_errors_problem_json_decorator.rb
@@ -1268,7 +1269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: See description