pact_broker 2.83.0 → 2.84.0

data/lib/pact_broker/versions/repository.rb

@@ -2,6 +2,9 @@ require "sequel"
 require "pact_broker/logging"
 require "pact_broker/domain/version"
 require "pact_broker/tags/repository"
+require "pact_broker/versions/branch"
+require "pact_broker/versions/branch_version"
+require "pact_broker/versions/branch_head"
 
 module PactBroker
   module Versions
@@ -49,22 +52,29 @@ module PactBroker
       end
 
       # There may be a race condition if two simultaneous requests come in to create the same version
-      def create args
+      def create(args)
         logger.info "Upserting version #{args[:number]} for pacticipant_id=#{args[:pacticipant_id]}"
         version_params = {
           number: args[:number],
           pacticipant_id: args[:pacticipant_id],
           created_at: Sequel.datetime_class.now,
-          updated_at: Sequel.datetime_class.now
-        }
+          updated_at: Sequel.datetime_class.now,
+          build_url: args[:build_url]
+        }.compact
 
-        PactBroker::Domain::Version.new(version_params).upsert
+
+        version = PactBroker::Domain::Version.new(version_params).upsert
+        # branch can't be set from CRUD on the version resource, but it's convenient to be able
+        # to make a version with a branch for internal code.
+        branch_version_repository.add_branch(version, args[:branch]) if args[:branch]
+        version
       end
 
       def create_or_update(pacticipant, version_number, open_struct_version)
         saved_version = PactBroker::Domain::Version.where(pacticipant_id: pacticipant.id, number: version_number).single_record
         params = open_struct_version.to_h
         tags = params.delete(:tags)
+        branch_name = params.delete(:branch)
         if saved_version
           saved_version.update(params)
         else
@@ -74,10 +84,11 @@ module PactBroker
             params.merge(
               pacticipant_id: pacticipant.id,
               number: version_number
-            )
+            ).compact
           ).upsert
         end
 
+        branch_version_repository.add_branch(saved_version, branch_name) if branch_name
         replace_tags(saved_version, tags) if tags
         saved_version
       end
@@ -86,8 +97,7 @@ module PactBroker
         saved_version = PactBroker::Domain::Version.new(
           number: version_number,
           pacticipant: pacticipant,
-          build_url: open_struct_version.build_url,
-          branch: open_struct_version.branch
+          build_url: open_struct_version.build_url
         ).upsert
 
         if open_struct_version.tags
@@ -112,7 +122,15 @@ module PactBroker
       end
 
       def delete_by_id version_ids
+        branches = Versions::Branch.where(id: Versions::BranchHead.select(:branch_id).where(version_id: version_ids)).all # these will be deleted
         Domain::Version.where(id: version_ids).delete
+        branches.each do | branch |
+          new_head_branch_version = Versions::BranchVersion.find_latest_for_branch(branch)
+          if new_head_branch_version
+            PactBroker::Versions::BranchHead.new(branch: branch, branch_version: new_head_branch_version).upsert
+          end
+        end
+        nil
       end
 
       def delete_orphan_versions consumer, provider
@@ -129,11 +147,6 @@ module PactBroker
         PactBroker::Domain::Version.select_all_qualified.for_selector(selector).all
       end
 
-      def set_branch_if_unset(version, branch)
-        version.update(branch: branch) if version.branch.nil?
-        version
-      end
-
       def find_latest_version_from_main_branch(pacticipant)
         if pacticipant.main_branch
           latest_from_main_branch = PactBroker::Domain::Version

data/lib/pact_broker/versions/service.rb

@@ -10,23 +10,6 @@ module PactBroker
       extend PactBroker::Services
       include PactBroker::Logging
 
-      def self.conflict_errors(_existing_version, _open_struct_version, _version_url)
-        # This validation is causing problems in the PF build when branches are merged
-        # TODO remove this properly when re-doing the version -> branch relationship
-        {}
-        # if existing_version&.branch && open_struct_version.to_h.key?(:branch) && existing_version.branch != open_struct_version.branch
-        #   message_params = {
-        #     old_branch: existing_version&.branch,
-        #     new_branch: open_struct_version.branch,
-        #     version_url: version_url
-        #   }
-        #   error_message = message("errors.validation.cannot_modify_version_branch", message_params)
-        #   { branch: [error_message] }
-        # else
-        #   {}
-        # end
-      end
-
       def self.find_latest_by_pacticpant_name params
         version_repository.find_latest_by_pacticpant_name params.fetch(:pacticipant_name)
       end
