pact_broker 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84ee6c55e2a54d6217caee612ab6497e43acda7
-  data.tar.gz: 8c3be29c77af89f8c654373e3ec89fcbbea206d9
+  metadata.gz: 50c48f4aaa8d0b97a1bf1c5e22221a9f3c1f11da
+  data.tar.gz: ffaeb22aabb0ca377af193023e9d53c9f1e8603e
 SHA512:
-  metadata.gz: 8d083312f78b5b4f6c4d43b8561c08fee50fc9a609ace5002053ababf191fa464398c0c67fdfa8014487a1bf187b1148e534c22a012cf30a8b99a5b1523bea47
-  data.tar.gz: 245ab76eece33dd4fe12f74a9b9bf8e37b887c7e769536fcd24c2d404c8ec9772eb9a7168c2e77a8319c18d01ea519e2ee3cc3ff9f30f19f50600fceb978ddd0
+  metadata.gz: 6f78013eca52554efcaca7fdedef4ab71c8c0d5da00226b6296043a1e0880adbf17f228eec498b942b5d4ffaff091237023086f0f27acd564241a4c81f740c2d
+  data.tar.gz: 0f3577bf77b6f5d6fe9e035eaf9495db9bf685a8fd76ec697f97c084234e15550f8a3c1463f2d8d99fc03a94b07ef94e1239483fa14efcf2ff24aba805f435e9

data/.travis.yml

@@ -1,5 +1,18 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
+  # - 2.2.7
+  # - 2.3.4
   - 2.4.1
+services:
+  - postgresql
+  - mysql
+env:
+  - DATABASE_ADAPTER=default RUBYOPT="-W0"
+  - DATABASE_ADAPTER=postgres RUBYOPT="-W0"
+  - DATABASE_ADAPTER=mysql RUBYOPT="-W0"
+before_script:
+  - cp config/database.travis.yml config/database.yml
+  - psql -U postgres -c "CREATE DATABASE pact_broker;"
+  - mysql -e 'CREATE DATABASE pact_broker;'
+script:
+  - bundle exec rake

data/CHANGELOG.md

