add matrix to maintain coverage for both path styles

nginxinc · Apr 24, 2024 · 1d10989 · 1d10989
1 parent ce773b6
commit 1d10989
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,6 +54,9 @@ jobs:
   test-oss:
     runs-on: ubuntu-22.04
     needs: build-oss-for-test
+    strategy:
+      matrix:
+        path_style: [virtual, virtual-v2]
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -82,7 +85,7 @@ jobs:
         run: |
           docker load --input ${{ runner.temp }}/oss.tar
       - name: Run tests - stable njs version
-        run: ./test.sh --type oss
+        run: S3_STYLE=${{ matrix.path_style }} ./test.sh --type oss
 
   build-latest-njs-for-test:
     runs-on: ubuntu-22.04

diff --git a/test.sh b/test.sh
@@ -350,7 +350,7 @@ runUnitTestWithOutSessionToken() {
         -v "$(pwd)/test/unit:/var/tmp"        \
         --workdir /var/tmp                    \
         -e "DEBUG=true"                       \
-        -e "S3_STYLE=virtual"                 \
+        -e "S3_STYLE=virtual-v2"                 \
         -e "S3_SERVICE=s3"                    \
         -e "AWS_ACCESS_KEY_ID=unit_test"      \
         -e "AWS_SECRET_ACCESS_KEY=unit_test"  \
@@ -370,7 +370,7 @@ runUnitTestWithOutSessionToken() {
         -v "$(pwd)/test/unit:/var/tmp"        \
         --workdir /var/tmp                    \
         -e "DEBUG=true"                       \
-        -e "S3_STYLE=virtual"                 \
+        -e "S3_STYLE=virtual-v2"                 \
         -e "S3_SERVICE=s3"                    \
         -e "AWS_ACCESS_KEY_ID=unit_test"      \
         -e "AWS_SECRET_ACCESS_KEY=unit_test"  \
@@ -397,7 +397,7 @@ runUnitTestWithSessionToken() {
         -v "$(pwd)/test/unit:/var/tmp"        \
         --workdir /var/tmp                    \
         -e "DEBUG=true"                       \
-        -e "S3_STYLE=virtual"                 \
+        -e "S3_STYLE=virtual-v2"                 \
         -e "S3_SERVICE=s3"                    \
         -e "AWS_ACCESS_KEY_ID=unit_test"      \
         -e "AWS_SECRET_ACCESS_KEY=unit_test"  \
@@ -418,7 +418,7 @@ runUnitTestWithSessionToken() {
         -v "$(pwd)/test/unit:/var/tmp"        \
         --workdir /var/tmp                    \
         -e "DEBUG=true"                       \
-        -e "S3_STYLE=virtual"                 \
+        -e "S3_STYLE=virtual-v2"                 \
         -e "S3_SERVICE=s3"                    \
         -e "AWS_ACCESS_KEY_ID=unit_test"      \
         -e "AWS_SECRET_ACCESS_KEY=unit_test"  \

diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
       S3_SERVER_PROTO: "http"
       S3_REGION: "us-east-1"
       DEBUG: "true"
-      S3_STYLE: "virtual"
+      S3_STYLE: "${S3_STYLE:-virtual-v2}"
       S3_SERVICE: "s3"
       ALLOW_DIRECTORY_LIST:
       PROVIDE_INDEX_PAGE: