pact_broker 2.24.0 → 2.25.0

data/lib/pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version.rb

@@ -0,0 +1,36 @@
+require 'pact_broker/domain/verification'
+
+module PactBroker
+  module Verifications
+    class LatestVerificationIdForPactVersionAndProviderVersion < Sequel::Model(:latest_verification_id_for_pact_version_and_provider_version)
+
+      unrestrict_primary_key
+
+      dataset_module do
+        include PactBroker::Repositories::Helpers
+      end
+
+      def upsert
+        self.class.upsert(to_hash, [:pact_version_id, :provider_version_id])
+      end
+    end
+  end
+end
+
+# Table: latest_verification_id_for_pact_version_and_provider_version
+# Columns:
+#  consumer_id         | integer | NOT NULL
+#  pact_version_id     | integer | NOT NULL
+#  provider_id         | integer | NOT NULL
+#  provider_version_id | integer | NOT NULL
+#  verification_id     | integer | NOT NULL
+# 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)
+# 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
+#  latest_v_id_for_pv_and_pv_provider_id_fk         | (provider_id) REFERENCES pacticipants(id) ON DELETE CASCADE
+#  latest_v_id_for_pv_and_pv_provider_version_id_fk | (provider_version_id) REFERENCES versions(id) ON DELETE CASCADE
+#  latest_v_id_for_pv_and_pv_verification_id_fk     | (verification_id) REFERENCES verifications(id) ON DELETE CASCADE

data/lib/pact_broker/verifications/repository.rb

@@ -1,8 +1,9 @@
 require 'sequel'
 require 'pact_broker/domain/verification'
-require 'pact_broker/verifications/latest_verifications_by_consumer_version'
+require 'pact_broker/verifications/latest_verification_for_pact_version'
 require 'pact_broker/verifications/all_verifications'
 require 'pact_broker/verifications/sequence'
+require 'pact_broker/verifications/latest_verification_id_for_pact_version_and_provider_version'
 
 module PactBroker
   module Verifications
@@ -21,10 +22,26 @@ module PactBroker
 
       def create verification, provider_version_number, pact
         provider = pacticipant_repository.find_by_name(pact.provider_name)
+        consumer = pacticipant_repository.find_by_name(pact.consumer_name)
         version = version_repository.find_by_pacticipant_id_and_number_or_create(provider.id, provider_version_number)
         verification.pact_version_id = pact_version_id_for(pact)
         verification.provider_version = version
+        verification.provider_id = provider.id
+        verification.consumer_id = consumer.id
         verification.save
+        update_latest_verification_id(verification)
+        verification
+      end
+
+      def update_latest_verification_id verification
+        params = {
+          pact_version_id: verification.pact_version_id,
+          provider_version_id: verification.provider_version_id,
+          provider_id: verification.provider_version.pacticipant_id,
+          verification_id: verification.id,
+          consumer_id: verification.consumer_id
+        }
+        LatestVerificationIdForPactVersionAndProviderVersion.new(params).upsert
       end
 
       def find consumer_name, provider_name, pact_version_sha, verification_number
@@ -38,7 +55,7 @@ module PactBroker
       end
 
       def search_for_latest consumer_name, provider_name
-        query = LatestVerificationsByConsumerVersion
+        query = LatestVerificationForPactVersion
                   .select_all_qualified
                   .join(:all_pact_publications, pact_version_id: :pact_version_id)
         query = query.consumer(consumer_name) if consumer_name
@@ -49,7 +66,7 @@ module PactBroker
       def find_latest_verifications_for_consumer_version consumer_name, consumer_version_number
         # Use LatestPactPublicationsByConsumerVersion not AllPactPublcations because we don't
         # want verifications for shadowed revisions as it would be misleading.
