pact_broker 2.24.0 → 2.25.0

data/db/migrations/20180721_migrate_latest_pact_publication_ids.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+  up do
+    # The danger with this migration is that a pact publication created by an old node will be lost
+    rows = from(:latest_pact_publications_by_consumer_versions).select(:consumer_id, :consumer_version_id, :provider_id, :id, :pact_version_id)
+    from(:latest_pact_publication_ids_for_consumer_versions).insert(rows)
+  end
+
+  down do
+    from(:latest_pact_publication_ids_for_consumer_versions).delete
+  end
+end

data/db/migrations/20180722_recreate_views.rb

@@ -0,0 +1,43 @@
+Sequel.migration do
+  up do
+    # Latest pact_publication details for each provider/consumer version
+    create_or_replace_view(:latest_pact_publications_by_consumer_versions,
+      "select app.*
+      from latest_pact_publication_ids_for_consumer_versions lpp
+      inner join all_pact_publications app
+      on lpp.consumer_version_id = app.consumer_version_id
+      and lpp.pact_publication_id = app.id
+      and lpp.provider_id = app.provider_id"
+    )
+
+    # Latest consumer version order for consumer/provider
+    # Recreate latest_pact_publication_ids_for_consumer_versions view
+    lpp = :latest_pact_publication_ids_for_consumer_versions
+    latest_pact_consumer_version_orders = from(lpp).select_group(
+        Sequel[lpp][:provider_id],
+        Sequel[:cv][:pacticipant_id].as(:consumer_id))
+      .select_append{ max(order).as(latest_consumer_version_order) }
+      .join(:versions, { Sequel[lpp][:consumer_version_id] => Sequel[:cv][:id] }, { table_alias: :cv })
+
+    create_or_replace_view(:latest_pact_consumer_version_orders, latest_pact_consumer_version_orders)
+  end
+
+  down do
+    # Latest pact_publication details for each provider/consumer version
+    create_or_replace_view(:latest_pact_publications_by_consumer_versions,
+      "select app.*
+      from all_pact_publications app
+      inner join latest_pact_publication_revision_numbers lr
+      on app.consumer_id = lr.consumer_id
+        and app.provider_id = lr.provider_id
+        and app.consumer_version_order = lr.consumer_version_order
+        and app.revision_number = lr.latest_revision_number"
+        )
+
+    create_or_replace_view(:latest_pact_consumer_version_orders,
+      "select provider_id, consumer_id, max(consumer_version_order) as latest_consumer_version_order
+      from all_pact_publications
+      group by provider_id, consumer_id"
+    )
+  end
+end

data/db/migrations/20180723_create_latest_verification_ids.rb

@@ -0,0 +1,23 @@
+Sequel.migration do
+  up do
+    # Latest verification_id for each pact version/provider version.
+    # Keeping track of this in a table rather than having to calculate the
+    # latest revision speeds queries up.
+    # There is no way to delete an individual verification result yet, but when there
+    # is, we'll need to re-calculate the latest.
+    create_table(:latest_verification_id_for_pact_version_and_provider_version, charset: 'utf8') do
+      foreign_key :consumer_id, :pacticipants,      null: false, on_delete: :cascade, foreign_key_constraint_name: 'latest_v_id_for_pv_and_pv_consumer_id_fk' # not required, but useful to avoid extra joins
+      foreign_key :pact_version_id, :pact_versions, null: false, on_delete: :cascade, foreign_key_constraint_name: 'latest_v_id_for_pv_and_pv_pact_version_id_fk'
+      foreign_key :provider_id, :pacticipants,      null: false, on_delete: :cascade, foreign_key_constraint_name: 'latest_v_id_for_pv_and_pv_provider_id_fk'  # not required, but useful to avoid extra joins
+      foreign_key :provider_version_id, :versions,  null: false, on_delete: :cascade, foreign_key_constraint_name: 'latest_v_id_for_pv_and_pv_provider_version_id_fk'
+      foreign_key :verification_id, :verifications, null: false, on_delete: :cascade, foreign_key_constraint_name: 'latest_v_id_for_pv_and_pv_verification_id_fk'
+      index [:verification_id], unique: true, name: "latest_v_id_for_pv_and_pv_v_id_unq"
+      index [:pact_version_id, :provider_version_id], unique: true, name: "latest_v_id_for_pv_and_pv_pv_id_pv_id_unq"
+      index [:pact_version_id, :verification_id], name: "latest_v_id_for_pv_and_pv_pv_id_v_id"
+    end
+  end
+
+  down do
+    drop_table(:latest_verification_id_for_pact_version_and_provider_version)
+  end
+end