@@ -42,14 +25,12 @@ module PactBroker
       def self.create_or_overwrite(pacticipant_name, version_number, version)
         pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
         version = version_repository.create_or_overwrite(pacticipant, version_number, version)
-        pacticipant_service.maybe_set_main_branch(pacticipant, version.branch)
         version
       end
 
       def self.create_or_update(pacticipant_name, version_number, version)
         pacticipant = pacticipant_repository.find_by_name_or_create(pacticipant_name)
         version = version_repository.create_or_update(pacticipant, version_number, version)
-        pacticipant_service.maybe_set_main_branch(pacticipant, version.branch)
         version
       end
 
@@ -66,9 +47,9 @@ module PactBroker
       end
 
       def self.maybe_set_version_branch_from_tag(version, tag_name)
-        if use_tag_as_branch?(version) && !version.branch
-          logger.info "Setting #{version.pacticipant.name} version #{version.number} branch to '#{tag_name}' from first tag (because use_first_tag_as_branch=true)"
-          version_repository.set_branch_if_unset(version, tag_name)
+        if use_tag_as_branch?(version) && version.branch_versions.empty?
+          logger.info "Adding #{version.pacticipant.name} version #{version.number} to branch '#{tag_name}' (from first tag, because use_first_tag_as_branch=true)"
+          branch_version_repository.add_branch(version, tag_name, auto_created: true)
         end
       end
 

data/lib/pact_broker/webhooks/pact_and_verification_parameters.rb

@@ -14,6 +14,7 @@ module PactBroker
       GITHUB_VERIFICATION_STATUS = "pactbroker.githubVerificationStatus"
       BITBUCKET_VERIFICATION_STATUS = "pactbroker.bitbucketVerificationStatus"
       AZURE_DEV_OPS_VERIFICATION_STATUS = "pactbroker.azureDevOpsVerificationStatus"
+      GITLAB_VERIFICATION_STATUS = "pactbroker.gitlabVerificationStatus"
       CONSUMER_LABELS = "pactbroker.consumerLabels"
       PROVIDER_LABELS = "pactbroker.providerLabels"
       EVENT_NAME = "pactbroker.eventName"
@@ -33,6 +34,7 @@ module PactBroker
         GITHUB_VERIFICATION_STATUS,
         BITBUCKET_VERIFICATION_STATUS,
         AZURE_DEV_OPS_VERIFICATION_STATUS,
+        GITLAB_VERIFICATION_STATUS,
         CONSUMER_LABELS,
         PROVIDER_LABELS,
         EVENT_NAME,
@@ -46,7 +48,6 @@ module PactBroker
         @base_url = webhook_context.fetch(:base_url)
       end
 
-      # rubocop: disable Metrics/CyclomaticComplexity
       def to_hash
         @hash ||= {
           PACT_URL => pact ? PactBroker::Api::PactBrokerUrls.pact_version_url_with_webhook_metadata(pact, base_url) : "",
@@ -62,13 +63,13 @@ module PactBroker
           GITHUB_VERIFICATION_STATUS => github_verification_status,
           BITBUCKET_VERIFICATION_STATUS => bitbucket_verification_status,
           AZURE_DEV_OPS_VERIFICATION_STATUS => azure_dev_ops_verification_status,
+          GITLAB_VERIFICATION_STATUS => gitlab_verification_status,
           CONSUMER_LABELS => pacticipant_labels(pact && pact.consumer),
           PROVIDER_LABELS => pacticipant_labels(pact && pact.provider),
           EVENT_NAME => event_name,
           CURRENTLY_DEPLOYED_PROVIDER_VERSION_NUMBER => currently_deployed_provider_version_number
         }
       end
-      # rubocop: enable Metrics/CyclomaticComplexity
 
       private
 
@@ -98,6 +99,14 @@ module PactBroker
         end
       end
 
+      def gitlab_verification_status
+        if verification
+          verification.success ? "success" : "failed"
+        else
+          "pending"
+        end
+      end
+
       def verification_url
         if verification
           PactBroker::Api::PactBrokerUrls.verification_url(verification, base_url)

