pact_broker 2.68.0 → 2.68.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09772ac584dd72c870b97fcaf82485425a5c506f7ab0b8a30bc0ce23eb071484'
-  data.tar.gz: 34ae1ca468c7ebbecfb49570b9374be0db7792da67476ae46d73667c9323615c
+  metadata.gz: d1076b8629f5570c2304ec89fc169be77c2b6f54aaf832ceec91d5a939806f97
+  data.tar.gz: 28c09fcdf4d7abc16f367b8c6aaebfd3f3baaa68850ae5809aefb33d92bae8fa
 SHA512:
-  metadata.gz: d9d3de22aee4d8d8f106c26fa2eec1148c5f5535d9b2fc34f33c26cb9ef67fa193eddf833865a041479fd4a67bb8be59fb06bb17f79117416575612c37301299
-  data.tar.gz: 73f0a9e7b14e74a9d685ff1039cf1650bf76f9b47ee863acf71a90dd81449684183c35797889c6682e95239c4f9f9bfd57de4050aef60d6a6521fd0a8a274189
+  metadata.gz: 6fd730f1c2500942f680f66c4f526b138e71fd6f27a194b85fc280f9f1d959d6ecf79e88cb4aa685d451373cc9c3ac80714751a7d3658ec75c00f874925a8a39
+  data.tar.gz: 4327534a89cbaae5d76a86bb36aeb220668fd41805837923188e4ae1bfe2e3968d416b4c26338c6b80cc911552bb3f41db2ac0feef4a0bf70470820d1f780136

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="v2.68.1"></a>
+### v2.68.1 (2020-10-24)
+
+#### Bug Fixes
+
+* set default User-Agent header in webhook requests	 ([caa71f9b](/../../commit/caa71f9b))
+
 <a name="v2.68.0"></a>
 ### v2.68.0 (2020-10-23)
 

data/docker-compose-issue-repro.yml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+  pact-broker:
+    build:
+      context: .
+      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    ports:
+      - "9292:9292"
+    command: bundle exec rackup -p 9292 -o 0.0.0.0
+
+  repro-issue:
+    build:
+      context: .
+      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    depends_on:
+      - pact-broker
+    command: dockerize -wait http://pact-broker:9292 -timeout 30s /home/script/reproduce-issue.rb

data/issue-reproduction/Dockerfile-pact-broker

