pact_broker 2.79.1 → 2.80.0

data/script/reproduce-issue-expand-currently-deployed.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+begin
+
+  $LOAD_PATH << "#{Dir.pwd}/lib"
+  require "pact_broker/test/http_test_data_builder"
+  base_url = ENV["PACT_BROKER_BASE_URL"] || "http://localhost:9292"
+
+  td = PactBroker::Test::HttpTestDataBuilder.new(base_url)
+  td.delete_integration(consumer: "Foo", provider: "Bar")
+    .delete_integration(consumer: "foo-consumer", provider: "bar-provider")
+    .create_environment(name: "test")
+    .create_environment(name: "prod", production: true)
+    .publish_pact(consumer: "foo-consumer", consumer_version: "1", provider: "bar-provider", content_id: "111", tag: "main")
+    .get_pacts_for_verification(
+      enable_pending: true,
+      provider_version_tag: "main",
+      include_wip_pacts_since: "2020-01-01",
+      consumer_version_selectors: [{ tag: "main", latest: true }])
+    .verify_pact(
+      index: 0,
+      provider_version_tag: "main",
+      provider_version: "1",
+      success: true
+    )
+    .record_deployment(pacticipant: "bar-provider", version: "1", environment_name: "test")
+    .record_deployment(pacticipant: "bar-provider", version: "1", environment_name: "prod")
+    .record_deployment(pacticipant: "foo-consumer", version: "1", environment_name: "prod")
+    .get_pacts_for_verification(
+      enable_pending: true,
+      provider_version_tag: "main",
+      include_wip_pacts_since: "2020-01-01",
+      consumer_version_selectors: [{ tag: "main", latest: true }])
+    .verify_pact(
+      index: 0,
+      provider_version_tag: "main",
+      provider_version: "2",
+      success: true
+    )
+    .record_deployment(pacticipant: "bar-provider", version: "2", environment_name: "test")
+    .create_global_webhook_for_contract_changed(uuid: "7a5da39c-8e50-4cc9-ae16-dfa5be043e8c")
+    .publish_pact(consumer: "foo-consumer", consumer_version: "2", provider: "bar-provider", content_id: "222", tag: "main")
+
+rescue StandardError => e
+  puts "#{e.class} #{e.message}"
+  puts e.backtrace
+  exit 1
+end

data/script/reproduce-issue-starting-up.rb

@@ -1,23 +1,28 @@
 #!/usr/bin/env ruby
 
-begin
+# To show issue on master, need to set RACK_ENV=production to turn off feature toggle
 
+begin
   $LOAD_PATH << "#{Dir.pwd}/lib"
-  require 'pact_broker/test/http_test_data_builder'
-  base_url = ENV['PACT_BROKER_BASE_URL'] || 'http://localhost:9292'
+  require "pact_broker/test/http_test_data_builder"
+  base_url = ENV["PACT_BROKER_BASE_URL"] || "http://localhost:9292"
 
   td = PactBroker::Test::HttpTestDataBuilder.new(base_url)
   td.delete_integration(consumer: "Foo", provider: "Bar")
     .delete_integration(consumer: "foo-consumer", provider: "bar-provider")
     .create_pacticipant("foo-consumer")
     .create_pacticipant("foo-provider")
-    .create_global_webhook_for_verification_published(uuid: "ba8feb17-558a-4b3f-a078-f52c6fafd014", url: "http://webhook-server:9393")
+    .create_version(pacticipant: "foo-provider", version: "0", branch: nil)
     .publish_pact(consumer: "foo-consumer", consumer_version: "1", provider: "bar-provider", content_id: "111", tag: "main")