data/lib/sequel/plugins/insert_ignore.rb

@@ -26,6 +26,7 @@ module Sequel
           self
         rescue Sequel::NoExistingObject
           load_values_from_previously_inserted_object
+          self
         end
 
         private
@@ -41,6 +42,9 @@ module Sequel
             insert_ignore_primary_key_columns.each do | column |
               self.send("#{column}=".to_sym, existing_record[column])
             end
+            # Need to clear out the _update_dataset when the NoExistingObject is thrown because
+            # the ID gets incremented somewhere in the Sequel code
+            @this = nil
           end
         end
 

data/lib/sequel/plugins/upsert.rb

@@ -28,6 +28,7 @@ module Sequel
           self
         rescue Sequel::NoExistingObject
           load_values_from_previously_inserted_object
+          self
         ensure
           @upsert_plugin_upserting = false
         end
@@ -45,6 +46,9 @@ module Sequel
             upsert_primary_key_columns.each do | column |
               self.send("#{column}=".to_sym, existing_record[column])
             end
+            # Need to clear out the _update_dataset when the NoExistingObject is thrown because
+            # the ID gets incremented somewhere in the Sequel code
+            @this = nil
           end
         end
 

data/public/javascripts/index.js

@@ -1,24 +1,13 @@
 $(document).ready(function() {
-  $(".integration-settings")
-    .materialMenu("init", {
+  $(".integration-settings").click(function() {
+    const clickedElementData = $(this).closest("tr").data();
+    $(this).materialMenu("init", {
       position: "overlay",
       animationSpeed: 1,
-      items: [
-        {
-          type: "normal",
-          text: "Delete pacts ...",
-          click: handleDeletePactsSelected
-        },
-        {
-          type: "normal",
-          text: "Delete integration...",
-          click: handleDeleteIntegrationsSelected
-        }
-      ]
-    })
-    .click(function() {
-      $(this).materialMenu("open");
+      items: buildMaterialMenuItems(clickedElementData)
     });
+    $(this).materialMenu("open");
+  });
 });
 
 function createPactDeletionConfirmationText(rowData) {
@@ -35,6 +24,16 @@ function createIntegrationDeletionConfirmationText(rowData) {
   }, and all associated data (pacts, verifications, application versions, tags and webhooks) that are not associated with other integrations. Do you wish to continue?`;
 }
 
+function createPactTagDeletionConfirmationText({
+  providerName,
+  consumerName,
+  pactTagName
+}) {
+  return `This will delete the pacts for provider ${providerName} and all versions of ${
+    consumerName
+  } with tag ${pactTagName}. Do you wish to continue?`;
+}
+
 function handleDeletePactsSelected(clickedElement) {
   const tr = $(clickedElement).closest("tr");
   const confirmationText = createPactDeletionConfirmationText(tr.data());
@@ -51,12 +50,47 @@ function handleDeleteIntegrationsSelected(clickedElement) {
   handleDeleteResourcesSelected(tr, tr.data().integrationUrl, confirmationText);
 }
 
-function findRowsToBeDeleted(table, consumerName, providerName) {
-  return table
-    .children("tbody")
-    .find(
-      `[data-consumer-name="${consumerName}"][data-provider-name="${providerName}"]`
+function handleDeleteTagSelected({
+  providerName,
+  consumerName,
+  pactTagName,
+  deletionUrl
+}) {
+  return function(clickedElement) {
+    const tr = $(clickedElement).closest("tr");
+    const confirmationText = createPactTagDeletionConfirmationText({
+      providerName,
+      consumerName,
+      pactTagName
+    });
+    handleDeleteResourcesSelected(
+      tr,
+      deletionUrl,
+      confirmationText,
+      pactTagName
     );
+  };
+}
+
+function findRowsToBeDeleted(table, consumerName, providerName, tagName) {
+  if (!tagName) {
+    return table
+            .children("tbody")
+            .find(
+              `[data-consumer-name="${consumerName}"][data-provider-name="${providerName}"]`
+            );
+  }
+
+  return table
+          .children("tbody")
+          .find("tr")
+          .find("td")
+          .filter(function() {
+            return $(this)
+              .text()
+              .includes(`tag: ${tagName}`);
+          })
+          .closest("tr");
 }
 
 function highlightRowsToBeDeleted(rows) {
@@ -87,13 +121,20 @@ function confirmDeleteResources(
   });
 }
 
-function handleDeleteResourcesSelected(row, deletionUrl, confirmationText) {
+function handleDeleteResourcesSelected(
+  row,
+  deletionUrl,
+  confirmationText,
+  tagName
+) {
   const rowData = row.data();
   const rows = findRowsToBeDeleted(
     row.closest("table"),
     rowData.consumerName,
-    rowData.providerName
+    rowData.providerName,
+    tagName
   );
+  const isRefreshingThePage = !!tagName;
   const cancelled = function() {
     unHighlightRows(rows);
   };
@@ -101,14 +142,17 @@ function handleDeleteResourcesSelected(row, deletionUrl, confirmationText) {
     deleteResources(
       deletionUrl,
       function() {
-        handleDeletionSuccess(rows);
+        handleDeletionSuccess(rows, isRefreshingThePage);
       },
       function(response) {
         handleDeletionFailure(rows, response);
       }
     );
   };
-  highlightRowsToBeDeleted(rows);
+
+  if (!isRefreshingThePage) {
+    highlightRowsToBeDeleted(rows);
+  }
   confirmDeleteResources(confirmationText, confirmed, cancelled);
 }
 
@@ -125,19 +169,34 @@ function hideDeletedRows(rows) {
     });
 }
 
-function handleDeletionSuccess(rows) {
+function refreshPage() {
+  const url = new URL(window.location);
+  url.searchParams.delete("search");
+  window.location = url.toString();
+}
+
+function handleDeletionSuccess(rows, isRefreshingThePage) {
+  if (isRefreshingThePage) {
+    return refreshPage();
+  }
+
   hideDeletedRows(rows);
 }
 
 function createErrorMessage(responseBody) {
-  if (responseBody && responseBody.error && responseBody.error.message && responseBody.error.reference) {
-    return `<p>Could not delete resources due to error: ${
-      responseBody.error.message
-    }</p><p>Error reference:
+  if (
+    responseBody &&
+    responseBody.error &&
+    responseBody.error.message &&
+    responseBody.error.reference
+  ) {
+    return `<p>Could not delete resources due to error: ${responseBody.error.message}</p><p>Error reference:
       ${responseBody.error.reference}
       </p>`;
   } else if (responseBody) {
-    return `Could not delete resources due to error: ${JSON.stringify(responseBody)}`;
+    return `Could not delete resources due to error: ${JSON.stringify(
+      responseBody
+    )}`;
   }
 
   return "Could not delete resources.";
@@ -159,11 +218,47 @@ function deleteResources(url, successCallback, errorCallback) {
     accepts: {
       text: "application/hal+json"
     },
-    success: function(data, textStatus, jQxhr) {
+    success: function() {
       successCallback();
     },
-    error: function(jqXhr, textStatus, errorThrown) {
+    error: function(jqXhr) {
       errorCallback(jqXhr.responseJSON);
     }
   });
 }
+
+function buildMaterialMenuItems(clickedElementData) {
+  const baseOptions = [
+    {
+      type: "normal",
+      text: "Delete pacts ...",
+      click: handleDeletePactsSelected
+    },
+    {
+      type: "normal",
+      text: "Delete integration...",
+      click: handleDeleteIntegrationsSelected
+    }
+  ];
+
+  const taggedPacts = clickedElementData.taggedPacts || [];
+  const providerName = clickedElementData.providerName;
+  const consumerName = clickedElementData.consumerName;
+  const taggedPactsOptions = taggedPacts.map(taggedPact => {
+    const taggedPactObject = JSON.parse(taggedPact);
+    const pactTagName = taggedPactObject.tag;
+    const taggedPactUrl = taggedPactObject.deletionUrl;
+    return {
+      type: "normal",
+      text: `Delete pacts for ${pactTagName}...`,
+      click: handleDeleteTagSelected({
+        providerName,
+        consumerName,
+        pactTagName,
+        deletionUrl: taggedPactUrl
+      })
+    };
+  });
+
+  return [...baseOptions, ...taggedPactsOptions];
+}