pact_broker 2.68.1 → 2.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1076b8629f5570c2304ec89fc169be77c2b6f54aaf832ceec91d5a939806f97
-  data.tar.gz: 28c09fcdf4d7abc16f367b8c6aaebfd3f3baaa68850ae5809aefb33d92bae8fa
+  metadata.gz: 1bc95def65b82d8d938fa3b245bb6f306092d8d00572778f8b3f8ae377479fd0
+  data.tar.gz: 2790ca52a1db8ba01ca02ef24b6816482a4fdf38a925e8eb737d998ff2ff1213
 SHA512:
-  metadata.gz: 6fd730f1c2500942f680f66c4f526b138e71fd6f27a194b85fc280f9f1d959d6ecf79e88cb4aa685d451373cc9c3ac80714751a7d3658ec75c00f874925a8a39
-  data.tar.gz: 4327534a89cbaae5d76a86bb36aeb220668fd41805837923188e4ae1bfe2e3968d416b4c26338c6b80cc911552bb3f41db2ac0feef4a0bf70470820d1f780136
+  metadata.gz: 9d2740784d48edea10528d9b3a1db0ec6f89d5474c2b7b3c4c4077a7b1d57c714f7f902066e7e76cf921ab5b51e8cc58b6d3146a2a752c3535394c87e7457831
+  data.tar.gz: 5fb6688a830ecd05bf7eb8985d651f0a406a5bfe348e29287b93328bb2cf9f36013fda31394e3499ee058c10e54c326366f59567dc3d5eadf02507d9512787f6

data/.github/workflows/release_gem.yml

@@ -19,11 +19,17 @@ jobs:
     #     checkInterval: 15
     #   env:
     #     GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    - uses: pact-foundation/release-gem@v0.0.11
+    - id: release-gem
+      uses: pact-foundation/release-gem@v0.0.11
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         INCREMENT: '${{ github.event.client_payload.increment }}'
+    outputs:
+      gem_name: "${{ steps.release-gem.outputs.gem_name }}"
+      version: "${{ steps.release-gem.outputs.version }}"
+      increment: "${{ steps.release-gem.outputs.increment }}"
+
   notify-gem-released:
     needs: release
     strategy:

data/.github/workflows/test.yml