-    .publish_pact(consumer: "foo-consumer", consumer_version: "2", provider: "bar-provider", content_id: "111", tag: ["feat/x", "feat/y"])
-    .sleep(10)
+    .publish_pact(consumer: "foo-consumer", consumer_version: "2", provider: "bar-provider", content_id: "222", tag: ["feat/x", "feat/y"])
+    .sleep(1)
     .get_pacts_for_verification(
       provider_version_tag: "main",
-      consumer_version_selectors: [{ tag: "main", latest: true }, { tag: "feat/x", latest: true }, { tag: "feat/y", latest: true }])
+      consumer_version_selectors: [{ tag: "main", latest: true }],
+      include_wip_pacts_since: "2020-01-01",
+      enable_pending: true
+    )
+    .comment("There should have been 2 pacts to verify here")
     .verify_pact(
       index: 0,
       provider_version_tag: "main",

data/script/reproduce-issue.rb

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
+
+# The content_id is used to deterministically generate pact content. It doesn't matter what the value is.
+# If you want to simulate publishing a pact that has the same content as a previous pact, use the same ID.
+# If you want to simulate publishing a pact with different content, use a different ID.
+
 begin
 
   $LOAD_PATH << "#{Dir.pwd}/lib"
-  require 'pact_broker/test/http_test_data_builder'
-  base_url = ENV['PACT_BROKER_BASE_URL'] || 'http://localhost:9292'
+  require "pact_broker/test/http_test_data_builder"
+  base_url = ENV["PACT_BROKER_BASE_URL"] || "http://localhost:9292"
 
   td = PactBroker::Test::HttpTestDataBuilder.new(base_url)
   td.delete_integration(consumer: "Foo", provider: "Bar")

data/script/run-with-ssl.rb

@@ -1,7 +1,7 @@
 if __FILE__ == $0
-  require 'pact_broker'
+  require "pact_broker"
 
-  DATABASE_CREDENTIALS = {adapter: "sqlite", database: "pact_broker_ssl_database.sqlite3", :encoding => 'utf8'}
+  DATABASE_CREDENTIALS = {adapter: "sqlite", database: "pact_broker_ssl_database.sqlite3", :encoding => "utf8"}
 
   app = PactBroker::App.new do | config |
     config.logger = ::Logger.new($stdout)
@@ -9,8 +9,8 @@ if __FILE__ == $0
     config.database_connection = Sequel.connect(DATABASE_CREDENTIALS)
   end
 
-  SSL_KEY = 'spec/fixtures/certificates/key.pem'
-  SSL_CERT = 'spec/fixtures/certificates/cert.pem'
+  SSL_KEY = "spec/fixtures/certificates/key.pem"
+  SSL_CERT = "spec/fixtures/certificates/cert.pem"
 
   trap(:INT) do
     @server.shutdown
@@ -31,10 +31,10 @@ if __FILE__ == $0
     }
   end
 
-  require 'webrick'
-  require 'webrick/https'
-  require 'rack'
-  require 'rack/handler/webrick'
+  require "webrick"
+  require "webrick/https"
+  require "rack"
+  require "rack/handler/webrick"
 
   opts = webrick_opts(4444)
 

data/script/seed-example-matrix.rb

@@ -2,23 +2,23 @@
 
 raise "Please supply database path" unless ARGV[0]
 
-$LOAD_PATH.unshift './lib'
-$LOAD_PATH.unshift './spec'
-$LOAD_PATH.unshift './tasks'
-ENV['RACK_ENV'] = 'development'
-require 'sequel'
-require 'logger'
-DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+$LOAD_PATH.unshift "./lib"
+$LOAD_PATH.unshift "./spec"
+$LOAD_PATH.unshift "./tasks"
+ENV["RACK_ENV"] = "development"
+require "sequel"
+require "logger"
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => "utf8"}
 #DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
 
 connection = Sequel.connect(DATABASE_CREDENTIALS)
 connection.timezone = :utc
-require 'pact_broker/db'
+require "pact_broker/db"
 PactBroker::DB.connection = connection
-require 'pact_broker'
-require 'support/test_data_builder'
+require "pact_broker"
+require "support/test_data_builder"
 
-require 'database/table_dependency_calculator'
+require "database/table_dependency_calculator"
 PactBroker::Database::TableDependencyCalculator.call(connection).each do | table_name |
   connection[table_name].delete
 end

data/script/seed-for-webhook-test.rb

@@ -2,39 +2,39 @@
 
 raise "Please supply database path" unless ARGV[0]
 