@@ -0,0 +1,42 @@
+FROM ruby:2.5.3-alpine
+
+RUN apk update \
+    && apk --no-cache add \
+      "build-base>=0.5" \
+      "bash>=4.4" \
+      "ca-certificates>=20190108" \
+      "git>=2.20" \
+      "postgresql-dev>=11.3" \
+      "sqlite-dev>=3.28" \
+      "sqlite>=3.28" \
+      "tzdata>=2019" \
+      "mariadb-dev>=10.3" \
+    && rm -rf /var/cache/apk/*
+
+RUN apk add --no-cache openssl less
+
+ENV DOCKERIZE_VERSION v0.6.1
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+
+WORKDIR /home
+
+COPY Gemfile /home/Gemfile
+COPY pact_broker.gemspec /home/pact_broker.gemspec
+COPY lib/pact_broker/version.rb /home/lib/pact_broker/version.rb
+COPY .gitignore /home/.gitignore
+
+RUN gem install bundler -v '~>2.0.0' \
+    && bundle install --jobs 3 --retry 3
+
+COPY lib /home/lib
+COPY db /home/db
+COPY public /home/public
+COPY tasks /home/tasks
+COPY config.ru /home/config.ru
+COPY Rakefile /home/Rakefile
+COPY script  /home/script
+
+RUN ls /home

data/lib/pact_broker/configuration.rb

@@ -1,3 +1,4 @@
+require 'pact_broker/version'
 require 'pact_broker/error'
 require 'pact_broker/config/space_delimited_string_list'
 require 'semantic_logger'
@@ -46,6 +47,7 @@ module PactBroker
     attr_accessor :warning_error_class_names
     attr_accessor :check_for_potential_duplicate_pacticipant_names
     attr_accessor :webhook_retry_schedule
+    attr_accessor :user_agent
     attr_reader :webhook_http_method_whitelist, :webhook_scheme_whitelist, :webhook_host_whitelist
     attr_accessor :semver_formats
     attr_accessor :enable_public_badge_access, :shields_io_base_url, :badge_provider_mode
@@ -93,6 +95,7 @@ module PactBroker
         require 'pact_broker/db/seed_example_data'
         PactBroker::DB::SeedExampleData.call
       end
+      config.user_agent = "Pact Broker v#{PactBroker::VERSION}"
       config.base_equality_only_on_content_that_affects_verification_results = true
       config.order_versions_by_date = true
       config.semver_formats = ["%M.%m.%p%s%d", "%M.%m", "%M"]

data/lib/pact_broker/domain/webhook_request.rb

@@ -9,6 +9,7 @@ require 'cgi'
 require 'delegate'
 require 'rack/utils'
 require 'pact_broker/webhooks/webhook_request_logger'
+require 'pact_broker/configuration'
 
 module PactBroker
   module Domain
@@ -61,7 +62,7 @@ module PactBroker
         @http_request ||= begin
           req = Net::HTTP.const_get(method.capitalize).new(uri.request_uri)
           req.delete("accept-encoding")
-          req.delete("user-agent")
+          req["user-agent"] = PactBroker.configuration.user_agent
           headers.each_pair { | name, value | req[name] = value }
           req.basic_auth(username, password) if username && username.size > 0
           req.body = body unless body.nil?

data/lib/pact_broker/test/http_test_data_builder.rb

@@ -0,0 +1,121 @@
+require 'faraday'
+require 'faraday_middleware'
+require 'logger'
+require 'erb'
+require 'yaml'
+
+module PactBroker
+  module Test
+    class HttpTestDataBuilder
+
+      attr_reader :client, :last_consumer_name, :last_provider_name, :last_consumer_version_number, :last_provider_version_number
+
+      def initialize(pact_broker_base_url, auth)
+        @client = Faraday.new(url: pact_broker_base_url) do |faraday|
+          faraday.request :json
+          faraday.response :json, :content_type => /\bjson$/
+          faraday.response :logger, ::Logger.new($stdout), headers: false do | logger |
+            logger.filter(/(Authorization: ).*/,'\1[REMOVED]')
+          end
+          # faraday.headers['Authorization'] = "Bearer #{pactflow_api_token}"
+          faraday.adapter  Faraday.default_adapter
+        end
+      end
+
+      def sleep
+        Kernel.sleep 1
+        self
+      end
+
+      def create_tagged_pacticipant_version(pacticipant:, version:, tag:)
+        [*tag].each do | tag |
+          create_tag(pacticipant: pacticipant, version: version, tag: tag)
+        end
+        self
+      end
+
+      def create_tag(pacticipant:, version:, tag:)
+        puts "Creating tag '#{tag}' for #{pacticipant} version #{version}"
+        client.put("/pacticipants/#{encode(pacticipant)}/versions/#{encode(version)}/tags/#{encode(tag)}", {})
+        self
+      end
+
+      def publish_pact(consumer: last_consumer_name, consumer_version:, provider: last_provider_name, content_id:, tag:)
+        @last_consumer_name = consumer
+        @last_provider_name = provider
+        @last_consumer_version_number = consumer_version
+
+        [*tag].each do | tag |
+          create_tag(pacticipant: consumer, version: consumer_version, tag: tag)
+        end
+
+
+        content = generate_content(consumer, provider, content_id)
+        puts "Publishing pact for consumer #{consumer} version #{consumer_version} and provider #{provider}"
+        pact_path = "/pacts/provider/#{encode(provider)}/consumer/#{encode(consumer)}/version/#{encode(consumer_version)}"
+        @publish_pact_response = client.put(pact_path, content)
+        self
+      end
+
+      def get_pacts_for_verification(provider: last_provider_name, provider_version_tag: , consumer_version_selectors:, enable_pending: false, include_wip_pacts_since: nil)
+        puts "Fetching pacts for verification for #{provider}"
+        body = {
+          providerVersionTags: [*provider_version_tag],
+          consumerVersionSelectors: consumer_version_selectors,
+          includePendingStatus: enable_pending,
+          includeWipPactsSince: include_wip_pacts_since
+        }
+        @pacts_for_verification_response = client.post("/pacts/provider/#{encode(provider)}/for-verification", body)
+        self
+      end
+
+      def print_pacts_for_verification
+        puts "Pacts for verification:"
+        @pacts_for_verification_response.body["_embedded"]["pacts"].each do | pact |
+          puts({
+            "url" => pact["_links"]["self"]["href"],
+            "wip" => pact["verificationProperties"]["wip"],
+            "pending" => pact["verificationProperties"]["pending"]
+          }.to_yaml)
+        end
+        self
+      end
+
+      def print_pacts_for_verification_response
+        puts @pacts_for_verification_response.body
+        self
+      end
+
+      def delete_integration(consumer:, provider:)
+        client.delete("/integrations/provider/#{encode(provider)}/consumer/#{encode(consumer)}")
+        self
+      end
+
+      def generate_content(consumer_name, provider_name, content_id)
+        {
+          consumer: {
+            name: consumer_name
+          },
+          provider: {
+            name: provider_name
+          },
+          interactions: [
+            {
+              request: {
+                method: "GET",
+                path: "/things/#{content_id}"
+              },
+              response: {
+                status: 200
+              }
+            }
+          ]
+        }
+      end
+
+      def encode string
+        ERB::Util.url_encode(string)
+      end
+    end
+  end
+end

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.68.0'
+  VERSION = '2.68.1'
 end