@@ -0,0 +1,54 @@
+name: Test
+
+on: push
+
+jobs:
+  sqlite:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        ruby_version: ["2.7"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+      - run: "bundle install"
+      - run: "bundle exec rake"
+  postgres:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        ruby_version: ["2.5", "2.7"]
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+      - run: "gem install bundler && bundle install"
+        env:
+          INSTALL_PG: "true"
+      - run: "bundle exec rake"
+        env:
+          DATABASE_ADAPTER: github_actions_postgres
+          INSTALL_PG: "true"
+  mysql:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        ruby_version: ["2.7"]
+    steps:
+      - uses: actions/checkout@v2
+      - run: script/test/run-rake-on-docker-compose-mysql.sh

data/CHANGELOG.md

@@ -1,3 +1,73 @@
+<a name="v2.73.0"></a>
+### v2.73.0 (2020-12-16)
+
+#### Features
+
+* **wip**
+  * permenently enable feature that keeps pacts as WIP when verified via the URL from a webhook triggered by pact publication	 ([70071373](/../../commit/70071373))
+
+* allow error causes to be configured to log at warning level	 ([3a7bf5ea](/../../commit/3a7bf5ea))
+* add self relations for tags in matrix resource	 ([727cee99](/../../commit/727cee99))
+* add self relation to tags in extended pact and verification resources	 ([a560ce6d](/../../commit/a560ce6d))
+
+* **metrics**
+  * timeout matrix count	 ([43091b57](/../../commit/43091b57))
+
+#### Bug Fixes
+
+* url encode tag name in tag URL	 ([80df832d](/../../commit/80df832d))
+
+<a name="v2.72.0"></a>
+### v2.72.0 (2020-12-02)
+
+#### Features
+
+* allow overwritten data deletion to be configured with extra options	 ([fd809737](/../../commit/fd809737))
+* use the consumer version number in the metadata to select the correct consumer version for a pact version resource	 ([422c87fc](/../../commit/422c87fc))
+* return link to latest pact if more pacts exist when deleting pacts by tag	 ([b87ea704](/../../commit/b87ea704))
+* update output for clean dry run	 ([681a5ddd](/../../commit/681a5ddd))
+* update metrics output	 ([0617e9df](/../../commit/0617e9df))
+
+<a name="v2.71.0"></a>
+### v2.71.0 (2020-11-28)
+
+#### Features
+
+* allow clean to be performed in dry run mode	 ([a7a18fde](/../../commit/a7a18fde))
+
+<a name="v2.70.0"></a>
+### v2.70.0 (2020-11-28)
+
+#### Features
+
+* allow limit to be applied to clean task	 ([d29e5c62](/../../commit/d29e5c62))
+* optimise the query to load the tags with latest flags	 ([bc47613f](/../../commit/bc47613f))
+* optimise query to find head tags for a pact	 ([67309e37](/../../commit/67309e37))
+
+* **wip pacts**
+  * experimental feature - if no provider versions exist, consider all head pacts wip	 ([a635cc53](/../../commit/a635cc53))
+
+#### Bug Fixes
+
+* return empty body when group csv is requested for a pacticipant that does not have any integrations	 ([fb4e28ce](/../../commit/fb4e28ce))
+
+<a name="v2.69.0"></a>
+### v2.69.0 (2020-11-24)
+
+#### Features
+
+* **wip**
+  * keep pacts as WIP when verified via the pactUrl passed though the webhook template parameters - experimental.	 ([a9b3fef0](/../../commit/a9b3fef0))
+
+* add link to the pact content version	 ([8eefba5f](/../../commit/8eefba5f))
+* display V3 provider states in HTML (#357)	 ([8e06a7f2](/../../commit/8e06a7f2))
+* optimise query for determining latest verification for consumer and provider	 ([7889b051](/../../commit/7889b051))
+
+#### Bug Fixes
+
+* return a 404 when the base pact for a pact diff doesn't exist	 ([74d3644d](/../../commit/74d3644d))
+* Add consumer name to inclusion reason log (#358)	 ([82901891](/../../commit/82901891))
+
 <a name="v2.68.1"></a>
 ### v2.68.1 (2020-10-24)
 

data/DEVELOPER_SETUP.md

@@ -28,6 +28,12 @@ This allows you to open a shell to a development environment where you can run t
 
 Remember to rebuild the image if you change any of the gems or gem versions.
 
+* Run the server on the docker image
+
+    ```sh
+    docker run --rm -v $(PWD):/home -w /home --entrypoint /bin/sh -p 9292:9292 -it pact_broker:dev /usr/local/bin/start
+    ```
+
 ### With native install
 
 * You will need to install Ruby 2.5, and preferably a ruby version manager. I recommend using [chruby][chruby] and [ruby-install][ruby-install].

data/Dockerfile

@@ -26,6 +26,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 
 
 COPY Gemfile /home/Gemfile
+# COPY Gemfile.lock /home/Gemfile.lock # lock file does not exist on CI
 COPY pact_broker.gemspec /home/pact_broker.gemspec
 COPY lib/pact_broker/version.rb /home/lib/pact_broker/version.rb
 COPY .gitignore /home/.gitignore
@@ -33,9 +34,13 @@ COPY .gitignore /home/.gitignore
 RUN gem install bundler -v '~>2.0.0' \
     && bundle install --jobs 3 --retry 3
 
-RUN echo '#!/bin/sh' >> /home/start.sh
-RUN echo 'bundle exec rackup -o 0.0.0.0 -p 9292' >> /home/start.sh
-RUN chmod +x /home/start.sh
+RUN echo '#!/bin/sh' >> /usr/local/bin/start
+RUN echo 'bundle exec rackup -o 0.0.0.0 -p 9292' >> /usr/local/bin/start
+RUN chmod +x /usr/local/bin/start
+
+RUN echo '#!/bin/sh' >> /usr/local/bin/test
+RUN echo 'bundle exec rake' >> /usr/local/bin/test
+RUN chmod +x /usr/local/bin/test
 
 RUN echo '#!/bin/sh' >> /home/init-db.sh
 RUN echo 'bundle exec rake db:prepare:test' >> /home/init-db.sh

data/Gemfile

@@ -18,12 +18,13 @@ group :test do
   gem 'rspec-pact-matchers', '~>0.1'
   gem 'bundler-audit', '~>0.4'
   gem 'fakefs', '~>0.4'
-  gem 'webmock', '~>2.3'
+  gem 'webmock', '~>3.9'
   gem 'rspec', '~>3.0'
   gem 'rspec-its', '~>1.2'
   gem 'database_cleaner', '~>1.8', '>= 1.8.1'
   gem 'timecop', '~> 0.9'
   gem 'faraday', '~>0.15'
+  gem 'faraday_middleware', '~> 0.14'
   gem 'docker-api', '~>1.34'
   gem 'approvals', '>=0.0.1', '<1.0.0'
 end
@@ -35,3 +36,7 @@ end
 if ENV['INSTALL_PG'] == 'true'
   gem 'pg', '~>1.2'
 end
+
+if ENV['X_PACT_DEVELOPMENT'] == 'true'
+  gem 'pact-support', path: '../pact-support'
+end

data/ISSUES.md

@@ -0,0 +1,23 @@
+# Issues
+
+## Reproducing an issue
+
+In [script/reproduce-issue.rb](script/reproduce-issue.rb) you will find a fluent API that allows you to simulate client libraries interacting with the Pact Broker.
+
+You can use it to easily reproduce issues.
+
+To use it:
+
+* Run the Pact Broker using the latest development code:
+
+    ```
+    docker-compose -f docker-compose-issue-repro.yml up --build pact-broker
+    ```
+
+* Run the reproduction script.
+
+    ```
+    docker-compose -f docker-compose-issue-repro.yml up repro-issue
+    ```
+
+You can modify `script/reproduce-issue.rb` and then re-run it with the change applied.

data/config/database.yml

@@ -36,6 +36,20 @@ test:
     <<: *default
     adapter: mysql2
     host: "192.168.0.9"
+  github_actions_postgres:
+    adapter: postgres
+    database: postgres
+    username: postgres
+    password: postgres
+    host: localhost
+    port: "5432"
+  github_actions_mysql:
+    adapter: mysql2
+    database: pact_broker
+    username: pact_broker
+    password: pact_broker
+    host: localhost
+    port: 3306
 
 development:
   default:

data/db/ddl_statements/latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,25 @@
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1 = "select
+        pv.pacticipant_id as provider_id,
+        lpp.consumer_id,
+        max(v.id) as latest_verification_id
+      from verifications v
+      join latest_pact_publications_by_consumer_versions lpp
+        on v.pact_version_id = lpp.pact_version_id
+      join versions pv
+        on v.provider_version_id = pv.id
+      group by pv.pacticipant_id, lpp.consumer_id"
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2 = "select
+        provider_id,
+        consumer_id,
+        max(id) as latest_verification_id
+        from verifications v
+        group by provider_id, consumer_id"
+
+
+LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3 = "select
+        provider_id,
+        consumer_id,
+        max(verification_id) as latest_verification_id
+        from latest_verification_id_for_pact_version_and_provider_version v
+        group by provider_id, consumer_id"

data/db/migrations/20180524_create_latest_verifications_for_consumer_and_provider.rb

@@ -1,17 +1,10 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
 
     # The most recent verification for each consumer/consumer version tag/provider
     latest_verifications = from(:verifications)

data/db/migrations/20180614_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -1,27 +1,15 @@
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
 Sequel.migration do
   up do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        provider_id,
-        consumer_id,
-        max(id) as latest_verification_id
-        from verifications v
-        group by provider_id, consumer_id")
+          LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
   end
 
   down do
-    # The latest verification id for each consumer version tag
+    # The latest verification id for each consumer/provider
     create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
-      "select
-        pv.pacticipant_id as provider_id,
-        lpp.consumer_id,
-        max(v.id) as latest_verification_id
-      from verifications v
-      join latest_pact_publications_by_consumer_versions lpp
-        on v.pact_version_id = lpp.pact_version_id
-      join versions pv
-        on v.provider_version_id = pv.id
-      group by pv.pacticipant_id, lpp.consumer_id")
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V1)
   end
 end

data/db/migrations/20201026_update_latest_verification_ids_for_consumer_and_provider.rb

@@ -0,0 +1,14 @@
+require_relative 'migration_helper'
+require_relative '../ddl_statements/latest_verification_ids_for_consumer_and_provider'
+
+Sequel.migration do
+  up do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V3)
+  end
+
+  down do
+    create_or_replace_view(:latest_verification_ids_for_consumer_and_provider,
+      LATEST_VERIFICATION_IDS_FOR_CONSUMER_AND_PROVIDER_V2)
+  end
+end

data/docker-compose-ci-mysql.yml

@@ -0,0 +1,37 @@
+version: "3"
+
+services:
+  mysql:
+    image: mysql:5.7.28
+    command: --default-authentication-plugin=mysql_native_password
+    environment:
+      MYSQL_ROOT_PASSWORD: pact_broker
+      MYSQL_DATABASE: pact_broker
+      MYSQL_USER: pact_broker
+      MYSQL_PASSWORD: pact_broker
+    ports:
+      - "3306:3306"
+
+  tests:
+    build: .
+    depends_on:
+      - mysql
+    environment:
+      DATABASE_ADAPTER: docker_compose_mysql
+      PACT_BROKER_HIDE_PACTFLOW_MESSAGES: 'true'
+      INSTALL_MYSQL: 'true'
+    volumes:
+      - ./lib:/home/lib
+      - ./spec:/home/spec
+      - ./db:/home/db
+      - ./config.ru:/home/config.ru
+      - ./tasks:/home/tasks
+      - ./Rakefile:/home/Rakefile
+      - ./config:/home/config
+      - ./.rspec:/home/.rspec
+      - ./.rubocop:/home/.rubocop
+      - ./.gitignore:/home/.gitignore
+      - ./public:/home/public
+      - ./script/docker-container/test.sh:/usr/local/bin/test
+    entrypoint: dockerize
+    command: --wait tcp://mysql:3306 -timeout 60s test

data/docker-compose-issue-repro.yml

@@ -2,17 +2,21 @@ version: "3"
 
 services:
   pact-broker:
-    build:
-      context: .
-      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    build: .
     ports:
       - "9292:9292"
-    command: bundle exec rackup -p 9292 -o 0.0.0.0
+    entrypoint: /usr/local/bin/start
+    environment:
+      - RACK_ENV=production
+    volumes:
+      - $PWD:/home
 
   repro-issue:
-    build:
-      context: .
-      dockerfile: issue-reproduction/Dockerfile-pact-broker
+    build: .
     depends_on:
       - pact-broker
     command: dockerize -wait http://pact-broker:9292 -timeout 30s /home/script/reproduce-issue.rb
+    environment:
+      - PACT_BROKER_BASE_URL=http://pact-broker:9292
+    volumes:
+      - $PWD:/home

data/lib/db.rb

@@ -33,6 +33,7 @@ module DB
     con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => 'utf8'))
     con.extension(:connection_validator)
     con.extension(:pagination)
+    con.extension(:statement_timeout)
     con.extend_datasets do
       def any?
         !empty?