Merge branch 'master' into dependabot/bundler/pact_broker/sanitize-6.0.2

pact-foundation · Sep 11, 2023 · 3569012 · 3569012
2 parents 8637f64 + 1550288
commit 3569012
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 36 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DOCKER_TARGET_PLATFORM: [linux/arm, linux/arm64, linux/amd64]
+        DOCKER_TARGET_PLATFORM: [linux/arm64, linux/amd64]
     runs-on: ubuntu-latest
     env:
       DOCKER_TARGET_PLATFORM: ${{ matrix.DOCKER_TARGET_PLATFORM }}
@@ -23,4 +23,4 @@ jobs:
         if: ${{ matrix.DOCKER_TARGET_PLATFORM }} == 'linux/arm' || 'linux/arm64'
         run: ./script/release-workflow/docker-prepare.sh
       - name: Audit Docker image for ${{ matrix.DOCKER_TARGET_PLATFORM }}
-        run: ./script/release-workflow/audit.sh
+        run: ./script/release-workflow/audit.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,9 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   test:

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -0,0 +1,15 @@
+name: Triage Issue
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  call-workflow:
+    uses: pact-foundation/.github/.github/workflows/triage.yml@master
+    secrets: inherit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+<a name="2.112.0-pactbroker2.107.1"></a>
+### 2.112.0-pactbroker2.107.1 (2023-08-21)
+
+#### Bug Fixes
+
+* pact_broker/Gemfile & pact_broker/Gemfile.lock to reduce vulnerabilities	 ([76db139](/../../commit/76db139))
+
+<a name="2.111.0-pactbroker2.107.1"></a>
+### 2.111.0-pactbroker2.107.1 (2023-08-08)
+
+#### Features
+
+* **deps**
+  * update to anyway_config (2.5.1), dry-configurable (1.1.0), dry-core (1.0.1), dry-schema (1.13.2), i18n (1.14.1), mini_portile2 (2.8.4), nokogiri (1.15.3), mini_portile2 (~> 2.8.2), racc (1.7.1), rack (2.2.8), sanitize (6.0.2), semantic_logger (4.14.0), sequel (5.71.0), sqlite3 (1.6.3), stringio (3.0.7), temple (0.10.2), thor (1.2.2), tilt (2.2.0), zeitwerk (2.6.11)	 ([f8db2a2](/../../commit/f8db2a2))
+
+#### Bug Fixes
+
+* **deps**
+  * bump puma from 5.6.5 to 5.6.6	 ([de0b934](/../../commit/de0b934))
+
 <a name="2.110.0-pactbroker2.107.1"></a>
 ### 2.110.0-pactbroker2.107.1 (2023-05-24)
 

diff --git a/README.md b/README.md
@@ -6,10 +6,6 @@ This repository contains a Dockerized version of the [Pact Broker][pact-broker].
 
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/pact-foundation/pact-msw-adapter/graphs/commit-activity)
 