data/script/reproduce-issue.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << "#{Dir.pwd}/lib"
+
+require 'pact_broker/test/http_test_data_builder'
+
+td = PactBroker::Test::HttpTestDataBuilder.new('http://pact-broker:9292', { })
+td.delete_integration(consumer: "Foo", provider: "Bar")
+  .create_tagged_pacticipant_version(pacticipant: "Bar", version: "1", tag: "master")
+  .sleep
+  .publish_pact(consumer: "Foo", consumer_version: "1", provider: "Bar", content_id: "111", tag: "master")
+  .sleep
+  .publish_pact(consumer_version: "2", content_id: "222", tag: "feat-x")
+  .sleep
+  .get_pacts_for_verification(
+    enable_pending: true,
+    provider_version_tag: "master",
+    include_wip_pacts_since: "2020-01-01",
+    consumer_version_selectors: [{ tag: "master", latest: true }])
+  .print_pacts_for_verification

data/spec/lib/pact_broker/domain/webhook_request_spec.rb

@@ -77,7 +77,7 @@ module PactBroker
       describe "execute" do
         let!(:http_request) do
           stub_request(:post, "http://example.org/hook").
-            with(:headers => {'Content-Type'=>'text/plain'}, :body => request_body).
+            with(:headers => {'Content-Type'=>'text/plain', 'User-Agent' => /Pact Broker/}, :body => request_body).
             to_return(:status => status, :body => "respbod", :headers => {'Content-Type' => 'text/foo, blah'})
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.68.0
+  version: 2.68.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -555,6 +555,7 @@ files:
 - db/test/change_migration_strategy/Rakefile
 - db/test/change_migration_strategy/before/Gemfile
 - docker-compose-dev-postgres.yml
+- docker-compose-issue-repro.yml
 - docker-compose-test.yml
 - docs/images/Pactflow logo - black small.png
 - example/Gemfile
@@ -565,6 +566,7 @@ files:
 - example/basic_auth/config.ru
 - example/config.ru
 - example/example_data.sql
+- issue-reproduction/Dockerfile-pact-broker
 - lib/db.rb
 - lib/pact/doc/README.md
 - lib/pact/doc/doc_file.rb
@@ -873,6 +875,7 @@ files:
 - lib/pact_broker/tasks/delete_overwritten_data_task.rb
 - lib/pact_broker/tasks/migration_task.rb
 - lib/pact_broker/tasks/version_task.rb
+- lib/pact_broker/test/http_test_data_builder.rb
 - lib/pact_broker/test/test_data_builder.rb
 - lib/pact_broker/ui.rb
 - lib/pact_broker/ui/app.rb
@@ -1039,6 +1042,7 @@ files:
 - script/recreate-test-database.sh
 - script/release-via-github-action.sh
 - script/release.sh
+- script/reproduce-issue.rb
 - script/restart.sh
 - script/run-with-ssl.rb
 - script/seed-example-matrix.rb