data/db/migrations/20180724_migrate_latest_verification_ids.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+  up do
+    # consumer_id and provider_id are redundant by avoid making extra joins when creating views
+    rows = from(:verifications).select_group(
+          Sequel[:verifications][:consumer_id],
+          Sequel[:verifications][:pact_version_id],
+          Sequel[:verifications][:provider_id],
+          Sequel[:verifications][:provider_version_id])
+        .select_append{ max(verifications[id]).as(verification_id) }
+
+    # The danger with this migration is that a verification created by an old node will be lost
+    from(:latest_verification_id_for_pact_version_and_provider_version).insert(rows)
+  end
+
+  down do
+    from(:latest_verification_id_for_pact_version_and_provider_version).delete
+  end
+end

data/db/migrations/20180726_recreate_views.rb

@@ -0,0 +1,29 @@
+Sequel.migration do
+  up do
+    # joining with latest_pact_publication_revision_numbers gets rid of the overwritten
+    # pact revisions, and the max(verification_id) gets rid of the overwritten
+    # verifications
+    create_or_replace_view(:latest_verification_id_for_consumer_version_and_provider_version,
+      "select pp.consumer_version_id, lv.provider_version_id, lv.verification_id as latest_verification_id
+      from latest_pact_publication_ids_for_consumer_versions lpp
+      inner join pact_publications pp
+        on pp.id = lpp.pact_publication_id
+      left outer join latest_verification_id_for_pact_version_and_provider_version lv
+          on lv.pact_version_id = pp.pact_version_id"
+    )
+  end
+
+  down do
+    create_or_replace_view(:latest_verification_id_for_consumer_version_and_provider_version,
+          "select consumer_version_id, provider_version_id, max(verification_id) as latest_verification_id
+          from matrix
+          inner join latest_pact_publication_revision_numbers lr
+            on matrix.consumer_id = lr.consumer_id
+            and matrix.provider_id = lr.provider_id
+            and matrix.consumer_version_order = lr.consumer_version_order
+            and matrix.pact_revision_number = lr.latest_revision_number
+            group by consumer_version_id, provider_version_id"
+        )
+
+  end
+end

data/db/migrations/20180727_recreate_latest_verification_ids_for_consumer_version_tags.rb