-$LOAD_PATH.unshift './lib'
-$LOAD_PATH.unshift './spec'
-$LOAD_PATH.unshift './tasks'
-ENV['RACK_ENV'] = 'development'
-require 'sequel'
-require 'logger'
-DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}.tap { |it| puts it }
+$LOAD_PATH.unshift "./lib"
+$LOAD_PATH.unshift "./spec"
+$LOAD_PATH.unshift "./tasks"
+ENV["RACK_ENV"] = "development"
+require "sequel"
+require "logger"
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => "utf8"}.tap { |it| puts it }
 #DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
 
 connection = Sequel.connect(DATABASE_CREDENTIALS)
 connection.timezone = :utc
 # Uncomment these lines to open a pry session for inspecting the database
 
-require 'pact_broker/db'
+require "pact_broker/db"
 PactBroker::DB.connection = connection
-require 'pact_broker'
-require 'support/test_data_builder'
+require "pact_broker"
+require "support/test_data_builder"
 
-require 'database/table_dependency_calculator'
+require "database/table_dependency_calculator"
 PactBroker::Database::TableDependencyCalculator.call(connection).each do | table_name |
   connection[table_name].delete
 end
 
 webhook_body = {
-  'pactUrl' => '${pactbroker.pactUrl}',
-  'verificationResultUrl' => '${pactbroker.verificationResultUrl}',
-  'consumerVersionNumber' => '${pactbroker.consumerVersionNumber}',
-  'providerVersionNumber' => '${pactbroker.providerVersionNumber}',
-  'providerVersionTags' => '${pactbroker.providerVersionTags}',
-  'consumerVersionTags' => '${pactbroker.consumerVersionTags}',
-  'consumerName' => '${pactbroker.consumerName}',
-  'providerName' => '${pactbroker.providerName}',
-  'githubVerificationStatus' => '${pactbroker.githubVerificationStatus}'
+  "pactUrl" => "${pactbroker.pactUrl}",
+  "verificationResultUrl" => "${pactbroker.verificationResultUrl}",
+  "consumerVersionNumber" => "${pactbroker.consumerVersionNumber}",
+  "providerVersionNumber" => "${pactbroker.providerVersionNumber}",
+  "providerVersionTags" => "${pactbroker.providerVersionTags}",
+  "consumerVersionTags" => "${pactbroker.consumerVersionTags}",
+  "consumerName" => "${pactbroker.consumerName}",
+  "providerName" => "${pactbroker.providerName}",
+  "githubVerificationStatus" => "${pactbroker.githubVerificationStatus}"
 }
 
   # .create_global_webhook(
@@ -48,12 +48,12 @@ PactBroker.configuration.base_equality_only_on_content_that_affects_verification
 
 TestDataBuilder.new
     .create_global_contract_published_webhook(
-      method: 'POST',
+      method: "POST",
       url: "http://localhost:9292/pact-changed-webhook",
       body: webhook_body.to_json,
       username: "foo",
       password: "bar")
     .create_global_verification_webhook(
-      method: 'POST',
+      method: "POST",
       url: "http://localhost:9292/verification-published-webhook",
       body: webhook_body.to_json)

data/script/seed-matrix.rb

@@ -2,21 +2,21 @@
 
 raise "Please supply database path" unless ARGV[0]
 
-$LOAD_PATH.unshift './lib'
-$LOAD_PATH.unshift './spec'
-$LOAD_PATH.unshift './tasks'
-ENV['RACK_ENV'] = 'development'
-require 'sequel'
-require 'logger'
-DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}
+$LOAD_PATH.unshift "./lib"
+$LOAD_PATH.unshift "./spec"
+$LOAD_PATH.unshift "./tasks"
+ENV["RACK_ENV"] = "development"
+require "sequel"
+require "logger"
+DATABASE_CREDENTIALS = {logger: Logger.new($stdout), adapter: "sqlite", database: ARGV[0], :encoding => "utf8"}
 connection = Sequel.connect(DATABASE_CREDENTIALS)
 connection.timezone = :utc
-require 'pact_broker/db'
+require "pact_broker/db"
 PactBroker::DB.connection = connection
