pact_broker 2.32.0 → 2.33.0

data/spec/lib/pact_broker/webhooks/webhook_request_template_spec.rb

@@ -38,11 +38,15 @@ module PactBroker
           allow(PactBroker::Webhooks::Render).to receive(:call) do | content, pact, verification, &block |
             content + "BUILT"
           end
+
+          allow(PactAndVerificationParameters).to receive(:new).and_return(pact_and_verification_parameters)
         end
 
+        let(:pact_and_verification_parameters) { instance_double(PactAndVerificationParameters, to_hash: params_hash)}
+        let(:params_hash) { double('params hash') }
         let(:pact) { double('pact') }
         let(:verification) { double('verification') }
-        let(:webhook_context) { { some: "context" } }
+        let(:webhook_context) { { some: "context", base_url: base_url } }
         let(:template_context) do
           {
             pact: pact,
@@ -52,8 +56,13 @@ module PactBroker
         end
         subject { WebhookRequestTemplate.new(attributes).build(template_context) }
 
+        it "creates the template parameters" do
+          expect(PactAndVerificationParameters).to receive(:new).with(pact, verification, webhook_context)
+          subject
+        end
+
         it "renders the url template" do
-          expect(PactBroker::Webhooks::Render).to receive(:call).with(url, pact, verification, webhook_context) do | content, pact, verification, &block |
+          expect(PactBroker::Webhooks::Render).to receive(:call).with(url, params_hash) do | content, pact, verification, &block |
             expect(content).to eq url
             expect(pact).to be pact
             expect(verification).to be verification
@@ -67,7 +76,7 @@ module PactBroker
           let(:body) { 'body' }
 
           it "renders the body template with the String" do
-            expect(PactBroker::Webhooks::Render).to receive(:call).with('body', pact, verification, webhook_context)
+            expect(PactBroker::Webhooks::Render).to receive(:call).with('body', params_hash)
             subject
           end
         end
@@ -76,7 +85,7 @@ module PactBroker
           let(:request_body_string) { '{"foo":"bar"}' }
 
           it "renders the body template with JSON" do
-            expect(PactBroker::Webhooks::Render).to receive(:call).with(request_body_string, pact, verification, webhook_context)
+            expect(PactBroker::Webhooks::Render).to receive(:call).with(request_body_string, params_hash)
             subject
           end
         end

data/spec/support/database.rb

@@ -1,5 +1,5 @@
 require 'db'
 require 'tasks/database'
 require 'pact_broker/db'
-raise "Wrong environment!!! Don't run this script!! ENV['RACK_ENV'] is #{ENV['RACK_ENV']} and RACK_ENV is #{RACK_ENV}" if ENV['RACK_ENV'] != 'test' || RACK_ENV != 'test'
+raise "Wrong environment!!! Don't run this script!! ENV['RACK_ENV'] is #{ENV['RACK_ENV']} and RACK_ENV is #{RACK_ENV}" if ENV['RACK_ENV'] != 'test'
 PactBroker::DB.connection = PactBroker::Database.database = DB::PACT_BROKER_DB

data/spec/support/ssl_pact_broker_server.rb

@@ -0,0 +1,46 @@
+if __FILE__ == $0
+
+  SSL_KEY = 'spec/fixtures/certificates/key.pem'
+  SSL_CERT = 'spec/fixtures/certificates/cert.pem'
+
+  trap(:INT) do
+    @server.shutdown
+    exit
+  end
+
+  def webrick_opts port
+    certificate = OpenSSL::X509::Certificate.new(File.read(SSL_CERT))
+    cert_name = certificate.subject.to_a.collect{|a| a[0..1] }
+    {
+      Port: port,
+      Host: "0.0.0.0",
+      AccessLog: [],
+      SSLCertificate: certificate,
+      SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read(SSL_KEY)),
+      SSLEnable: true,
+      SSLCertName: cert_name
+    }
+  end
+
+  require 'pact_broker'
+
+  DATABASE_CREDENTIALS = { adapter: "sqlite", database: "/tmp/pact_broker_ssl_database.sqlite3", :encoding => 'utf8' }
+
+  app = PactBroker::App.new do | config |
+    config.logger = ::Logger.new($stdout)
+    config.logger.level = ::Logger::INFO
+    config.auto_migrate_db = true
+    config.database_connection = Sequel.connect(DATABASE_CREDENTIALS.merge(:logger => PactBroker::DB::LogQuietener.new(Logger.new(StringIO.new))))
+  end
+
+  require 'webrick'
+  require 'webrick/https'
+  require 'rack'
+  require 'rack/handler/webrick'
+
+  opts = webrick_opts(4444)
+
+  Rack::Handler::WEBrick.run(app, opts) do |server|
+    @server = server
+  end
+end