@@ -0,0 +1,34 @@
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_ids_for_consumer_version_tags,
+    "select
+      v.provider_id,
+      v.consumer_id,
+      t.name as consumer_version_tag_name,
+      max(v.verification_id) as latest_verification_id
+    from latest_verification_id_for_pact_version_and_provider_version v
+    join latest_pact_publication_ids_for_consumer_versions lpp
+      on v.pact_version_id = lpp.pact_version_id
+    join tags t
+      on lpp.consumer_version_id = t.version_id
+    group by v.provider_id, v.consumer_id, t.name")
+  end
+
+  down do
+    # The latest verification id for each consumer version tag
+    create_or_replace_view(:latest_verification_ids_for_consumer_version_tags,
+      "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        t.name as consumer_version_tag_name,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publications_by_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join tags t
+        on lpp.consumer_version_id = t.version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id, t.name")
+  end
+end

data/db/migrations/20180728_truncate_materialized_matrix_tables.rb

@@ -0,0 +1,20 @@
+Sequel.migration do
+  up do
+    from(:materialized_matrix).delete
+    from(:materialized_head_matrix).delete
+
+    # TODO
+    # drop_view(:latest_matrix)
+    # drop_view(:latest_verification_id_for_consumer_version_and_provider)
+    # drop_view(:latest_matrix_for_consumer_version_and_provider_version)
+    # drop_table(:materialized_matrix)
+    # drop_table(:materialized_head_matrix)
+  end
+
+  down do
+    from(:materialized_matrix).delete
+    from(:materialized_matrix).insert(from(:matrix).select_all)
+    from(:materialized_head_matrix).delete
+    from(:materialized_head_matrix).insert(from(:head_matrix).select_all)
+  end
+end

data/db/migrations/20180729_create_latest_verification_ids_for_provider_versions.rb

@@ -0,0 +1,8 @@
+require_relative '../ddl_statements'
+
+Sequel.migration do
+  change do
+    create_view(:latest_verification_ids_for_pact_versions,
+      LATEST_VERIFICATION_IDS_FOR_PACT_VERSIONS_V1)
+  end
+end

data/db/migrations/20180730_create_latest_verifications_for_provider_versions.rb

@@ -0,0 +1,33 @@
+Sequel.migration do
+  up do
+    # The most recent verification for each pact_version
+    v = :verifications
+    create_view(:latest_verifications_for_pact_versions,
+      from(v)
+        .select(
+          Sequel[v][:id],
+          Sequel[v][:number],
+          Sequel[v][:success],
+          Sequel[v][:build_url],
+          Sequel[v][:pact_version_id],
+          Sequel[v][:execution_date],
+          Sequel[v][:created_at],
+          Sequel[v][:provider_version_id],
+          Sequel[:s][:number].as(:provider_version_number),
+          Sequel[:s][:order].as(:provider_version_order))
+        .join(:latest_verification_ids_for_pact_versions,
+          {
+            Sequel[v][:pact_version_id] => Sequel[:lv][:pact_version_id],
+            Sequel[v][:id] => Sequel[:lv][:latest_verification_id]
+          }, { table_alias: :lv })
+        .join(:versions,
+          {
+            Sequel[v][:provider_version_id] => Sequel[:s][:id]
+          }, { table_alias: :s })
+    )
+  end
+
+  down do
+    drop_view(:latest_verifications_for_pact_versions)
+  end
+end

data/db/migrations/20180731_update_head_matrix.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+  up do
+    create_or_replace_view(:head_matrix, HEAD_MATRIX_V2)
+    #TODO
+    #drop_view(:latest_verifications)
+  end
+
+  down do
+    create_or_replace_view(:head_matrix, HEAD_MATRIX_V1)
+  end
+end

data/lib/pact_broker/api.rb

@@ -1,5 +1,6 @@
 require 'webmachine/adapters/rack_mapped'
 require 'pact_broker/api/resources'
+require 'pact_broker/feature_toggle'
 
 module PactBroker
 
@@ -40,9 +41,8 @@ module PactBroker
         add ['pacts', 'provider', :provider_name, 'latest', :tag], Api::Resources::LatestProviderPacts, {resource_name: "latest_tagged_provider_pact_publications"}
         add ['pacts', 'latest'], Api::Resources::LatestPacts, {resource_name: "latest_pacts"}
 
-        if ENV['RACK_ENV'] != 'production'
-          add ['pacts', 'provider', :provider_name, 'wip'], Api::Resources::WipProviderPacts, {resource_name: "wip_provider_pact_publications"}
-        end
+        # WIP pacts
+        add ['pacts', 'provider', :provider_name, 'wip'], Api::Resources::WipProviderPacts, {resource_name: "wip_provider_pact_publications"}
 
         # Deprecated pact
         add ['pact', 'provider', :provider_name, 'consumer', :consumer_name, 'version', :consumer_version_number], Api::Resources::Pact, {resource_name: "pact_publications", deprecated: "true"} # Deprecate, singular /pact

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

@@ -37,10 +37,10 @@ module PactBroker
           Line.new(
             index_item.consumer_name,
             index_item.consumer_version_number,
-            index_item.tag_names.join(", "),
+            index_item.tag_names.sort.join(", "),
             index_item.provider_name,
             index_item.provider_version_number,
-            index_item.latest_verification_latest_tags.collect(&:name).join(", "),
+            index_item.latest_verification_latest_tags.collect(&:name).sort.join(", "),
             index_item.verification_status.to_s
           )
         end

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -50,7 +50,7 @@ module PactBroker
         "#{pactigration_base_url(base_url, pact)}/version/#{pact.consumer_version_number}"
       end
 
-      def pact_version_url pact, base_url
+      def pact_version_url pact, base_url = ''
         "#{pactigration_base_url(base_url, pact)}/pact-version/#{pact.pact_version_sha}"
       end
 

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

@@ -39,9 +39,6 @@ module PactBroker
         end
 
         def finish_request
-          if update_matrix_after_request?
-            matrix_service.refresh(identifier_from_path)
-          end
           PactBroker.configuration.after_resource.call(self)
         end
 
@@ -153,10 +150,6 @@ module PactBroker
           invalid
         end
 
-        def with_matrix_refresh &block
-          matrix_service.refresh(identifier_from_path, &block)
-        end
-
         def find_pacticipant name, role
           pacticipant_service.find_pacticipant_by_name(name).tap do | pacticipant |
             set_json_error_message("No #{role} with name '#{name}' found") if pacticipant.nil?

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

@@ -68,12 +68,6 @@ module PactBroker
               title: 'All pact versions for the specified provider',
               templated: true
             },
