Skip to content

Commit

Permalink
feat(rfc-9211): Add detail & key directive, fix caddy tests (#281)
Browse files Browse the repository at this point in the history
* feat(rfc-9211): Add detail & key directive, fix caddy tests

* bump dependency version

* fix tests unit+E2E

* fix(plugins): tyk no-cache
  • Loading branch information
darkweak authored Dec 10, 2022
1 parent a368466 commit 5f4d4d3
Show file tree
Hide file tree
Showing 64 changed files with 387 additions and 552 deletions.
25 changes: 21 additions & 4 deletions .github/workflows/non-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,26 @@ jobs:
go-version: 1.19
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
checkout-code-and-validate:
unit-test-golang:
needs: lint-validation
name: Checkout code and validate tests
name: Unit tests
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.19
- name: Build the stack
run: docker network create your_network || true
- name: Build the stack
run: docker-compose -f docker-compose.yml.test up -d --build --force-recreate --remove-orphans
- name: Test
run: go test -v -race $(go list ./... | grep -v cache/providers)
unit-test-golang-with-services:
needs: lint-validation
name: Unit tests with external services
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -34,9 +51,9 @@ jobs:
run: docker-compose -f docker-compose.yml.test up -d --build --force-recreate --remove-orphans
- name: Test
# disabled race to pass the EmbeddedOlric test
run: docker-compose -f docker-compose.yml.test exec -T souin go test -v ./...
run: docker-compose -f docker-compose.yml.test exec -T souin go test -v ./cache/providers
validate-prod-container-building:
needs: checkout-code-and-validate
needs: unit-test-golang-with-services
name: Validate that the container build for prod
runs-on: ubuntu-latest
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
name: Wait for Souin is really loaded inside Beego as middleware
uses: jakejarvis/wait-action@master
with:
time: 35s
time: 40s
-
name: Set Beego logs configuration result as environment variable
run: cd plugins/beego && echo "$(make load-checker)" >> $GITHUB_ENV
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
name: Wait for Souin is really loaded inside Chi as middleware
uses: jakejarvis/wait-action@master
with:
time: 35s
time: 40s
-
name: Set Chi logs configuration result as environment variable
run: cd plugins/chi && echo "$(make load-checker)" >> $GITHUB_ENV
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
name: Wait for Souin is really loaded inside Dotweb as middleware
uses: jakejarvis/wait-action@master
with:
time: 35s
time: 40s
-
name: Set Dotweb logs configuration result as environment variable
run: cd plugins/dotweb && echo "$(make load-checker)" >> $GITHUB_ENV
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
name: Wait for Souin is really loaded inside Fiber as middleware
uses: jakejarvis/wait-action@master
with:
time: 45s
time: 50s
-
name: Set Fiber logs configuration result as environment variable
run: cd plugins/fiber && echo "$(make load-checker)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_plugins_generator.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

plugins=("beego" "chi" "dotweb" "echo" "fiber" "gin" "go-zero" "goyave" "kratos" "roadrunner" "skipper" "souin" "traefik" "tyk" "webgo")
durations=("35" "35" "35" "45" "45" "40" "50" "50" "50" "10" "65" "40" "20" "30" "45")
durations=("40" "40" "40" "45" "50" "40" "50" "50" "50" "10" "65" "40" "20" "30" "45")
versions=("19" "19" "19" "19" "19" "19" "19" "19" "19" "19" "19" "19" "19" "19" "19")

IFS= read -r -d '' tpl <<EOF
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ experimental:
plugins:
souin:
moduleName: github.com/darkweak/souin
version: v1.6.22
version: v1.6.24
```
After that you can declare either the whole configuration at once in the middleware block or by service. See the examples below.
```yaml
Expand Down
Loading

0 comments on commit 5f4d4d3

Please sign in to comment.