data/tasks/database.rb

@@ -96,6 +96,18 @@ module PactBroker
       end
     end
 
+    def wait_for_database
+      tries = 0
+      begin
+        database
+      rescue StandardError => e
+        tries += 1
+        sleep 1
+        retry if tries < 10
+        raise e
+      end
+    end
+
     private
 
     def ordered_tables

data/tasks/db.rake

@@ -21,7 +21,6 @@ namespace :db do
   task :env => ['bundler:setup'] do
     # Require RACK_ENV to be set for tasks that will be called in production
     raise "Please specify RACK_ENV" unless ENV['RACK_ENV']
-    RACK_ENV = ENV['RACK_ENV']
     require File.dirname(__FILE__) + '/database.rb'
   end
 
@@ -97,11 +96,32 @@ namespace :db do
   end
 
   desc 'Annotate the Sequel domain classes with schema information'
-  task :annotate =>['db:set_postgres_database_adapter', 'db:migrate'] do
-    load 'tasks/database/annotate.rb'
-    require 'pact_broker/db'
-    PactBroker::DB.connection = PactBroker::Database.database
-    PactBroker::Annotate.call
+  task :annotate do
+    begin
+      ENV['RACK_ENV'] = 'test'
+      ENV['DATABASE_ADAPTER'] = 'docker_postgres'
+      load 'tasks/docker_database.rb'
+      DockerDatabase.stop_and_remove("postgres-for-annotate")
+      DockerDatabase.start(name: "postgres-for-annotate", port: "5433")
+      load 'tasks/database.rb'
+      PactBroker::Database.wait_for_database
+      PactBroker::Database.migrate
+      load 'tasks/database/annotate.rb'
+      require 'pact_broker/db'
+      PactBroker::Annotate.call
+    ensure
+      DockerDatabase.stop_and_remove("postgres-for-annotate")
+    end
+  end
+
+  task 'docker:start' do
+    load 'tasks/docker_database.rb'
+    DockerDatabase.start(name: "postgres-for-pact-broker", port: "5433")
+  end
+
+  task 'docker:stop' do
+    load 'tasks/docker_database.rb'
+    DockerDatabase.stop_and_remove("postgres-for-pact-broker")
   end
 
   # task :create => 'db:env' do

data/tasks/docker_database.rb

@@ -0,0 +1,25 @@
+require 'docker'
+
+module DockerDatabase
+
+  POSTGRES_IMAGE_NAME = 'postgres:9.6'.freeze
+
+  def self.start(options)
+    Docker::Image.create('fromImage' => POSTGRES_IMAGE_NAME)
+    host_port = options.fetch(:port)
+    Docker::Container.create(
+      'Image' => POSTGRES_IMAGE_NAME,
+      'name' => options.fetch(:name),
+      'ExposedPorts' => { '5432/tcp' => {} },
+      'HostConfig' => {
+        'PortBindings' => {
+          '5432/tcp' => [{ 'HostPort' => host_port }]
+        }
+      }
+    ).start({})
+  end
+
+  def self.stop_and_remove(name)
+    ::Docker::Container.get(name).remove(force: true) rescue nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.32.0
+  version: 2.33.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -554,6 +554,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.34'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.34'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -695,6 +709,8 @@ files:
 - db/migrations/20190523_add_enabled_column_to_webhooks.rb
 - db/migrations/20190524_set_webhooks_enabled.rb
 - db/migrations/20190525_add_description_column_to_webhooks.rb
+- db/migrations/20190602_add_headers_column_to_webhooks.rb
+- db/migrations/20190603_migrate_webhook_headers.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -867,6 +883,7 @@ files:
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/clean.rb
 - lib/pact_broker/db/data_migrations/helpers.rb
+- lib/pact_broker/db/data_migrations/migrate_webhook_headers.rb
 - lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications.rb
 - lib/pact_broker/db/data_migrations/set_latest_version_sequence_value.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_ids_for_verifications.rb
@@ -925,7 +942,6 @@ files:
 - lib/pact_broker/domain/verification.rb
 - lib/pact_broker/domain/version.rb
 - lib/pact_broker/domain/webhook.rb
-- lib/pact_broker/domain/webhook_execution_result.rb
 - lib/pact_broker/domain/webhook_request.rb
 - lib/pact_broker/domain/webhook_request_header.rb
 - lib/pact_broker/error.rb
@@ -1033,8 +1049,11 @@ files:
 - lib/pact_broker/versions/service.rb
 - lib/pact_broker/webhooks/check_host_whitelist.rb
 - lib/pact_broker/webhooks/execution.rb
+- lib/pact_broker/webhooks/http_request_with_redacted_headers.rb
+- lib/pact_broker/webhooks/http_response_with_utf_8_safe_body.rb
 - lib/pact_broker/webhooks/job.rb
 - lib/pact_broker/webhooks/latest_triggered_webhook.rb
+- lib/pact_broker/webhooks/pact_and_verification_parameters.rb
 - lib/pact_broker/webhooks/redact_logs.rb
 - lib/pact_broker/webhooks/render.rb
 - lib/pact_broker/webhooks/repository.rb
@@ -1044,6 +1063,8 @@ files:
 - lib/pact_broker/webhooks/triggered_webhook.rb
 - lib/pact_broker/webhooks/webhook.rb
 - lib/pact_broker/webhooks/webhook_event.rb
+- lib/pact_broker/webhooks/webhook_execution_result.rb
+- lib/pact_broker/webhooks/webhook_request_logger.rb
 - lib/pact_broker/webhooks/webhook_request_template.rb
 - lib/rack/hal_browser.rb
 - lib/rack/hal_browser/redirect.rb
@@ -1112,9 +1133,13 @@ files:
 - public/stylesheets/matrix.css
 - public/stylesheets/pact.css
 - script/db-spec.sh
+- script/docker/db-restore.sh
+- script/docker/db-rm.sh
+- script/docker/db-start.sh
 - script/foo-bar-verification.json
 - script/foo-bar.json
 - script/generate-certificates-for-webooks-certificate-spec.rb
+- script/import-pg-database.sh
 - script/insert-self-signed-certificate-from-url.rb
 - script/prod/migrate-latest-pacts.sh
 - script/publish-2.sh
@@ -1287,6 +1312,7 @@ files:
 - spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
+- spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
@@ -1360,6 +1386,7 @@ files:
 - spec/lib/pact_broker/webhooks/status_spec.rb
 - spec/lib/pact_broker/webhooks/trigger_service_spec.rb
 - spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
+- spec/lib/pact_broker/webhooks/webhook_request_logger_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_request_template_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
@@ -1404,6 +1431,7 @@ files:
 - spec/support/shared_context.rb
 - spec/support/shared_examples_for_responses.rb
 - spec/support/simplecov.rb
+- spec/support/ssl_pact_broker_server.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
 - spec/support/verification_job.rb
@@ -1415,6 +1443,7 @@ files:
 - tasks/database/table_dependency_calculator.rb
 - tasks/db.rake
 - tasks/development.rake
+- tasks/docker_database.rb
 - tasks/pact.rake
 - tasks/release.rake
 - tasks/rspec.rake
@@ -1633,6 +1662,7 @@ test_files:
 - spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
+- spec/lib/pact_broker/db/data_migrations/migrate_webhook_headers_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
@@ -1706,6 +1736,7 @@ test_files:
 - spec/lib/pact_broker/webhooks/status_spec.rb
 - spec/lib/pact_broker/webhooks/trigger_service_spec.rb
 - spec/lib/pact_broker/webhooks/triggered_webhook_spec.rb
+- spec/lib/pact_broker/webhooks/webhook_request_logger_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_request_template_spec.rb
 - spec/lib/pact_broker/webhooks/webhook_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
@@ -1750,6 +1781,7 @@ test_files:
 - spec/support/shared_context.rb
 - spec/support/shared_examples_for_responses.rb
 - spec/support/simplecov.rb
+- spec/support/ssl_pact_broker_server.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
 - spec/support/verification_job.rb