-            'pb:wip-provider-pacts' =>
-            {
-              href: base_url + '/pacts/provider/{provider}/wip',
-              title: 'WIP pact versions for the specified provider',
-              templated: true
-            },
             'pb:latest-version' => {
               href: base_url + '/pacticipants/{pacticipant}/latest-version',
               title: 'Latest pacticipant version',
@@ -89,15 +83,23 @@ module PactBroker
               title: 'Webhooks',
               templated: false
             },
+            'beta:wip-provider-pacts' =>
+            {
+              href: base_url + '/pacts/provider/{provider}/wip',
+              title: 'WIP pact versions for the specified provider',
+              templated: true
+            },
             'curies' =>
             [{
               name: 'pb',
               href: base_url + '/doc/{rel}?context=index',
               templated: true
+            },{
+              name: 'beta',
+              href: base_url + '/doc/{rel}?context=index',
+              templated: true
             }]
-          }.tap do | it |
-            it.delete('pb:wip-provider-pacts') if ENV['RACK_ENV'] == 'production'
-          end
+          }
         end
       end
     end

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

@@ -87,9 +87,7 @@ module PactBroker
         end
 
         def delete_resource
-          with_matrix_refresh do
-            pact_service.delete(pact_params)
-          end
+          pact_service.delete(pact_params)
           true
         end
 

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

@@ -45,9 +45,7 @@ module PactBroker
         end
 
         def delete_resource
-          with_matrix_refresh do
-            pacticipant_service.delete pacticipant_name
-          end
+          pacticipant_service.delete pacticipant_name
           true
         end
 

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

@@ -22,7 +22,6 @@ module PactBroker
             @tag = tag_service.create identifier_from_path
             # Make it return a 201 by setting the Location header
             response.headers["Location"] = tag_url(base_url, tag)
-            matrix_service.refresh_tags(identifier_from_path)
           end
           response.body = to_json
         end
@@ -40,9 +39,7 @@ module PactBroker
         end
 
         def delete_resource
-          matrix_service.refresh_tags(identifier_from_path) do
-            tag_service.delete identifier_from_path
-          end
+          tag_service.delete identifier_from_path
           true
         end
       end

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

@@ -14,6 +14,8 @@ module PactBroker
           [["application/hal+json", :to_json], ["application/json", :to_json]]
         end
 
+        # Remember to update latest_verification_id_for_pact_version_and_provider_version
+        # if/when DELETE is implemented
         def allowed_methods
           ["GET", "OPTIONS"]
         end

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

@@ -25,9 +25,7 @@ module PactBroker
         end
 
         def delete_resource
-          with_matrix_refresh do
-            version_service.delete version
-          end
+          version_service.delete version
           true
         end
 

data/lib/pact_broker/app.rb

@@ -75,6 +75,14 @@ module PactBroker
       else
         logger.info "Skipping database migrations"
       end
+
+      if configuration.auto_migrate_db_data
+        logger.info "Migrating data"
+        PactBroker::DB.run_data_migrations configuration.database_connection
+      else
+        logger.info "Skipping data migrations"
+      end
+
       require 'pact_broker/webhooks/service'
       PactBroker::Webhooks::Service.fail_retrying_triggered_webhooks
     end

data/lib/pact_broker/certificates/certificate.rb

@@ -6,3 +6,15 @@ module PactBroker
     Certificate.plugin :timestamps, update_on_create: true
   end
 end
+
+# Table: certificates
+# Columns:
+#  id          | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  uuid        | text                        | NOT NULL
+#  description | text                        |
+#  content     | text                        | NOT NULL
+#  created_at  | timestamp without time zone | NOT NULL
+#  updated_at  | timestamp without time zone | NOT NULL
+# Indexes:
+#  certificates_pkey   | PRIMARY KEY btree (id)
+#  uq_certificate_uuid | UNIQUE btree (uuid)