@@ -2,6 +2,15 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 2.0.3 (2017-05-17)
+* c03b871 - Make specs pass for sqlite, postgres and mysql. At the same time. Amazing. (Beth Skurrie, Sun May 28 10:22:20 2017 +1000)
+* ae2b62f - Remove inner query from latest_verifications definition for MySQL (#105) (Beth Skurrie, Sat May 27 15:11:26 2017 +1000)
+* f451d35 - Add mysql build to travis for #106 (Beth Skurrie, Sat May 27 15:09:42 2017 +1000)
+* 91178c2 - Altering config and travis to run against sqlite and postgres. (Beth Skurrie, Sat May 27 14:08:34 2017 +1000)
+* 4c52061 - Use a simpler and more efficient algorithm for updating version orders. (Beth Skurrie, Mon May 22 13:29:07 2017 +1000)
+* ba5b60c - Created indexes on pacticipant, version and tag tables. #87 (Beth Skurrie, Sun May 21 16:18:49 2017 +1000)
+* 0ffad10 - Do not validate incoming consumer version number if order_versions_by_date is true. (Beth Skurrie, Sun May 21 15:46:54 2017 +1000)
+
 #### 2.0.2 (2017-05-17)
 * 0e4d4bf - Add missing require for migration_helper (Beth Skurrie, Fri May 19 14:16:38 2017 +1000)
 

data/CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Raising issues
+
+Before raising an issue, make sure you have checked the [wiki] to see if an answer is provided there.
+There may also be an answer to your question on [stackoverflow].
+
+Please provide the following information with your issue to enable us to respond as quickly as possible.
+
+* The relevant versions of the gems or packages you are using.
+* The steps to recreate your issue.
+* An executable code example where possible. You can use the [pact-ruby-e2e-example] codebase to quickly recreate your issue.
+* Where you are using a pact broker deployed on third party infrastructure, please include the relevant details.
+
+[wiki]: https://github.com/pact-foundation/pact_broker/wiki
+[stackoverflow]: https://stackoverflow.com/questions/tagged/pact-broker
+[pact-ruby-e2e-example]: https://github.com/pact-foundation/pact-ruby-e2e-example

data/config/database.travis.yml

@@ -0,0 +1,13 @@
+test:
+  default:
+    adapter: sqlite
+    database: tmp/pact_broker_database_test.sqlite3
+  postgres:
+    adapter: postgres
+    database: pact_broker
+    encoding: utf8
+  mysql:
+    adapter: mysql2
+    database: pact_broker
+    username: travis
+    encoding: utf8

data/config/database.yml

@@ -1,20 +1,32 @@
 default: &default
-  adapter: sqlite
-  database: db/pact_broker_database.sqlite3
+  database: pact_broker
+  username: pact_broker
+  password: pact_broker
+  encoding: utf8
 
 test:
-  <<: *default
-  database: tmp/pact_broker_database_test.sqlite3
-
-# test:
-#   adapter: "postgres"
-#   database: "pact_broker"
-#   username: 'pact_broker'
-#   password: 'pact_broker'
-#   encoding: 'utf8'
+  default:
+    adapter: sqlite
+    database: tmp/pact_broker_database_test.sqlite3
+  postgres:
+    <<: *default
+    adapter: postgres
+  mysql:
+    <<: *default
+    adapter: mysql2
 
 development:
-  <<: *default
+  default:
+    adapter: sqlite
+    database: db/pact_broker_database.sqlite3
+  postgres:
+    <<: *default
+    adapter: postgres
+  mysql:
+    <<: *default
+    adapter: mysql2
 
 production:
-  <<: *default
+  default:
+    <<: *default
+    adapter: postgres

data/db/migrations/32_create_latest_verifications.rb

@@ -1,14 +1,15 @@
 Sequel.migration do
   up do
+    create_view(:latest_verification_numbers,
+      "SELECT pact_version_id, MAX(number) latest_number
+          FROM verifications
+          GROUP BY pact_version_id")
+
     # The most recent verification for each pact version
     create_or_replace_view(:latest_verifications,
       "SELECT v.id, v.number, v.success, v.provider_version, v.build_url, v.pact_version_id, v.execution_date, v.created_at
         FROM verifications v
-        INNER JOIN (
-        SELECT pact_version_id, MAX(number) latest_number
-          FROM verifications
-          GROUP BY pact_version_id
-        ) lv ON v.pact_version_id = lv.pact_version_id AND v.number = lv.latest_number"
+        INNER JOIN latest_verification_numbers lv ON v.pact_version_id = lv.pact_version_id AND v.number = lv.latest_number"
     )
   end
 end

data/db/migrations/33_create_config_table.rb

@@ -9,7 +9,7 @@ Sequel.migration do
       String :value, type: PactBroker::MigrationHelper.large_text_type
       DateTime :created_at, null: false
       DateTime :updated_at, null: false
-      index [:name], unique: true, unique_constraint_name: 'unq_config_name'
+      index [:name], unique: true, name: 'unq_config_name'
     end
   end
 end

data/db/migrations/34_create_index_on_consumer_version_order.rb

@@ -0,0 +1,10 @@
+Sequel.migration do
+  up do
+    alter_table(:versions) do
+      # Not actually sure which index it will use for OrderVersions, so CREATE ALL THE INDEXES!
+      add_index [:number], name: 'ndx_ver_num' # Not sure if this is useful give we use LIKE not EQ
+      add_index [:order], name: 'ndx_ver_ord'
+      add_index [:pacticipant_id, :order], unique: true, name: 'uq_ver_ppt_ord'
+    end
+  end
+end

data/db/migrations/35_create_index_on_names.rb

@@ -0,0 +1,11 @@
+Sequel.migration do
+  up do
+    alter_table(:pacticipants) do
+      add_index [:name], name: 'ndx_ppt_name' # Not sure if this is useful give we use LIKE not EQ
+    end
+
+    alter_table(:tags) do
+      add_index [:name], name: 'ndx_tag_name' # Not sure if this is useful give we use LIKE not EQ
+    end
+  end
+end

data/db/migrations/36_create_webhook_execution.rb

@@ -0,0 +1,16 @@
+require_relative 'migration_helper'
+
+Sequel.migration do
+  change do
+    create_table(:webhook_executions, charset: 'utf8') do
+      primary_key :id
+      foreign_key :webhook_id, :webhooks
+      foreign_key :pact_publication_id, :pact_publications
+      foreign_key :consumer_id, :pacticipants, null: false
+      foreign_key :provider_id, :pacticipants, null: false
+      Boolean :success, null: false
+      String :logs, type: PactBroker::MigrationHelper.large_text_type
+      DateTime :created_at, null: false
+    end
+  end
+end

data/lib/db.rb

@@ -25,6 +25,7 @@ module DB
   # pool, as noted in the documentation for the extension.
   #
   def self.connect db_credentials
+    Sequel.datetime_class = DateTime
     con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => 'utf8'))
     con.extension(:connection_validator)
     con.pool.connection_validation_timeout = -1 #Check the connection on every request