-require 'pact_broker'
-require 'support/test_data_builder'
+require "pact_broker"
+require "support/test_data_builder"
 
-require 'database/table_dependency_calculator'
+require "database/table_dependency_calculator"
 PactBroker::Database::TableDependencyCalculator.call(connection).each do | table_name |
   connection[table_name].delete
 end
@@ -41,20 +41,20 @@ A -> B ->  C
 TestDataBuilder.new
   .create_pact_with_hierarchy("A", "1", "B")
   .create_consumer_version_tag("master")
-  .create_verification(provider_version: '1', success: false, execution_date: Date.today - 1 )
-  .create_verification(provider_version: '1', number: 2, success: true)
-  .create_verification(provider_version: '2', number: 3)
-  .create_verification(provider_version: '4', number: 4)
+  .create_verification(provider_version: "1", success: false, execution_date: Date.today - 1 )
+  .create_verification(provider_version: "1", number: 2, success: true)
+  .create_verification(provider_version: "2", number: 3)
+  .create_verification(provider_version: "4", number: 4)
   .create_provider_version("5")
   .use_consumer("B")
   .use_consumer_version("1")
   .create_consumer_version_tag("master")
   .create_provider("C")
   .create_pact
-  .create_verification(provider_version: '1', success: false)
+  .create_verification(provider_version: "1", success: false)
   .use_consumer_version("2")
   .create_pact
-  .create_verification(provider_version: '2', success: true)
+  .create_verification(provider_version: "2", success: true)
   .create_consumer_version("3")
   .create_pact
   .use_consumer("A")
@@ -62,14 +62,14 @@ TestDataBuilder.new
   .create_consumer_version_tag("master")
   .use_provider("B")
   .create_pact
-  .create_verification(provider_version: '5')
+  .create_verification(provider_version: "5")
   .create_pact_with_hierarchy("X", "1", "Z")
   .create_consumer_version_tag("feat-x")
-  .create_verification(provider_version: '6')
+  .create_verification(provider_version: "6")
   .create_consumer_version("2")
   .create_consumer_version_tag("feat-y")
   .create_pact
-  .create_verification(provider_version: '7')
+  .create_verification(provider_version: "7")
   .create_consumer_version("3")
   .create_consumer_version_tag("feat-x")
   .create_consumer_version_tag("feat-y")

data/script/seed.rb

@@ -2,16 +2,16 @@
 
 raise "Please supply database path" unless ARGV[0]
 
-$LOAD_PATH.unshift './lib'
-$LOAD_PATH.unshift './spec'
-$LOAD_PATH.unshift './tasks'
-ENV['RACK_ENV'] = 'development'
-require 'sequel'
-require 'logger'
-require 'stringio'
-logger = Logger.new($stdout)
+$LOAD_PATH.unshift "./lib"
+$LOAD_PATH.unshift "./spec"
+$LOAD_PATH.unshift "./tasks"
+ENV["RACK_ENV"] = "development"
+require "sequel"
+require "logger"
+require "stringio"
+# logger = Logger.new($stdout)
 logger = Logger.new(StringIO.new)
-DATABASE_CREDENTIALS = {logger: logger, adapter: "sqlite", database: ARGV[0], :encoding => 'utf8'}.tap { |it| puts it }
+DATABASE_CREDENTIALS = {logger: logger, adapter: "sqlite", database: ARGV[0], :encoding => "utf8"}.tap { |it| puts it }
 #DATABASE_CREDENTIALS = {adapter: "postgres", database: "pact_broker", username: 'pact_broker', password: 'pact_broker', :encoding => 'utf8'}
 
 connection = Sequel.connect(DATABASE_CREDENTIALS)
@@ -21,29 +21,29 @@ connection.timezone = :utc
 # require 'pry'; pry(binding);
 # exit
 
-require 'pact_broker/db'
+require "pact_broker/db"
 PactBroker::DB.connection = connection
-require 'pact_broker'
-require 'support/test_data_builder'
+require "pact_broker"
+require "support/test_data_builder"
 