-[![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg)
-[![macOS](https://svgshare.com/i/ZjP.svg)](https://svgshare.com/i/ZjP.svg)
-[![Windows](https://svgshare.com/i/ZhY.svg)](https://svgshare.com/i/ZhY.svg)
-
 [![Build and test](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/test.yml/badge.svg)](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/test.yml)
 [![Audit](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/audit.yml/badge.svg)](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/audit.yml)
 [![Release](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/release_image.yml/badge.svg)](https://github.com/pact-foundation/pact-broker-docker/actions/workflows/release_image.yml)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.110.0
+2.112.0
diff --git a/docker-compose-clean-cron.yml b/docker-compose-clean-cron.yml
@@ -14,7 +14,7 @@ services:
       - ${PWD}/docker/pg-dump.sql:/tmp/pg-dump.sql
 
   pact-broker:
-    image: pactfoundation/pact-broker:2.110.0-pactbroker2.107.1
+    image: "pactfoundation/pact-broker:2.110.0-pactbroker2.107.1"
     ports:
       - "9393:9393"
     depends_on:

diff --git a/docker-compose-clean.yml b/docker-compose-clean.yml
@@ -14,7 +14,7 @@ services:
       - ${PWD}/docker/pg-dump.sql:/tmp/pg-dump.sql
 
   pact-broker:
-    image: pactfoundation/pact-broker:2.110.0-pactbroker2.107.1
+    image: "pactfoundation/pact-broker:2.110.0-pactbroker2.107.1"
     ports:
       - "9393:9393"
     depends_on:

diff --git a/docker-compose-heroku.yml b/docker-compose-heroku.yml
@@ -17,7 +17,7 @@ services:
       POSTGRES_DB: postgres
 
   pact-broker:
-    image: pactfoundation/pact-broker:2.110.0-pactbroker2.107.1
+    image: "pactfoundation/pact-broker:2.110.0-pactbroker2.107.1"
     ports:
       - "9393:9393"
     depends_on:

diff --git a/docker-compose-test-different-env-var-names.yml b/docker-compose-test-different-env-var-names.yml
@@ -11,7 +11,7 @@ services:
       POSTGRES_DB: postgres
 
   pact-broker:
-    image: pactfoundation/pact-broker:latest
+    image: "pactfoundation/pact-broker:latest"
     depends_on:
       - postgres
     environment:

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -11,7 +11,7 @@ services:
       POSTGRES_DB: postgres
 
   pact-broker:
-    image: pactfoundation/pact-broker:latest
+    image: "pactfoundation/pact-broker:latest"
     depends_on:
       - postgres
     environment:

diff --git a/docker-compose-with-conf-file.yml b/docker-compose-with-conf-file.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   pact-broker:
-    # image: pactfoundation/pact-broker:2.110.0-pactbroker2.107.1
+    # image: pactfoundation/pact-broker:2.112.0-pactbroker2.107.1
     build: .
     ports:
       - "9292:9292"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_DB: postgres
 
   pact-broker:
-    image: pactfoundation/pact-broker:2.110.0-pactbroker2.107.1
+    image: "pactfoundation/pact-broker:2.110.0-pactbroker2.107.1"
     ports:
       - "9292:9292"
     depends_on:

diff --git a/pact_broker/Gemfile b/pact_broker/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem "pact_broker"
-gem "pg", "~>1.4"
-gem "puma", "~> 5.6"
+gem "pg", "~>1.5"
+gem "puma", "~> 5.6", ">= 5.6.7"
 gem "mysql2", "~>0.3"
 gem "sqlite3", "~>1.6"
 gem "rake", "~> 13.0"

diff --git a/pact_broker/Gemfile.lock b/pact_broker/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    anyway_config (2.4.0)
+    anyway_config (2.5.1)
       ruby-next-core (>= 0.14.0)
     as-notifications (1.0.2)
     awesome_print (1.9.2)
@@ -20,10 +20,10 @@ GEM
     disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
       representable (>= 3.1.1, < 4)
-    dry-configurable (1.0.1)
+    dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.0.0)
@@ -32,7 +32,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.1)
+    dry-schema (1.13.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
@@ -57,10 +57,10 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    mini_portile2 (2.8.2)
+    mini_portile2 (2.8.4)
     moments (0.2.0)
     multi_json (1.15.0)
     mustermann (2.0.2)
@@ -106,13 +106,13 @@ GEM
       thor (~> 1.0)
     padrino-support (0.15.3)
     parslet (2.0.0)
-    pg (1.5.3)
+    pg (1.5.4)
     psych (4.0.6)
       stringio
-    puma (5.6.6)
+    puma (5.6.7)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-protection (2.2.4)
       rack
     rainbow (3.1.1)
@@ -135,22 +135,22 @@ GEM
     sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    semantic_logger (4.13.0)
+    semantic_logger (4.14.0)
       concurrent-ruby (~> 1.0)
     semver2 (3.4.2)
-    sequel (5.68.0)
+    sequel (5.71.0)
     sinatra (2.2.4)
       mustermann (~> 2.0)
       rack (~> 2.2)
       rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    sqlite3 (1.6.2)
+    sqlite3 (1.6.5)
       mini_portile2 (~> 2.8.0)
-    stringio (3.0.6)
+    stringio (3.0.7)
     table_print (1.5.7)
-    temple (0.10.0)
-    thor (1.2.1)
-    tilt (2.1.0)
+    temple (0.10.2)
+    thor (1.2.2)
+    tilt (2.2.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
     webmachine (2.0.0)
@@ -159,16 +159,16 @@ GEM
       multi_json
     webrick (1.8.1)
     wisper (2.0.1)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mysql2 (~> 0.3)
   pact_broker
-  pg (~> 1.4)
-  puma (~> 5.6)
+  pg (~> 1.5)
+  puma (~> 5.6, >= 5.6.7)
   rake (~> 13.0)
   sqlite3 (~> 1.6)
   sucker_punch!

diff --git a/pact_broker/clean.sh b/pact_broker/clean.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
+set -e
+
 bundle exec rake pact_broker:db:clean
 bundle exec rake pact_broker:db:delete_overwritten_data
diff --git a/script/scan.sh b/script/scan.sh
@@ -3,6 +3,7 @@
 set -eu
 
 : "${1?Please provide the image to scan}"
+ARCH=${ARCH:-'amd64'}
 
 SCRIPT_DIR=$(cd "$(dirname $0)" && pwd)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     set -eu
     : "${1?Please provide the image to scan}"
+    ARCH=${ARCH:-'amd64'}
     SCRIPT_DIR=$(cd "$(dirname $0)" && pwd)
@@ Expand Down @@