@@ -40,7 +41,11 @@ module DB
   def self.configuration_for_env env
     database_yml = PactBroker.project_root.join('config','database.yml')
     config = YAML.load(ERB.new(File.read(database_yml)).result)
-    config.fetch(env)
+    config.fetch(env).fetch(ENV.fetch('DATABASE_ADAPTER','default'))
+  end
+
+  def self.mysql?
+    PACT_BROKER_DB.adapter_scheme.to_s =~ /mysql/
   end
 
   PACT_BROKER_DB ||= connection_for_env ENV.fetch('RACK_ENV')

data/lib/pact_broker/api/contracts/put_pact_params_contract.rb

@@ -34,6 +34,7 @@ module PactBroker
             config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
 
             def valid_consumer_version_number?(value)
+              return true if PactBroker.configuration.order_versions_by_date
               parsed_version_number = PactBroker.configuration.version_parser.call(value)
               !parsed_version_number.nil?
             end

data/lib/pact_broker/app.rb

@@ -49,6 +49,7 @@ module PactBroker
       PactBroker::DB.connection = configuration.database_connection
       PactBroker::DB.connection.timezone = :utc
       PactBroker::DB.validate_connection_config if configuration.validate_database_connection_config
+      Sequel.datetime_class = DateTime
       Sequel.database_timezone = :utc # Store all dates in UTC, assume any date without a TZ is UTC
       Sequel.application_timezone = :local # Convert dates to localtime when retrieving from database
       Sequel.typecast_timezone = :utc # If no timezone specified on dates going into the database, assume they are UTC

data/lib/pact_broker/domain/order_versions.rb

@@ -5,16 +5,42 @@ module PactBroker
     class OrderVersions
 
       include PactBroker::Logging
-      # TODO select for update
-      def self.call pacticipant_id
-
-        orderable_versions = PactBroker::Domain::Version.for_update.where(:pacticipant_id => pacticipant_id).order(:created_at, :id).collect{| version | OrderableVersion.new(version) }
-        ordered_versions = if PactBroker.configuration.order_versions_by_date
-          orderable_versions # already ordered in SQL
-        else
-          orderable_versions.sort
+
+      def self.call new_version
+        new_version.lock!
+        order_set = false
+
+        PactBroker::Domain::Version.for_update.where(pacticipant_id: new_version.pacticipant_id).exclude(order: nil).reverse(:order).each do | existing_version |
+          if new_version_after_existing_version? new_version, existing_version
+            set_order_after_existing_version_order new_version, existing_version
+            order_set = true
+            break
+          else
+            increment_existing_version_order existing_version
+          end
         end
-        ordered_versions.each_with_index{ | version, i | version.update_model(i) }
+
+        if !order_set
+          set_order new_version, 0
+        end
+      end
+
+      def self.increment_existing_version_order existing_version
+        set_order existing_version, existing_version.order + 1
+      end
+
+      def self.set_order_after_existing_version_order new_version, existing_version
+        set_order new_version, existing_version.order + 1
+      end
+
+      def self.set_order version, order
+        # Use dataset method so we don't trigger an update to the updated_at column
+        Sequel::Model.db[:versions].where(id: version.id).update(order: order)
+      end
+
+      def self.new_version_after_existing_version? new_version, existing_version
+        return true if PactBroker.configuration.order_versions_by_date
+        return OrderableVersion.new(new_version).after?(OrderableVersion.new(existing_version))
       end
 
       class OrderableVersion
@@ -44,12 +70,8 @@ module PactBroker
           end
         end
 
-        def update_model new_order
-          if version_model.order != new_order
-            # Avoid modifying the updated_at flag by doing a manual update
-            # In 99% of cases, this will only set the order of the most recent version
-            PactBroker::Domain::Version.where(id: version_model.id).update(order: new_order)
-          end
+        def after? other
+          (self <=> other) == 1
         end
       end
     end

data/lib/pact_broker/domain/relationship.rb

@@ -3,22 +3,24 @@ module PactBroker
 
     class Relationship
 
-      attr_reader :consumer, :provider
+      attr_reader :consumer, :provider, :latest_pact, :latest_verification, :webhooks
 
-      def initialize consumer, provider, latest_pact = nil, latest_verification = nil
+      def initialize consumer, provider, latest_pact = nil, latest_verification = nil, webhooks = []
         @consumer = consumer
         @provider = provider
         @latest_pact = latest_pact
         @latest_verification = latest_verification
