Merge pull request #199 from acouvreur/beta

Merge Beta to Main
sablierapp · Sep 14, 2023 · a39d35e · a39d35e
2 parents 625df3f + 0ef7dc1
commit a39d35e
Show file tree

Hide file tree

Showing 120 changed files with 6,743 additions and 1,216 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -0,0 +1,100 @@
+{
+  "projectName": "sablier",
+  "projectOwner": "acouvreur",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "acouvreur",
+      "name": "Alexis Couvreur",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22034450?v=4",
+      "profile": "https://www.alexiscouvreur.fr/",
+      "contributions": [
+        "question",
+        "bug",
+        "code",
+        "doc",
+        "example",
+        "ideas"
+      ]
+    },
+    {
+      "login": "mschneider82",
+      "name": "Matthias Schneider",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8426497?v=4",
+      "profile": "https://github.com/mschneider82",
+      "contributions": [
+        "code",
+        "doc",
+        "review"
+      ]
+    },
+    {
+      "login": "Thyvador",
+      "name": "Alexandre HILTCHER",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20644197?v=4",
+      "profile": "https://github.com/Thyvador",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    },
+    {
+      "login": "tandy-1000",
+      "name": "tandy1000",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24867509?v=4",
+      "profile": "https://github.com/tandy-1000",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
+    },
+    {
+      "login": "Sam-R",
+      "name": "Sam R.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4183297?v=4",
+      "profile": "https://github.com/Sam-R",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Nastaliss",
+      "name": "Stanislas Bruhière",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46960549?v=4",
+      "profile": "https://github.com/Nastaliss",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    },
+    {
+      "login": "sourgrasses",
+      "name": "Jenn Wheeler",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12515536?v=4",
+      "profile": "https://github.com/sourgrasses",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    },
+    {
+      "login": "romdum",
+      "name": "Romain Duminil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19633997?v=4",
+      "profile": "https://github.com/romdum",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "linkToUsage": true
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Go",
-	"image": "mcr.microsoft.com/devcontainers/go:0-1.19",
+	"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "lts"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - beta
   pull_request:
 
 jobs:
@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.21
+      uses: actions/setup-go@v4
       with:
-        go-version: ^1.18
+        go-version: ^1.21
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Build
       run: go build -v .

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - beta
     tags:
       - "v*"
   pull_request:
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -38,19 +38,19 @@ jobs:
           version: latest
           buildkitd-flags: --debug
       - name: Login to ghcr.io
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v3 
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to Docker Hub
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v3 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
@@ -5,7 +5,7 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Docker Hub Description
       uses: peter-evans/dockerhub-description@v3

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - beta
   pull_request:
 
 jobs:
@@ -13,21 +13,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
           tags: acouvreur/sablier:local
           outputs: type=docker,dest=/tmp/sablier.tar
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sablier-image-tar
           path: /tmp/sablier.tar
@@ -36,13 +36,13 @@ jobs:
     name: Build Sablier for Traefik middleware
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.18
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build
         run: cd plugins/traefik && go build -v .
@@ -57,21 +57,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        provider: [docker_classic, docker_swarm, kubernetes]
+        provider: [docker, docker_swarm, kubernetes]
     steps:
-      - name: Set up Go 1.18
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: sablier-image-tar
           path: /tmp
@@ -80,7 +80,7 @@ jobs:
         run: docker load --input /tmp/sablier.tar
 
       - name: Test ${{ matrix.provider }}
-        run: cd plugins/traefik/e2e && bash ./${{ matrix.provider }}.sh
+        run: cd plugins/traefik/e2e/${{ matrix.provider }} && bash ./run.sh
 
   nginx_e2e:
     name: Run Sablier E2E tests for Nginx NJS module with Sablier
@@ -89,15 +89,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        provider: [docker_classic, docker_swarm, kubernetes]
+        provider: [docker, docker_swarm] # , kubernetes]
     steps:
-      - name: Set up Go 1.18
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -106,7 +106,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: sablier-image-tar
           path: /tmp
@@ -115,4 +115,71 @@ jobs:
         run: docker load --input /tmp/sablier.tar
 
       - name: Test ${{ matrix.provider }}
-        run: cd plugins/nginx/e2e && bash ./${{ matrix.provider }}.sh
+        run: cd plugins/nginx/e2e/${{ matrix.provider }} && bash ./run.sh
+
+  build-caddy:
+    name: Build Caddy docker image once and share it to Caddy E2E jobs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: plugins/caddy
+          file: plugins/caddy/Dockerfile
+          tags: caddy:local
+          outputs: type=docker,dest=/tmp/caddy.tar
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: caddy-image-tar
+          path: /tmp/caddy.tar
+
+  caddy_e2e:
+    name: Run Sablier E2E tests for Caddy middleware
+    runs-on: ubuntu-latest
+    needs: 
+      - build
+      - build-caddy
+    strategy:
+      fail-fast: false
+      matrix:
+        provider: [docker, docker_swarm] # , kubernetes]
+    steps:
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: sablier-image-tar
+          path: /tmp
+
+      - name: Load Docker image
+        run: docker load --input /tmp/sablier.tar
+
+      - name: Download Caddy artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: caddy-image-tar
+          path: /tmp
+
+      - name: Load Caddy Docker image
+        run: docker load --input /tmp/caddy.tar
+
+      - name: Test ${{ matrix.provider }}
+        run: cd plugins/caddy/e2e/${{ matrix.provider }} && bash ./run.sh