-require 'database/table_dependency_calculator'
+require "database/table_dependency_calculator"
 PactBroker::Database::TableDependencyCalculator.call(connection).each do | table_name |
   connection[table_name].delete
 end
 
-  # .create_webhook(method: 'GET', url: 'https://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
+# .create_webhook(method: 'GET', url: 'https://localhost:9393?url=${pactbroker.pactUrl}', body: '${pactbroker.pactUrl}')
 
-webhook_body = {
-  'pactUrl' => '${pactbroker.pactUrl}',
-  'verificationResultUrl' => '${pactbroker.verificationResultUrl}',
-  'consumerVersionNumber' => '${pactbroker.consumerVersionNumber}',
-  'providerVersionNumber' => '${pactbroker.providerVersionNumber}',
-  'providerVersionTags' => '${pactbroker.providerVersionTags}',
-  'consumerVersionTags' => '${pactbroker.consumerVersionTags}',
-  'consumerName' => '${pactbroker.consumerName}',
-  'providerName' => '${pactbroker.providerName}',
-  'githubVerificationStatus' => '${pactbroker.githubVerificationStatus}'
-}
+# webhook_body = {
+#   'pactUrl' => '${pactbroker.pactUrl}',
+#   'verificationResultUrl' => '${pactbroker.verificationResultUrl}',
+#   'consumerVersionNumber' => '${pactbroker.consumerVersionNumber}',
+#   'providerVersionNumber' => '${pactbroker.providerVersionNumber}',
+#   'providerVersionTags' => '${pactbroker.providerVersionTags}',
+#   'consumerVersionTags' => '${pactbroker.consumerVersionTags}',
+#   'consumerName' => '${pactbroker.consumerName}',
+#   'providerName' => '${pactbroker.providerName}',
+#   'githubVerificationStatus' => '${pactbroker.githubVerificationStatus}'
+# }
 
 PactBroker.configuration.base_equality_only_on_content_that_affects_verification_results = false
 

data/script/test/approval-all.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for file in $(find spec/fixtures/approvals -ipath "*.received.*"); do
+  approved_path=$(echo "$file" | sed 's/received/approved/')
+  mv "$file" "$approved_path"
+done;

data/script/webhook-server.ru

@@ -1,10 +1,10 @@
-require 'rack/utils'
+require "rack/utils"
 STDOUT.sync = true
 puts "Starting webhook server"
 
 run -> (env) {
   status = 200
-  puts Rack::Utils.parse_nested_query(env['QUERY_STRING']) if env['QUERY_STRING'] && env['QUERY_STRING'] != ''
-  puts env['rack.input'].read
+  puts Rack::Utils.parse_nested_query(env["QUERY_STRING"]) if env["QUERY_STRING"] && env["QUERY_STRING"] != ""
+  puts env["rack.input"].read
   [status, {"Content-Type" => "text/plain"}, ["Webhook response.\n"]]
 }

data/spec/features/base_equality_only_on_content_that_affects_verification_results_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe "base_equality_only_on_content_that_affects_verification_results" do
   let(:td) { TestDataBuilder.new }
-  let(:json_content_1) { load_fixture('foo-bar.json') }
+  let(:json_content_1) { load_fixture("foo-bar.json") }
   let(:json_content_2) do
-    pact_hash = load_json_fixture('foo-bar.json')
-    pact_hash['interactions'] = pact_hash['interactions'].reverse
+    pact_hash = load_json_fixture("foo-bar.json")
+    pact_hash["interactions"] = pact_hash["interactions"].reverse
     pact_hash.to_json
   end
   let(:base_equality_only_on_content_that_affects_verification_results) { true }

data/spec/features/can_i_deploy_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe "can i deploy" do
 
   let(:response_body) { JSON.parse(subject.body, symbolize_names: true) }
 
-  subject { get("/can-i-deploy", query, { 'HTTP_ACCEPT' => 'application/hal+json'}) }
+  subject { get("/can-i-deploy", query, { "HTTP_ACCEPT" => "application/hal+json"}) }
 
   it "returns the matrix response" do
     expect(subject).to be_a_hal_json_success_response