+        @webhooks = webhooks
       end
 
-      def self.create consumer, provider, latest_pact, latest_verification
-        new consumer, provider, latest_pact, latest_verification
+      def self.create consumer, provider, latest_pact, latest_verification, webhooks
+        new consumer, provider, latest_pact, latest_verification, webhooks
       end
 
       def eq? other
         Relationship === other && other.consumer == consumer && other.provider == provider &&
-          other.latest_pact == latest_pact && other.latest_verification == latest_verification
+          other.latest_pact == latest_pact && other.latest_verification == latest_verification &&
+          other.webhooks == webhooks
       end
 
       def == other
@@ -37,6 +39,10 @@ module PactBroker
         @latest_pact
       end
 
+      def any_webhooks?
+        @webhooks.any?
+      end
+
       def ever_verified?
         !!latest_verification
       end

data/lib/pact_broker/domain/tag.rb

@@ -9,6 +9,10 @@ module PactBroker
 
       associate(:many_to_one, :version, :class => "PactBroker::Domain::Version", :key => :version_id, :primary_key => :id)
 
+      def <=> other
+        name <=> other.name
+      end
+
     end
 
     Tag.plugin :timestamps, :update_on_create=>true

data/lib/pact_broker/domain/version.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/db'
 require 'pact_broker/domain/order_versions'
+require 'pact_broker/repositories/helpers'
 
 module PactBroker
 
@@ -12,8 +13,12 @@ module PactBroker
       associate(:many_to_one, :pacticipant, :class => "PactBroker::Domain::Pacticipant", :key => :pacticipant_id, :primary_key => :id)
       one_to_many :tags, :reciprocal => :version
 
+      dataset_module do
+        include PactBroker::Repositories::Helpers
+      end
+
       def after_create
-        OrderVersions.(self.pacticipant_id)
+        OrderVersions.(self)
       end
 
       def to_s

data/lib/pact_broker/domain/webhook_execution_result.rb

@@ -4,8 +4,9 @@ module PactBroker
 
     class WebhookExecutionResult
 
-      def initialize response, error = nil
+      def initialize response, logs, error = nil
         @response = response
+        @logs = logs
         @error = error
       end
 
@@ -21,6 +22,10 @@ module PactBroker
         @error
       end
 
+      def logs
+        @logs
+      end
+
     end
   end
-end
+end

data/lib/pact_broker/domain/webhook_request.rb

@@ -48,10 +48,15 @@ module PactBroker
 
       def execute
 
+        logs = StringIO.new
+        execution_logger = Logger.new(logs)
+
         begin
           req = http_request
+          execution_logger.info "HTTP/1.1 #{method.upcase} #{url_with_credentials}"
 
           headers.each_pair do | name, value |
+            execution_logger.info "#{name}: #{value}"
             req[name] = value
           end
 
@@ -65,20 +70,31 @@ module PactBroker
             end
           end
 
+          execution_logger.info req.body
+
           logger.info "Making webhook #{uuid} request #{to_s}"
+
           response = Net::HTTP.start(uri.hostname, uri.port,
             :use_ssl => uri.scheme == 'https') do |http|
             http.request req
           end
 
+          execution_logger.info(" ")
           logger.info "Received response for webhook #{uuid} status=#{response.code}"
+          execution_logger.info "HTTP/#{response.http_version} #{response.code} #{response.message}"
+          response.each_header do | header |
+            execution_logger.info "#{header.split("-").collect(&:capitalize).join('-')}: #{response[header]}"
+          end
           logger.debug "body=#{response.body}"
-          WebhookExecutionResult.new(response)
+          execution_logger.info response.body
+          WebhookExecutionResult.new(response, logs.string)
 
         rescue StandardError => e
           logger.error "Error executing webhook #{uuid} #{e.class.name} - #{e.message}"
+          execution_logger.error "Error executing webhook #{uuid} #{e.class.name} - #{e.message}"
           logger.error e.backtrace.join("\n")
-          WebhookExecutionResult.new(nil, e)
+          execution_logger.error e.backtrace.join("\n")
+          WebhookExecutionResult.new(nil, logs.string, e)
         end
 
       end
@@ -96,6 +112,12 @@ module PactBroker
       def uri
         URI(url)
       end
+
+      def url_with_credentials
+        u = URI(url)
+        u.userinfo = "#{username}:#{display_password}" if username
+        u
+      end
     end
 
   end