-        LatestVerificationsByConsumerVersion
+        LatestVerificationForPactVersion
           .select_all_qualified
           .join(:latest_pact_publications_by_consumer_versions, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
@@ -62,7 +79,7 @@ module PactBroker
       # belonging to the version with the largest consumer_version_order.
 
       def find_latest_verification_for consumer_name, provider_name, consumer_version_tag = nil
-        query = LatestVerificationsByConsumerVersion
+        query = LatestVerificationForPactVersion
           .select_all_qualified
           .join(:all_pact_publications, pact_version_id: :pact_version_id)
           .consumer(consumer_name)
@@ -75,7 +92,7 @@ module PactBroker
         query.reverse_order(
           Sequel[:all_pact_publications][:consumer_version_order],
           Sequel[:all_pact_publications][:revision_number],
-          Sequel[LatestVerificationsByConsumerVersion.table_name][:number]
+          Sequel[LatestVerificationForPactVersion.table_name][:number]
         ).limit(1).single_record
       end
 
@@ -90,6 +107,7 @@ module PactBroker
           .tag(consumer_version_tag)
           .provider_version_tag(provider_version_tag)
 
+
         query.reverse_order(
           Sequel[:latest_pact_publications_by_consumer_versions][:consumer_version_order],
           Sequel[:latest_pact_publications_by_consumer_versions][:revision_number],

data/lib/pact_broker/verifications/sequence.rb

@@ -32,3 +32,7 @@ module PactBroker
     end
   end
 end
+
+# Table: verification_sequence_number
+# Columns:
+#  value | integer | NOT NULL

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.24.0'
+  VERSION = '2.25.0'
 end

data/lib/pact_broker/webhooks/execution.rb

@@ -38,3 +38,19 @@ module PactBroker
 
   end
 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
+# Indexes:
+#  webhook_executions_pkey | PRIMARY KEY btree (id)
+# Foreign key constraints:
+#  webhook_executions_consumer_id_fkey          | (consumer_id) REFERENCES pacticipants(id)
+#  webhook_executions_pact_publication_id_fkey  | (pact_publication_id) REFERENCES pact_publications(id)
+#  webhook_executions_provider_id_fkey          | (provider_id) REFERENCES pacticipants(id)
+#  webhook_executions_triggered_webhook_id_fkey | (triggered_webhook_id) REFERENCES triggered_webhooks(id)
+#  webhook_executions_webhook_id_fkey           | (webhook_id) REFERENCES webhooks(id)

data/lib/pact_broker/webhooks/latest_triggered_webhook.rb

@@ -7,3 +7,17 @@ module PactBroker
     end
   end
 end
+
+# Table: latest_triggered_webhooks
+# Columns:
+#  id                  | integer                     |
+#  trigger_uuid        | text                        |
+#  trigger_type        | text                        |
+#  pact_publication_id | integer                     |
+#  webhook_id          | integer                     |
+#  webhook_uuid        | text                        |
+#  consumer_id         | integer                     |
+#  provider_id         | integer                     |
+#  status              | text                        |
+#  created_at          | timestamp without time zone |
+#  updated_at          | timestamp without time zone |

data/lib/pact_broker/webhooks/triggered_webhook.rb

@@ -98,3 +98,30 @@ module PactBroker
 
   end
 end
+
+# Table: triggered_webhooks
+# Columns:
+#  id                  | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  trigger_uuid        | text                        | NOT NULL
+#  trigger_type        | text                        | NOT NULL
+#  pact_publication_id | integer                     | NOT NULL
+#  webhook_id          | integer                     |
+#  webhook_uuid        | text                        | NOT NULL
+#  consumer_id         | integer                     | NOT NULL
+#  provider_id         | integer                     | NOT NULL
+#  status              | text                        | NOT NULL
+#  created_at          | timestamp without time zone | NOT NULL
+#  updated_at          | timestamp without time zone | NOT NULL
+#  verification_id     | integer                     |
+# Indexes:
+#  triggered_webhooks_pkey     | PRIMARY KEY btree (id)
+#  uq_triggered_webhook_ppi_wi | UNIQUE btree (pact_publication_id, webhook_id, trigger_uuid)
+#  uq_triggered_webhook_wi     | UNIQUE btree (webhook_id, trigger_uuid)
+# Foreign key constraints:
+#  triggered_webhooks_consumer_id_fkey         | (consumer_id) REFERENCES pacticipants(id)
+#  triggered_webhooks_pact_publication_id_fkey | (pact_publication_id) REFERENCES pact_publications(id)
+#  triggered_webhooks_provider_id_fkey         | (provider_id) REFERENCES pacticipants(id)
+#  triggered_webhooks_verification_id_fkey     | (verification_id) REFERENCES verifications(id)
+#  triggered_webhooks_webhook_id_fkey          | (webhook_id) REFERENCES webhooks(id)
+# Referenced By:
+#  webhook_executions | webhook_executions_triggered_webhook_id_fkey | (triggered_webhook_id) REFERENCES triggered_webhooks(id)

data/lib/pact_broker/webhooks/webhook.rb

@@ -101,3 +101,29 @@ module PactBroker
     end
   end
 end
+
+# Table: webhooks
+# Columns:
+#  id                   | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  uuid                 | text                        | NOT NULL
+#  method               | text                        | NOT NULL
+#  url                  | text                        | NOT NULL
+#  body                 | text                        |
+#  is_json_request_body | boolean                     |
+#  consumer_id          | integer                     |
+#  provider_id          | integer                     |
+#  created_at           | timestamp without time zone |
+#  updated_at           | timestamp without time zone |
+#  username             | text                        |
+#  password             | text                        |
+# Indexes:
+#  webhooks_pkey   | PRIMARY KEY btree (id)
+#  uq_webhook_uuid | UNIQUE btree (uuid)
+# Foreign key constraints:
+#  fk_webhooks_consumer | (consumer_id) REFERENCES pacticipants(id)
+#  fk_webhooks_provider | (provider_id) REFERENCES pacticipants(id)
+# Referenced By:
+#  webhook_headers    | fk_webhookheaders_webhooks         | (webhook_id) REFERENCES webhooks(id)
+#  webhook_executions | webhook_executions_webhook_id_fkey | (webhook_id) REFERENCES webhooks(id)
+#  triggered_webhooks | triggered_webhooks_webhook_id_fkey | (webhook_id) REFERENCES webhooks(id)
+#  webhook_events     | webhook_events_webhook_id_fkey     | (webhook_id) REFERENCES webhooks(id) ON DELETE CASCADE

data/lib/pact_broker/webhooks/webhook_event.rb

@@ -30,3 +30,16 @@ module PactBroker
     WebhookEvent.plugin :timestamps, update_on_create: true
   end
 end
+
+# Table: webhook_events
+# Columns:
+#  id         | integer                     | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  webhook_id | integer                     |
+#  name       | text                        |
+#  created_at | timestamp without time zone | NOT NULL
+#  updated_at | timestamp without time zone | NOT NULL
+# Indexes:
+#  webhook_events_pkey | PRIMARY KEY btree (id)
+#  uq_webhook_id_name  | UNIQUE btree (id, name)
+# Foreign key constraints:
+#  webhook_events_webhook_id_fkey | (webhook_id) REFERENCES webhooks(id) ON DELETE CASCADE

data/pact_broker.gemspec

@@ -56,4 +56,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'conventional-changelog', '~>1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
   gem.add_development_dependency 'timecop', '~> 0.9'
+  gem.add_development_dependency 'sequel-annotate', '~>1.3'
 end

data/script/recreate-docker-pg-db.sh

@@ -0,0 +1,20 @@
+# docker run -p "5433:5432" --cpus 0.2 postgres:9.5-alpine
+
+SCHEMA="pact_broker"
+set +e
+export PACT_BROKER_DATABASE_HOST="127.0.0.1"
+export PACT_BROKER_DATABASE_PORT="5433"
+psql postgres -h $PACT_BROKER_DATABASE_HOST -p $PACT_BROKER_DATABASE_PORT -U postgres -c "DROP DATABASE ${SCHEMA};"
+psql postgres -h $PACT_BROKER_DATABASE_HOST -p $PACT_BROKER_DATABASE_PORT -U postgres -c "CREATE DATABASE ${SCHEMA};"
+psql postgres -h $PACT_BROKER_DATABASE_HOST -p $PACT_BROKER_DATABASE_PORT -U postgres -c "CREATE USER pact_broker WITH PASSWORD 'pact_broker'"
+psql postgres -h $PACT_BROKER_DATABASE_HOST -p $PACT_BROKER_DATABASE_PORT -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${SCHEMA} to pact_broker;"
+psql postgres -h $PACT_BROKER_DATABASE_HOST -p $PACT_BROKER_DATABASE_PORT -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ${SCHEMA} TO pact_broker;"
+echo ""
+echo "run the following command to set your environment variables:"
+echo "export PACT_BROKER_DATABASE_USERNAME=pact_broker"
+echo "export PACT_BROKER_DATABASE_PASSWORD=pact_broker"
+echo "export PACT_BROKER_DATABASE_NAME=${SCHEMA}"
+echo "export PACT_BROKER_DATABASE_HOST=${ip}"
+echo "export PACT_BROKER_DATABASE_PORT=${PACT_BROKER_DATABASE_PORT}"
+echo "To test:"
+echo "psql -h \$PACT_BROKER_DATABASE_HOST -p \$PACT_BROKER_DATABASE_PORT -d \$PACT_BROKER_DATABASE_NAME -U \$PACT_BROKER_DATABASE_USERNAME"

data/script/recreate-mysql-db.sh

@@ -15,3 +15,4 @@ echo "export PACT_BROKER_DATABASE_HOST=${ip}"
 echo "To test:"
 echo "mysql -upact_broker -ppact_broker -hlocalhost"
 
+DATABASE_ADAPTER=mysql bundle exec rake db:migrate

data/spec/integration/webhooks/certificate_spec.rb

@@ -5,7 +5,7 @@ describe "executing a webhook to a server with a self signed certificate" do
   let(:td) { TestDataBuilder.new }
   before(:all) do
     @pipe = IO.popen("bundle exec ruby spec/support/ssl_webhook_server.rb")
-    sleep 2
+    sleep 3
   end
 
   let(:webhook_request) do

data/spec/lib/pact_broker/db/clean_spec.rb

@@ -44,7 +44,7 @@ module PactBroker
 
         it "deletes rows that aren't the latest or latest tagged" do
           subject
-          expect(db[:materialized_matrix].where(consumer_version_number: "2").count).to eq 0
+          expect(db[:matrix].where(consumer_version_number: "2").count).to eq 0
         end
 
         it "deletes orphan pact_versions" do

data/spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb

@@ -0,0 +1,40 @@
+require 'pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications'
+
+module PactBroker
+  module DB
+    module DataMigrations
+      describe SetConsumerIdsForPactPublications, migration: true do
+        describe ".call" do
+          before do
+            PactBroker::Database.migrate(20180615)
+          end
+
+          let(:now) { DateTime.new(2018, 2, 2) }
+          let!(:consumer_other) { create(:pacticipants, {name: 'Other consumer', created_at: now, updated_at: now}) }
+          let!(:consumer) { create(:pacticipants, {name: 'Consumer', created_at: now, updated_at: now}) }
+          let!(:provider) { create(:pacticipants, {name: 'Provider', created_at: now, updated_at: now}) }
+          let!(:consumer_version) { create(:versions, {number: '1.2.3', order: 1, pacticipant_id: consumer[:id], created_at: now, updated_at: now}) }
+          let!(:pact_version) { create(:pact_versions, {content: {some: 'json'}.to_json, sha: '1234', consumer_id: consumer[:id], provider_id: provider[:id], created_at: now}) }
+          let!(:pact_publication) do
+            create(:pact_publications, {
+              consumer_version_id: consumer_version[:id],
+              provider_id: provider[:id],
+              revision_number: 1,
+              pact_version_id: pact_version[:id],
+              created_at: (now - 1)
+            })
+          end
+
+          subject { SetConsumerIdsForPactPublications.call(database) }
+
+          it "sets the consumer_id" do
+            expect(database[:pact_publications].first[:consumer_id]).to be nil
+            subject
+            expect(database[:pact_publications].first[:consumer_id]).to_not be nil
+            expect(database[:pact_publications].first[:consumer_id]).to eq consumer[:id]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/feature_toggle_spec.rb

@@ -0,0 +1,74 @@
+require 'pact_broker/feature_toggle'
+
+module PactBroker
+  describe FeatureToggle do
+    describe "enabled?" do
+      before do
+        allow(ENV).to receive(:[]).and_call_original
+      end
+
+      subject { FeatureToggle.enabled?(:foo) }
+
+      context "when RACK_ENV is not production" do
+        before do
+          allow(ENV).to receive(:[]).with('RACK_ENV').and_return('development')
+        end
+
+        context "when PACT_BROKER_FEATURES includes the given string" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return('foo bar')
+          end
+
+          it { is_expected.to be true }
+        end
+
+        context "when PACT_BROKER_FEATURES does not include the given string" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return(nil)
+          end
+
+          it { is_expected.to be true }
+        end
+      end
+
+      context "when RACK_ENV is production" do
+        before do
+          allow(ENV).to receive(:[]).with('RACK_ENV').and_return('production')
+        end
+
+        context "when PACT_BROKER_FEATURES includes the given string" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return('foo bar')
+          end
+
+          it { is_expected.to be true }
+        end
+
+        context "when PACT_BROKER_FEATURES includes the given string inside another word" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return('foowiffle bar')
+          end
+
+          it { is_expected.to be false }
+        end
+
+        context "when PACT_BROKER_FEATURES includes the given string but the case doesn't match" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return('FOO bar')
+          end
+
+          it { is_expected.to be true }
+        end
+
+
+        context "when PACT_BROKER_FEATURES does not include the given string" do
+          before do
+            allow(ENV).to receive(:[]).with('PACT_BROKER_FEATURES').and_return(nil)
+          end
+
+          it { is_expected.to be false }
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/matrix/head_row_spec.rb

@@ -57,50 +57,6 @@ module PactBroker
           end
         end
       end
-      describe "refresh", migration: true do
-        before do
-          PactBroker::Database.migrate
-        end
-
-        let(:td) { TestDataBuilder.new(auto_refresh_matrix: false) }
-
-        before do
-          td.create_pact_with_hierarchy("Foo", "1", "Bar")
-        end
-
-        context "with a consumer pacticipant_id and a consumer tag_name" do
-          before do
-            td.create_consumer_version_tag("prod")
-            Row.refresh(ids)
-          end
-          let(:ids) { { pacticipant_id: td.consumer.id, tag_name: "prod"} }
-
-          subject { HeadRow.refresh(ids) }
-
-          it "refreshes the data for the consumer and consumer tag in the head matrix" do
-            subject
-            expect(HeadRow.all.collect(&:values)).to contain_hash(provider_name: "Bar", consumer_name: "Foo", consumer_version_tag_name: "prod")
-          end
-        end
-
-        context "with a provider pacticipant_id and a provider tag_name" do
-          before do
-            td.create_verification(provider_version: "2")
-              .use_provider_version("2")
-              .create_provider_version_tag("prod")
-            Row.refresh(ids)
-          end
-
-          let(:ids) { { pacticipant_id: td.consumer.id, tag_name: "prod" } }
-
-          subject { HeadRow.refresh(ids) }
-
-          it "does not update the head matrix as the head matrix only contains consumer tags" do
-            subject
-            expect(HeadRow.count).to eq 0
-          end
-        end
-      end
     end
   end
 end