Compare commits
1 Commits
v2024.3.26
...
v2023.7.7-
Author | SHA1 | Date | |
---|---|---|---|
fc983ea3b4 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,5 +7,4 @@
|
|||||||
/admin-key.json
|
/admin-key.json
|
||||||
/.bouncer-token
|
/.bouncer-token
|
||||||
/data
|
/data
|
||||||
/out
|
/out
|
||||||
.dockerconfigjson
|
|
259
.goreleaser.yaml
259
.goreleaser.yaml
@ -1,37 +1,37 @@
|
|||||||
project_name: bouncer
|
project_name: bouncer
|
||||||
before:
|
before:
|
||||||
hooks:
|
hooks:
|
||||||
- go mod tidy
|
- go mod tidy
|
||||||
- go generate ./...
|
- go generate ./...
|
||||||
builds:
|
builds:
|
||||||
- id: bouncer
|
- id: bouncer
|
||||||
env:
|
env:
|
||||||
- CGO_ENABLED=0
|
- CGO_ENABLED=0
|
||||||
ldflags:
|
ldflags:
|
||||||
- -s
|
- -s
|
||||||
- -w
|
- -w
|
||||||
- -X 'main.GitRef={{ .Commit }}'
|
- -X 'main.GitRef={{ .Commit }}'
|
||||||
- -X 'main.ProjectVersion={{ .Version }}'
|
- -X 'main.ProjectVersion={{ .Version }}'
|
||||||
- -X 'main.BuildDate={{ .Date }}'
|
- -X 'main.BuildDate={{ .Date }}'
|
||||||
- -X 'main.DefaultConfigPath=/etc/bouncer/config.yml'
|
- -X 'main.DefaultConfigPath=/etc/bouncer/config.yml'
|
||||||
gcflags:
|
gcflags:
|
||||||
- -trimpath="${PWD}"
|
- -trimpath="${PWD}"
|
||||||
asmflags:
|
asmflags:
|
||||||
- -trimpath="${PWD}"
|
- -trimpath="${PWD}"
|
||||||
goos:
|
goos:
|
||||||
- linux
|
- linux
|
||||||
goarch:
|
goarch:
|
||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
- "386"
|
- "386"
|
||||||
main: ./cmd/bouncer
|
main: ./cmd/bouncer
|
||||||
archives:
|
archives:
|
||||||
- id: bouncer
|
- id: bouncer
|
||||||
builds: ["bouncer"]
|
builds: ["bouncer"]
|
||||||
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
|
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
|
||||||
files:
|
files:
|
||||||
- README.md
|
- README.md
|
||||||
- misc/packaging/common/config.yml
|
- misc/packaging/common/config.yml
|
||||||
checksum:
|
checksum:
|
||||||
name_template: 'checksums.txt'
|
name_template: 'checksums.txt'
|
||||||
snapshot:
|
snapshot:
|
||||||
@ -40,109 +40,100 @@ changelog:
|
|||||||
sort: asc
|
sort: asc
|
||||||
filters:
|
filters:
|
||||||
exclude:
|
exclude:
|
||||||
- '^docs:'
|
- '^docs:'
|
||||||
- '^test:'
|
- '^test:'
|
||||||
nfpms:
|
nfpms:
|
||||||
- id: bouncer-bin
|
- id: bouncer-bin
|
||||||
builds:
|
builds:
|
||||||
- "bouncer"
|
- "bouncer"
|
||||||
package_name: bouncer-bin
|
package_name: bouncer-bin
|
||||||
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
||||||
maintainer: Cadoles <contact@cadoles.com>
|
maintainer: Cadoles <contact@cadoles.com>
|
||||||
description: |-
|
description: |-
|
||||||
reverse proxy server with dynamic queuing management - binaries
|
reverse proxy server with dynamic queuing management - binaries
|
||||||
license: AGPL-3.0
|
license: AGPL-3.0
|
||||||
formats:
|
formats:
|
||||||
- apk
|
- apk
|
||||||
- deb
|
- deb
|
||||||
- rpm
|
- rpm
|
||||||
- archlinux
|
contents:
|
||||||
contents:
|
- src: misc/packaging/common/config.yml
|
||||||
- src: misc/packaging/common/config.yml
|
dst: /etc/bouncer/config.yml
|
||||||
dst: /etc/bouncer/config.yml
|
type: config
|
||||||
type: config
|
- src: layers
|
||||||
- src: layers
|
dst: /etc/bouncer/layers
|
||||||
dst: /etc/bouncer/layers
|
type: config
|
||||||
type: config
|
- id: bouncer-admin
|
||||||
- id: bouncer-admin
|
meta: true
|
||||||
meta: true
|
package_name: bouncer-admin
|
||||||
package_name: bouncer-admin
|
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
||||||
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
maintainer: Cadoles <contact@cadoles.com>
|
||||||
maintainer: Cadoles <contact@cadoles.com>
|
dependencies:
|
||||||
dependencies:
|
- bouncer-bin
|
||||||
- bouncer-bin
|
description: |-
|
||||||
description: |-
|
reverse proxy server with dynamic queuing management - administration service
|
||||||
reverse proxy server with dynamic queuing management - administration service
|
license: AGPL-3.0
|
||||||
license: AGPL-3.0
|
formats:
|
||||||
formats:
|
- apk
|
||||||
- apk
|
- deb
|
||||||
- deb
|
- rpm
|
||||||
- rpm
|
contents:
|
||||||
- archlinux
|
- src: misc/packaging/systemd/bouncer-admin.systemd.service
|
||||||
contents:
|
dst: /usr/lib/systemd/system/bouncer-admin.service
|
||||||
- src: misc/packaging/systemd/bouncer-admin.systemd.service
|
packager: deb
|
||||||
dst: /usr/lib/systemd/system/bouncer-admin.service
|
- src: misc/packaging/systemd/bouncer-admin.systemd.service
|
||||||
packager: deb
|
dst: /usr/lib/systemd/system/bouncer-admin.service
|
||||||
- src: misc/packaging/systemd/bouncer-admin.systemd.service
|
packager: rpm
|
||||||
dst: /usr/lib/systemd/system/bouncer-admin.service
|
- src: misc/packaging/openrc/bouncer-admin.openrc.sh
|
||||||
packager: rpm
|
dst: /etc/init.d/bouncer-admin
|
||||||
- src: misc/packaging/systemd/bouncer-admin.systemd.service
|
file_info:
|
||||||
dst: /usr/lib/systemd/system/bouncer-admin.service
|
mode: 0755
|
||||||
packager: archlinux
|
packager: apk
|
||||||
- src: misc/packaging/openrc/bouncer-admin.openrc.sh
|
- dst: /usr/share/bouncer
|
||||||
dst: /etc/init.d/bouncer-admin
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
mode: 0755
|
mode: 0700
|
||||||
packager: apk
|
- dst: /var/log/bouncer
|
||||||
- dst: /usr/share/bouncer
|
type: dir
|
||||||
type: dir
|
file_info:
|
||||||
file_info:
|
mode: 0700
|
||||||
mode: 0700
|
packager: apk
|
||||||
- dst: /var/log/bouncer
|
scripts:
|
||||||
type: dir
|
postinstall: "misc/packaging/common/postinstall-bouncer-admin.sh"
|
||||||
file_info:
|
- id: bouncer-proxy
|
||||||
mode: 0700
|
meta: true
|
||||||
packager: apk
|
dependencies:
|
||||||
scripts:
|
- bouncer-bin
|
||||||
postinstall: "misc/packaging/common/postinstall-bouncer-admin.sh"
|
package_name: bouncer-proxy
|
||||||
- id: bouncer-proxy
|
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
||||||
meta: true
|
maintainer: Cadoles <contact@cadoles.com>
|
||||||
dependencies:
|
description: |-
|
||||||
- bouncer-bin
|
reverse proxy server with dynamic queuing management - proxy service
|
||||||
package_name: bouncer-proxy
|
license: AGPL-3.0
|
||||||
homepage: https://forge.cadoles.com/Cadoles/bouncer
|
formats:
|
||||||
maintainer: Cadoles <contact@cadoles.com>
|
- apk
|
||||||
description: |-
|
- deb
|
||||||
reverse proxy server with dynamic queuing management - proxy service
|
- rpm
|
||||||
license: AGPL-3.0
|
contents:
|
||||||
formats:
|
- src: misc/packaging/systemd/bouncer-proxy.systemd.service
|
||||||
- apk
|
dst: /usr/lib/systemd/system/bouncer-proxy.service
|
||||||
- deb
|
packager: deb
|
||||||
- rpm
|
- src: misc/packaging/systemd/bouncer-proxy.systemd.service
|
||||||
- archlinux
|
dst: /usr/lib/systemd/system/bouncer-proxy.service
|
||||||
contents:
|
packager: rpm
|
||||||
- src: misc/packaging/systemd/bouncer-proxy.systemd.service
|
- src: misc/packaging/openrc/bouncer-proxy.openrc.sh
|
||||||
dst: /usr/lib/systemd/system/bouncer-proxy.service
|
dst: /etc/init.d/bouncer-proxy
|
||||||
packager: deb
|
file_info:
|
||||||
- src: misc/packaging/systemd/bouncer-proxy.systemd.service
|
mode: 0755
|
||||||
dst: /usr/lib/systemd/system/bouncer-proxy.service
|
packager: apk
|
||||||
packager: rpm
|
- dst: /usr/share/bouncer
|
||||||
- src: misc/packaging/systemd/bouncer-proxy.systemd.service
|
type: dir
|
||||||
dst: /usr/lib/systemd/system/bouncer-proxy.service
|
file_info:
|
||||||
packager: archlinux
|
mode: 0700
|
||||||
- src: misc/packaging/openrc/bouncer-proxy.openrc.sh
|
- dst: /var/log/bouncer
|
||||||
dst: /etc/init.d/bouncer-proxy
|
type: dir
|
||||||
file_info:
|
file_info:
|
||||||
mode: 0755
|
mode: 0700
|
||||||
packager: apk
|
packager: apk
|
||||||
- dst: /usr/share/bouncer
|
scripts:
|
||||||
type: dir
|
postinstall: "misc/packaging/common/postinstall-bouncer-proxy.sh"
|
||||||
file_info:
|
|
||||||
mode: 0700
|
|
||||||
- dst: /var/log/bouncer
|
|
||||||
type: dir
|
|
||||||
file_info:
|
|
||||||
mode: 0700
|
|
||||||
packager: apk
|
|
||||||
scripts:
|
|
||||||
postinstall: "misc/packaging/common/postinstall-bouncer-proxy.sh"
|
|
||||||
|
14
Dockerfile
14
Dockerfile
@ -1,4 +1,4 @@
|
|||||||
FROM reg.cadoles.com/proxy_cache/library/golang:1.21.6 AS BUILD
|
FROM golang:1.20 AS BUILD
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y make
|
&& apt-get install -y make
|
||||||
@ -21,11 +21,17 @@ RUN /src/dist/bouncer_linux_amd64_v1/bouncer -c '' config dump > /src/dist/bounc
|
|||||||
&& yq -i '.admin.auth.privateKey = "/etc/bouncer/admin-key.json"' /src/dist/bouncer_linux_amd64_v1/config.yml \
|
&& yq -i '.admin.auth.privateKey = "/etc/bouncer/admin-key.json"' /src/dist/bouncer_linux_amd64_v1/config.yml \
|
||||||
&& yq -i '.redis.adresses = ["redis:6379"]' /src/dist/bouncer_linux_amd64_v1/config.yml
|
&& yq -i '.redis.adresses = ["redis:6379"]' /src/dist/bouncer_linux_amd64_v1/config.yml
|
||||||
|
|
||||||
FROM reg.cadoles.com/proxy_cache/library/alpine:3.19.1 AS RUNTIME
|
FROM alpine:3.18 AS RUNTIME
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates dumb-init
|
ARG DUMB_INIT_VERSION=1.2.5
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
|
RUN apk add --no-cache ca-certificates
|
||||||
|
|
||||||
|
RUN mkdir -p /usr/local/bin \
|
||||||
|
&& wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 \
|
||||||
|
&& chmod +x /usr/local/bin/dumb-init
|
||||||
|
|
||||||
|
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/bin /usr/share/bouncer/bin /etc/bouncer
|
RUN mkdir -p /usr/local/bin /usr/share/bouncer/bin /etc/bouncer
|
||||||
|
|
||||||
|
26
Makefile
26
Makefile
@ -16,9 +16,6 @@ GOTEST_ARGS ?= -short
|
|||||||
|
|
||||||
OPENWRT_DEVICE ?= 192.168.1.1
|
OPENWRT_DEVICE ?= 192.168.1.1
|
||||||
|
|
||||||
SIEGE_URLS_FILE ?= misc/siege/urls.txt
|
|
||||||
SIEGE_CONCURRENCY ?= 100
|
|
||||||
|
|
||||||
watch: tools/modd/bin/modd deps ## Watching updated files - live reload
|
watch: tools/modd/bin/modd deps ## Watching updated files - live reload
|
||||||
( set -o allexport && source .env && set +o allexport && tools/modd/bin/modd )
|
( set -o allexport && source .env && set +o allexport && tools/modd/bin/modd )
|
||||||
|
|
||||||
@ -104,15 +101,6 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
|
|||||||
GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
|
GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
|
||||||
tools/gitea-release/bin/gitea-release.sh
|
tools/gitea-release/bin/gitea-release.sh
|
||||||
|
|
||||||
grafterm: tools/grafterm/bin/grafterm
|
|
||||||
tools/grafterm/bin/grafterm -c ./misc/grafterm/dashboard.json -v job=bouncer-proxy -r 5s
|
|
||||||
|
|
||||||
siege:
|
|
||||||
$(eval TMP := $(shell mktemp))
|
|
||||||
cat $(SIEGE_URLS_FILE) | envsubst > $(TMP)
|
|
||||||
siege -i -b -c $(SIEGE_CONCURRENCY) -f $(TMP)
|
|
||||||
rm -rf $(TMP)
|
|
||||||
|
|
||||||
tools/gitea-release/bin/gitea-release.sh:
|
tools/gitea-release/bin/gitea-release.sh:
|
||||||
mkdir -p tools/gitea-release/bin
|
mkdir -p tools/gitea-release/bin
|
||||||
curl --output tools/gitea-release/bin/gitea-release.sh https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/gitea/gitea-release.sh
|
curl --output tools/gitea-release/bin/gitea-release.sh https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/gitea/gitea-release.sh
|
||||||
@ -122,10 +110,6 @@ tools/modd/bin/modd:
|
|||||||
mkdir -p tools/modd/bin
|
mkdir -p tools/modd/bin
|
||||||
GOBIN=$(PWD)/tools/modd/bin go install github.com/cortesi/modd/cmd/modd@latest
|
GOBIN=$(PWD)/tools/modd/bin go install github.com/cortesi/modd/cmd/modd@latest
|
||||||
|
|
||||||
tools/grafterm/bin/grafterm:
|
|
||||||
mkdir -p tools/grafterm/bin
|
|
||||||
GOBIN=$(PWD)/tools/grafterm/bin go install github.com/slok/grafterm/cmd/grafterm@v0.2.0
|
|
||||||
|
|
||||||
full-version:
|
full-version:
|
||||||
@echo $(FULL_VERSION)
|
@echo $(FULL_VERSION)
|
||||||
|
|
||||||
@ -144,12 +128,4 @@ run-redis:
|
|||||||
redis-shell:
|
redis-shell:
|
||||||
docker exec -it \
|
docker exec -it \
|
||||||
bouncer-redis \
|
bouncer-redis \
|
||||||
redis-cli
|
redis-cli
|
||||||
|
|
||||||
run-prometheus:
|
|
||||||
docker kill bouncer-prometheus || exit 0
|
|
||||||
docker run --rm -t \
|
|
||||||
--name bouncer-prometheus \
|
|
||||||
--network host \
|
|
||||||
-v $(PWD)/misc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml \
|
|
||||||
prom/prometheus
|
|
@ -6,13 +6,10 @@
|
|||||||
## Exemples
|
## Exemples
|
||||||
|
|
||||||
- [(FR) - Exemple de déploiement multi-noeuds](../misc/docker-compose/README.md)
|
- [(FR) - Exemple de déploiement multi-noeuds](../misc/docker-compose/README.md)
|
||||||
|
|
||||||
## Référence
|
## Référence
|
||||||
|
|
||||||
- [(FR) - Layers](./fr/references/layers/README.md)
|
- [(FR) - Layers](./fr/references/layers/README.md)
|
||||||
- [(FR) - Métriques](./fr/references/metrics.md)
|
|
||||||
- [(FR) - Fichier de configuration](../misc/packaging/common/config.yml)
|
- [(FR) - Fichier de configuration](../misc/packaging/common/config.yml)
|
||||||
- [(FR) - API d'administration](./fr/references/admin_api.md)
|
|
||||||
|
|
||||||
## Tutoriels
|
## Tutoriels
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
5. Tester que le CLI est en capacité d'interroger l'API d'administration
|
5. Tester que le CLI est en capacité d'interroger l'API d'administration
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bouncer admin proxy query
|
bouncer admin query proxy
|
||||||
```
|
```
|
||||||
|
|
||||||
Un message équivalent à celui ci devrait s'afficher:
|
Un message équivalent à celui ci devrait s'afficher:
|
||||||
@ -92,4 +92,4 @@
|
|||||||
|
|
||||||
3. Ouvrir la page `https://<ip_serveur>:8080/` dans un navigateur. Le site Cadoles s'affiche !
|
3. Ouvrir la page `https://<ip_serveur>:8080/` dans un navigateur. Le site Cadoles s'affiche !
|
||||||
|
|
||||||
**Bravo, vous avez créé votre premier proxy avec Bouncer !**
|
**Bravo, vous avez créé votre premier proxy avec Bouncer !**
|
@ -1,182 +0,0 @@
|
|||||||
# API d'administration
|
|
||||||
|
|
||||||
## Authentification
|
|
||||||
|
|
||||||
L'ensemble des appels aux APIs HTTP du service `bouncer-admin` sont authentifiées via l'utilisation d'un jeton [JWT](https://datatracker.ietf.org/doc/html/rfc7519) signé par la clé privée du serveur.
|
|
||||||
|
|
||||||
Le jeton d'accès doit être transmis avec l'ensemble des appels aux points d'entrée via l'entête HTTP `Authorization` en respectant la forme suivante:
|
|
||||||
|
|
||||||
```
|
|
||||||
Authorization: Bearer <jwt>
|
|
||||||
```
|
|
||||||
|
|
||||||
### Génération d'un jeton d'authentification
|
|
||||||
|
|
||||||
La génération d'un jeton d'authentification s'effectue via la commande suivante:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
bouncer auth create-token --subject "<subject>" --role "<role>"
|
|
||||||
```
|
|
||||||
|
|
||||||
Où:
|
|
||||||
|
|
||||||
- `"<subject>"` est une chaîne de caractère arbitraire ayant pour objectif d'identifier de manière unique l'utilisateur associé au jeton;
|
|
||||||
- `"<role>"` peut prendre une des deux valeurs `reader` ou `writer` correspondant aux droits suivants respectifs:
|
|
||||||
- droit en lecture sur l'ensemble des entités (proxy, layer);
|
|
||||||
- droit en lecture ET en écriture sur l'ensemble des entités.
|
|
||||||
|
|
||||||
|
|
||||||
## Points d'entrée
|
|
||||||
|
|
||||||
### `POST /api/v1/proxies`
|
|
||||||
|
|
||||||
Créer un nouveau proxy
|
|
||||||
|
|
||||||
#### Exemple de corps de requête
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"name": "myproxy", // OBLIGATOIRE - Nom du proxy
|
|
||||||
"to": "https://www.cadoles.com", // OBLIGATOIRE - Site distant ciblé par le proxy
|
|
||||||
"from": ["*"] // OPTIONNEL - Liste de patrons de filtrage associés au proxy
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Exemple de résultat
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"proxy": {
|
|
||||||
"name": "myproxy",
|
|
||||||
"weight": 0,
|
|
||||||
"enabled": false,
|
|
||||||
"to": "https://www.cadoles.com",
|
|
||||||
"from": ["*"],
|
|
||||||
"createdAt": "2018-12-10T13:45:00.000Z",
|
|
||||||
"updatedAt": "2018-12-10T13:45:00.000Z"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Source
|
|
||||||
|
|
||||||
Voir [`internal/admin/proxy_route.go#createProxy()`](../../../internal/admin/proxy_route.go#createProxy)
|
|
||||||
|
|
||||||
### `GET /api/v1/proxies/{proxyName}`
|
|
||||||
|
|
||||||
Récupérer les informations complètes sur un proxy
|
|
||||||
|
|
||||||
#### Paramètres
|
|
||||||
|
|
||||||
- `{proxyName}` - Nom du proxy
|
|
||||||
|
|
||||||
#### Exemple de résultat
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"proxy": {
|
|
||||||
"name": "myproxy",
|
|
||||||
"weight": 0,
|
|
||||||
"enabled": false,
|
|
||||||
"to": "https://www.cadoles.com",
|
|
||||||
"from": ["*"],
|
|
||||||
"createdAt": "2018-12-10T13:45:00.000Z",
|
|
||||||
"updatedAt": "2018-12-10T13:45:00.000Z"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Source
|
|
||||||
|
|
||||||
Voir [`internal/admin/proxy_route.go#getProxy()`](../../../internal/admin/proxy_route.go#getProxy)
|
|
||||||
|
|
||||||
### `PUT /api/v1/proxies/{proxyName}`
|
|
||||||
|
|
||||||
Modifier un proxy
|
|
||||||
|
|
||||||
#### Exemple de corps de requête
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"to": "https://www.cadoles.com", // OPTIONNEL - Site distant ciblé par le proxy
|
|
||||||
"from": ["mylocalproxydomain:*"], // OPTIONNEL - Liste de patrons de filtrage associés au proxy
|
|
||||||
"weight": 100, // OPTIONNEL - Poids à associer au proxy
|
|
||||||
"enabled": true, // OPTIONNEL - Activer/désactiver le proxy
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Exemple de résultat
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"proxy": {
|
|
||||||
"name": "myproxy",
|
|
||||||
"weight": 100,
|
|
||||||
"enabled": true,
|
|
||||||
"to": "https://www.cadoles.com",
|
|
||||||
"from": ["mylocalproxydomain:*"],
|
|
||||||
"createdAt": "2018-12-10T13:45:00.000Z",
|
|
||||||
"updatedAt": "2020-10-02T15:09:00.000Z"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Source
|
|
||||||
|
|
||||||
Voir [`internal/admin/proxy_route.go#updateProxy()`](../../../internal/admin/proxy_route.go#updateProxy)
|
|
||||||
|
|
||||||
### `GET /api/v1/proxies?names={name1,name2,...}`
|
|
||||||
|
|
||||||
Lister les proxies existants
|
|
||||||
|
|
||||||
#### Paramètres
|
|
||||||
|
|
||||||
- `{names}` - Optionnel - Liste des noms de proxy à appliquer en tant que filtre
|
|
||||||
|
|
||||||
#### Exemple de résultat
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"proxies": [
|
|
||||||
{
|
|
||||||
"name": "myproxy",
|
|
||||||
"weight": 0,
|
|
||||||
"enabled": false,
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Source
|
|
||||||
|
|
||||||
Voir [`internal/admin/proxy_route.go#queryProxy()`](../../../internal/admin/proxy_route.go#queryProxy)
|
|
||||||
|
|
||||||
## `DELETE /api/v1/proxies/{proxyName}`
|
|
||||||
|
|
||||||
Supprimer le proxy
|
|
||||||
|
|
||||||
#### Paramètres
|
|
||||||
|
|
||||||
- `{proxyName}` - Nom du proxy
|
|
||||||
|
|
||||||
#### Exemple de résultat
|
|
||||||
|
|
||||||
```json5
|
|
||||||
{
|
|
||||||
"data": {
|
|
||||||
"proxyName": "myproxy"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Source
|
|
||||||
|
|
||||||
Voir [`internal/admin/proxy_route.go#deleteProxy()`](../../../internal/admin/proxy_route.go#deleteProxy)
|
|
@ -32,10 +32,6 @@ Ce layer permet de bloquer l'accès à un site (ou une section de celui ci) cibl
|
|||||||
|
|
||||||
Voir le [fichier de configuration de référence](../../../../misc/packaging/common/config.yml), section `layers.circuitbreaker` pour voir les options permettant de personnaliser le chemin du répertoire contenant les templates.
|
Voir le [fichier de configuration de référence](../../../../misc/packaging/common/config.yml), section `layers.circuitbreaker` pour voir les options permettant de personnaliser le chemin du répertoire contenant les templates.
|
||||||
|
|
||||||
## Schéma
|
### Schéma
|
||||||
|
|
||||||
Voir le [schéma JSON](../../../../internal/proxy/director/layer/circuitbreaker/layer-options.json).
|
Voir le [schéma JSON](../../../../internal/proxy/director/layer/circuitbreaker/layer-options.json).
|
||||||
|
|
||||||
## Métriques
|
|
||||||
|
|
||||||
_Aucune [métrique Prometheus](../metrics.md) n'est exportée par ce layer._
|
|
@ -30,34 +30,6 @@ Ce layer permet d'ajouter un mécanisme de file d'attente dynamique au proxy ass
|
|||||||
|
|
||||||
Par exemple, si vous souhaitez limiter votre file à l'ensemble d'une section "`/blog`" d'un site, vous pouvez déclarer la valeur `["*/blog*"]`. Les autres URLs du site ne seront pas affectées par cette file d'attente.
|
Par exemple, si vous souhaitez limiter votre file à l'ensemble d'une section "`/blog`" d'un site, vous pouvez déclarer la valeur `["*/blog*"]`. Les autres URLs du site ne seront pas affectées par cette file d'attente.
|
||||||
|
|
||||||
## Schéma
|
### Schéma
|
||||||
|
|
||||||
Voir le [schéma JSON](../../../../internal/proxy/director/layer/queue/schema/layer-options.json).
|
Voir le [schéma JSON](../../../../internal/proxy/director/layer/queue/schema/layer-options.json).
|
||||||
|
|
||||||
## Métriques
|
|
||||||
|
|
||||||
Les [métriques Prometheus](../metrics.md) suivantes sont exposées par ce layer.
|
|
||||||
|
|
||||||
### `bouncer_layer_queue_capacity{layer=<layerName>,proxy=<proxyName>}`
|
|
||||||
|
|
||||||
- **Type:** `gauge`
|
|
||||||
- **Description**: Capacité maximale de la queue
|
|
||||||
- **Exemple**
|
|
||||||
|
|
||||||
```
|
|
||||||
# HELP bouncer_layer_queue_capacity Bouncer's queue layer capacity
|
|
||||||
# TYPE bouncer_layer_queue_capacity gauge
|
|
||||||
bouncer_layer_queue_capacity{layer="queue",proxy="cadoles"} 2
|
|
||||||
```
|
|
||||||
|
|
||||||
### `bouncer_layer_queue_sessions{layer=<layerName>,proxy=<proxyName>}`
|
|
||||||
|
|
||||||
- **Type:** `gauge`
|
|
||||||
- **Description**: Nombre courant de sessions ouvertes
|
|
||||||
- **Exemple**
|
|
||||||
|
|
||||||
```
|
|
||||||
# HELP bouncer_layer_queue_sessions Bouncer's queue layer current sessions
|
|
||||||
# TYPE bouncer_layer_queue_sessions gauge
|
|
||||||
bouncer_layer_queue_sessions{layer="queue",proxy="cadoles"} 3
|
|
||||||
```
|
|
@ -1,29 +0,0 @@
|
|||||||
# Métriques
|
|
||||||
|
|
||||||
Bouncer expose un certain nombre de métriques Prometheus sur le serveur proxy ainsi que sur le serveur d'administration. Ces métriques sont par défaut accessibles sur `/.bouncer/metrics`.
|
|
||||||
|
|
||||||
Il est possible de configurer le point d'entrée de ces métriques ainsi que d'ajouter une authentification de type `Basic Auth` [via la configuration](../../../misc/packaging/common/config.yml) (voir les clés `admin.metrics` et `proxy.metrics`).
|
|
||||||
|
|
||||||
Outre les métriques par défaut fournies par la librairie [Prometheus](https://prometheus.io/docs/guides/go-application/#instrumenting-a-go-application-for-prometheus), les serveurs Bouncer exposent également des métriques propres.
|
|
||||||
|
|
||||||
Chaque layer associé à un proxy peut également ses propres métriques spécifiques. [Voir la page de documentation](./layers/README.md) de chaque layer pour plus d'informations.
|
|
||||||
|
|
||||||
## Métriques spécifiques
|
|
||||||
|
|
||||||
### Serveur proxy
|
|
||||||
|
|
||||||
#### `bouncer_proxy_director_proxy_requests_total{proxy=<proxyName>}`
|
|
||||||
|
|
||||||
- **Type:** `counter`
|
|
||||||
- **Description**: Nombre total de requêtes ayant transité par le proxy
|
|
||||||
- **Exemple**
|
|
||||||
|
|
||||||
```
|
|
||||||
# HELP bouncer_proxy_director_proxy_requests_total Bouncer proxy total requests
|
|
||||||
# TYPE bouncer_proxy_director_proxy_requests_total counter
|
|
||||||
bouncer_proxy_director_proxy_requests_total{proxy="cadoles"} 64
|
|
||||||
```
|
|
||||||
|
|
||||||
### Serveur d'administration
|
|
||||||
|
|
||||||
_Pas de métrique supplémentaire._
|
|
@ -70,15 +70,15 @@ docker run --rm -t \
|
|||||||
|
|
||||||
Surveiller les sources, compiler celles ci en cas de modifications et lancer les services `bouncer-proxy` et `bouncer-admin`.
|
Surveiller les sources, compiler celles ci en cas de modifications et lancer les services `bouncer-proxy` et `bouncer-admin`.
|
||||||
|
|
||||||
### `make test`
|
#### `make test`
|
||||||
|
|
||||||
Exécuter les tests unitaires/d'intégration du projet.
|
Exécuter les tests unitaires/d'intégration du projet.
|
||||||
|
|
||||||
### `make build`
|
#### `make build`
|
||||||
|
|
||||||
Compiler une version de développement du binaire `bouncer`.
|
Compiler une version de développement du binaire `bouncer`.
|
||||||
|
|
||||||
### `make docker-build`
|
#### `make docker-build`
|
||||||
|
|
||||||
Construire une image Docker pour Bouncer.
|
Construire une image Docker pour Bouncer.
|
||||||
|
|
||||||
@ -92,13 +92,6 @@ docker run \
|
|||||||
bouncer server proxy run
|
bouncer server proxy run
|
||||||
```
|
```
|
||||||
|
|
||||||
### `make grafterm`
|
|
||||||
|
|
||||||
Afficher un tableau de bord [`grafterm`](https://github.com/slok/grafterm) branché sur l'instance Prometheus locale.
|
|
||||||
|
|
||||||
### `make siege`
|
|
||||||
|
|
||||||
Lancer une session de test [`siege`](https://github.com/JoeDog/siege) sur l'instance `bouncer-proxy` locale.
|
|
||||||
## Arborescence du projet
|
## Arborescence du projet
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
13
go.mod
13
go.mod
@ -6,7 +6,6 @@ require (
|
|||||||
forge.cadoles.com/Cadoles/go-proxy v0.0.0-20230701194111-c6b3d482cca6
|
forge.cadoles.com/Cadoles/go-proxy v0.0.0-20230701194111-c6b3d482cca6
|
||||||
github.com/Masterminds/sprig/v3 v3.2.3
|
github.com/Masterminds/sprig/v3 v3.2.3
|
||||||
github.com/btcsuite/btcd/btcutil v1.1.3
|
github.com/btcsuite/btcd/btcutil v1.1.3
|
||||||
github.com/drone/envsubst v1.0.3
|
|
||||||
github.com/getsentry/sentry-go v0.22.0
|
github.com/getsentry/sentry-go v0.22.0
|
||||||
github.com/go-chi/chi/v5 v5.0.8
|
github.com/go-chi/chi/v5 v5.0.8
|
||||||
github.com/jedib0t/go-pretty/v6 v6.4.6
|
github.com/jedib0t/go-pretty/v6 v6.4.6
|
||||||
@ -60,7 +59,7 @@ require (
|
|||||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
|
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
|
||||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
|
||||||
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.9.0 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
|
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
|
||||||
google.golang.org/protobuf v1.30.0 // indirect
|
google.golang.org/protobuf v1.30.0 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
@ -80,11 +79,11 @@ require (
|
|||||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||||
github.com/google/uuid v1.3.0
|
github.com/google/uuid v1.3.0
|
||||||
github.com/leodido/go-urn v1.2.1 // indirect
|
github.com/leodido/go-urn v1.2.1 // indirect
|
||||||
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
|
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
|
||||||
github.com/lestrrat-go/httpcc v1.0.1 // indirect
|
github.com/lestrrat-go/httpcc v1.0.1 // indirect
|
||||||
github.com/lestrrat-go/httprc v1.0.4 // indirect
|
github.com/lestrrat-go/httprc v1.0.4 // indirect
|
||||||
github.com/lestrrat-go/iter v1.0.2 // indirect
|
github.com/lestrrat-go/iter v1.0.2 // indirect
|
||||||
github.com/lestrrat-go/jwx/v2 v2.0.19
|
github.com/lestrrat-go/jwx/v2 v2.0.11
|
||||||
github.com/lestrrat-go/option v1.0.1 // indirect
|
github.com/lestrrat-go/option v1.0.1 // indirect
|
||||||
github.com/lib/pq v1.10.0 // indirect
|
github.com/lib/pq v1.10.0 // indirect
|
||||||
github.com/lithammer/shortuuid/v4 v4.0.0
|
github.com/lithammer/shortuuid/v4 v4.0.0
|
||||||
@ -96,10 +95,10 @@ require (
|
|||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||||
gitlab.com/wpetit/goweb v0.0.0-20230419082146-a94d9ed7202b
|
gitlab.com/wpetit/goweb v0.0.0-20230419082146-a94d9ed7202b
|
||||||
go.opencensus.io v0.24.0 // indirect
|
go.opencensus.io v0.24.0 // indirect
|
||||||
golang.org/x/crypto v0.17.0 // indirect
|
golang.org/x/crypto v0.9.0 // indirect
|
||||||
golang.org/x/mod v0.9.0 // indirect
|
golang.org/x/mod v0.9.0 // indirect
|
||||||
golang.org/x/sys v0.15.0 // indirect
|
golang.org/x/sys v0.10.0 // indirect
|
||||||
golang.org/x/term v0.15.0 // indirect
|
golang.org/x/term v0.8.0 // indirect
|
||||||
golang.org/x/tools v0.7.0 // indirect
|
golang.org/x/tools v0.7.0 // indirect
|
||||||
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
|
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
|
||||||
gopkg.in/go-playground/validator.v9 v9.29.1 // indirect
|
gopkg.in/go-playground/validator.v9 v9.29.1 // indirect
|
||||||
|
55
go.sum
55
go.sum
@ -143,7 +143,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
|
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
|
||||||
|
github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
|
||||||
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
|
||||||
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
|
||||||
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc=
|
||||||
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
|
||||||
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
|
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
|
||||||
github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
|
github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
|
||||||
@ -162,8 +165,6 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
|
|||||||
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
||||||
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
|
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
|
||||||
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
||||||
github.com/drone/envsubst v1.0.3 h1:PCIBwNDYjs50AsLZPYdfhSATKaRg/FJmDc2D6+C2x8g=
|
|
||||||
github.com/drone/envsubst v1.0.3/go.mod h1:N2jZmlMufstn1KEqvbHjw40h1KyTmnVzHcSc9bFiJ2g=
|
|
||||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||||
@ -324,16 +325,19 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
|||||||
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
|
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
|
||||||
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
|
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
|
||||||
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
|
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
|
||||||
github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k=
|
github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80=
|
||||||
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
|
github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
|
||||||
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
|
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
|
||||||
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
|
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
|
||||||
github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJGdI8=
|
github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJGdI8=
|
||||||
github.com/lestrrat-go/httprc v1.0.4/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
|
github.com/lestrrat-go/httprc v1.0.4/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
|
||||||
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
|
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
|
||||||
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
|
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
|
||||||
github.com/lestrrat-go/jwx/v2 v2.0.19 h1:ekv1qEZE6BVct89QA+pRF6+4pCpfVrOnEJnTnT4RXoY=
|
github.com/lestrrat-go/jwx/v2 v2.0.9 h1:TRX4Q630UXxPVLvP5vGaqVJO7S+0PE6msRZUsFSBoC8=
|
||||||
github.com/lestrrat-go/jwx/v2 v2.0.19/go.mod h1:l3im3coce1lL2cDeAjqmaR+Awx+X8Ih+2k8BuHNJ4CU=
|
github.com/lestrrat-go/jwx/v2 v2.0.9/go.mod h1:K68euYaR95FnL0hIQB8VvzL70vB7pSifbJUydCTPmgM=
|
||||||
|
github.com/lestrrat-go/jwx/v2 v2.0.11 h1:ViHMnaMeaO0qV16RZWBHM7GTrAnX2aFLVKofc7FuKLQ=
|
||||||
|
github.com/lestrrat-go/jwx/v2 v2.0.11/go.mod h1:ZtPtMFlrfDrH2Y0iwfa3dRFn8VzwBrB+cyrm3IBWdDg=
|
||||||
|
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
|
||||||
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
|
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
|
||||||
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
|
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
|
||||||
github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
|
github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
|
||||||
@ -449,7 +453,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
|
|||||||
github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||||
|
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
|
||||||
|
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||||
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
|
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
|
||||||
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
||||||
@ -495,8 +502,11 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh
|
|||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
|
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||||
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
|
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
|
||||||
|
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
|
||||||
|
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
|
||||||
|
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -533,6 +543,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|||||||
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
|
golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
|
||||||
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
@ -577,7 +588,11 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
|
|||||||
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
||||||
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
|
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||||
|
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
|
||||||
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
||||||
|
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@ -606,6 +621,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
|
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -671,20 +687,28 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
|
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||||
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
|
||||||
|
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
||||||
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
|
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||||
|
golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
|
||||||
|
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
|
||||||
|
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
|
||||||
|
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
@ -695,8 +719,10 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
|
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
||||||
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
@ -755,6 +781,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
|||||||
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
|
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
|
||||||
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
|
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
@ -5,28 +5,15 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/admin"
|
"forge.cadoles.com/cadoles/bouncer/internal/admin"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/auth/jwt"
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/command/common"
|
"forge.cadoles.com/cadoles/bouncer/internal/command/common"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/jwk"
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/setup"
|
"forge.cadoles.com/cadoles/bouncer/internal/setup"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"gitlab.com/wpetit/goweb/logger"
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
flagPrintDefaultToken = "print-default-token"
|
|
||||||
)
|
|
||||||
|
|
||||||
func RunCommand() *cli.Command {
|
func RunCommand() *cli.Command {
|
||||||
flags := append(
|
flags := common.Flags()
|
||||||
common.Flags(),
|
|
||||||
&cli.BoolFlag{
|
|
||||||
Name: flagPrintDefaultToken,
|
|
||||||
Usage: "Generate and print a default writer token in console at startup",
|
|
||||||
Value: true,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
return &cli.Command{
|
return &cli.Command{
|
||||||
Name: "run",
|
Name: "run",
|
||||||
@ -49,22 +36,6 @@ func RunCommand() *cli.Command {
|
|||||||
|
|
||||||
defer flushSentry()
|
defer flushSentry()
|
||||||
|
|
||||||
if printDefaultToken := ctx.Bool(flagPrintDefaultToken); printDefaultToken {
|
|
||||||
key, err := jwk.Generate(jwk.DefaultKeySize)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "could not generate default key")
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := jwt.GenerateToken(ctx.Context, key, string(conf.Admin.Auth.Issuer), "default-admin", jwt.Role(jwt.RoleWriter))
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.SetLevel(logger.LevelInfo)
|
|
||||||
logger.Info(ctx.Context, "default writer token", logger.F("token", token))
|
|
||||||
logger.SetLevel(logger.Level(conf.Logger.Level))
|
|
||||||
}
|
|
||||||
|
|
||||||
srv := admin.NewServer(
|
srv := admin.NewServer(
|
||||||
admin.WithServerConfig(conf.Admin),
|
admin.WithServerConfig(conf.Admin),
|
||||||
admin.WithRedisConfig(conf.Redis),
|
admin.WithRedisConfig(conf.Redis),
|
||||||
|
@ -6,13 +6,11 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/drone/envsubst"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
// var reVar = regexp.MustCompile(`^\${(\w+)}$`)
|
var reVar = regexp.MustCompile(`^\${(\w+)}$`)
|
||||||
var reVar = regexp.MustCompile(`\${(.*?)}`)
|
|
||||||
|
|
||||||
type InterpolatedString string
|
type InterpolatedString string
|
||||||
|
|
||||||
@ -132,22 +130,14 @@ type InterpolatedStringSlice []string
|
|||||||
|
|
||||||
func (iss *InterpolatedStringSlice) UnmarshalYAML(value *yaml.Node) error {
|
func (iss *InterpolatedStringSlice) UnmarshalYAML(value *yaml.Node) error {
|
||||||
var data []string
|
var data []string
|
||||||
var evErr error
|
|
||||||
|
|
||||||
if err := value.Decode(&data); err != nil {
|
if err := value.Decode(&data); err != nil {
|
||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into map", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into map", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
for index, value := range data {
|
for index, value := range data {
|
||||||
//match := reVar.FindStringSubmatch(value)
|
if match := reVar.FindStringSubmatch(value); len(match) > 0 {
|
||||||
re := regexp.MustCompile(`\${(.*?)}`)
|
value = os.Getenv(match[1])
|
||||||
|
|
||||||
res := re.FindAllStringSubmatch(value, 10)
|
|
||||||
if len(res) > 0 {
|
|
||||||
value, evErr = envsubst.EvalEnv(value)
|
|
||||||
if evErr != nil {
|
|
||||||
return evErr
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data[index] = value
|
data[index] = value
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
import "time"
|
|
||||||
|
|
||||||
const (
|
const (
|
||||||
RedisModeSimple = "simple"
|
RedisModeSimple = "simple"
|
||||||
RedisModeSentinel = "sentinel"
|
RedisModeSentinel = "sentinel"
|
||||||
@ -9,19 +7,13 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type RedisConfig struct {
|
type RedisConfig struct {
|
||||||
Adresses InterpolatedStringSlice `yaml:"addresses"`
|
Adresses InterpolatedStringSlice `yaml:"addresses"`
|
||||||
Master InterpolatedString `yaml:"master"`
|
Master InterpolatedString `yaml:"master"`
|
||||||
ReadTimeout InterpolatedDuration `yaml:"readTimeout"`
|
|
||||||
WriteTimeout InterpolatedDuration `yaml:"writeTimeout"`
|
|
||||||
DialTimeout InterpolatedDuration `yaml:"dialTimeout"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDefaultRedisConfig() RedisConfig {
|
func NewDefaultRedisConfig() RedisConfig {
|
||||||
return RedisConfig{
|
return RedisConfig{
|
||||||
Adresses: InterpolatedStringSlice{"localhost:6379"},
|
Adresses: InterpolatedStringSlice{"localhost:6379"},
|
||||||
Master: "",
|
Master: "",
|
||||||
ReadTimeout: InterpolatedDuration(30 * time.Second),
|
|
||||||
WriteTimeout: InterpolatedDuration(30 * time.Second),
|
|
||||||
DialTimeout: InterpolatedDuration(30 * time.Second),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4
internal/config/testdata/config.yml
vendored
4
internal/config/testdata/config.yml
vendored
@ -2,5 +2,5 @@ logger:
|
|||||||
level: 0
|
level: 0
|
||||||
format: human
|
format: human
|
||||||
http:
|
http:
|
||||||
host: "${LISTEN_ADDR}"
|
host: "0.0.0.0"
|
||||||
port: 3000
|
port: 3000
|
@ -4,6 +4,7 @@ import (
|
|||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/btcsuite/btcd/btcutil/base58"
|
"github.com/btcsuite/btcd/btcutil/base58"
|
||||||
@ -55,7 +56,7 @@ func PublicKeySet(keys ...jwk.Key) (jwk.Set, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func LoadOrGenerate(path string, size int) (jwk.Key, error) {
|
func LoadOrGenerate(path string, size int) (jwk.Key, error) {
|
||||||
data, err := os.ReadFile(path)
|
data, err := ioutil.ReadFile(path)
|
||||||
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -71,7 +72,7 @@ func LoadOrGenerate(path string, size int) (jwk.Key, error) {
|
|||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.WriteFile(path, data, 0o640); err != nil {
|
if err := ioutil.WriteFile(path, data, 0o640); err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func NewProxyRepository(ctx context.Context, conf config.RedisConfig) (store.ProxyRepository, error) {
|
func NewProxyRepository(ctx context.Context, conf config.RedisConfig) (store.ProxyRepository, error) {
|
||||||
rdb := newRedisClient(conf)
|
rdb := redis.NewUniversalClient(&redis.UniversalOptions{
|
||||||
|
Addrs: conf.Adresses,
|
||||||
|
MasterName: string(conf.Master),
|
||||||
|
})
|
||||||
|
|
||||||
return redisStore.NewProxyRepository(rdb), nil
|
return redisStore.NewProxyRepository(rdb), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@ import (
|
|||||||
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/queue"
|
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/queue"
|
||||||
queueRedis "forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/queue/redis"
|
queueRedis "forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/queue/redis"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
"github.com/redis/go-redis/v9"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -35,6 +36,10 @@ func setupQueueLayer(conf *config.Config) (director.Layer, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func newQueueAdapter(redisConf config.RedisConfig) (queue.Adapter, error) {
|
func newQueueAdapter(redisConf config.RedisConfig) (queue.Adapter, error) {
|
||||||
rdb := newRedisClient(redisConf)
|
rdb := redis.NewUniversalClient(&redis.UniversalOptions{
|
||||||
|
Addrs: redisConf.Adresses,
|
||||||
|
MasterName: string(redisConf.Master),
|
||||||
|
})
|
||||||
|
|
||||||
return queueRedis.NewAdapter(rdb, 2), nil
|
return queueRedis.NewAdapter(rdb, 2), nil
|
||||||
}
|
}
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
package setup
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/config"
|
|
||||||
"github.com/redis/go-redis/v9"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newRedisClient(conf config.RedisConfig) redis.UniversalClient {
|
|
||||||
return redis.NewUniversalClient(&redis.UniversalOptions{
|
|
||||||
Addrs: conf.Adresses,
|
|
||||||
MasterName: string(conf.Master),
|
|
||||||
ReadTimeout: time.Duration(conf.ReadTimeout),
|
|
||||||
WriteTimeout: time.Duration(conf.WriteTimeout),
|
|
||||||
DialTimeout: time.Duration(conf.DialTimeout),
|
|
||||||
RouteByLatency: true,
|
|
||||||
ContextTimeoutEnabled: true,
|
|
||||||
})
|
|
||||||
}
|
|
@ -2,7 +2,6 @@ package testsuite
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"reflect"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
||||||
@ -49,187 +48,6 @@ var layerRepositoryTestCases = []layerRepositoryTestCase{
|
|||||||
return errors.Errorf("layer.UpdatedAt should not be zero value")
|
return errors.Errorf("layer.UpdatedAt should not be zero value")
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "Create then get layer",
|
|
||||||
Do: func(repo store.LayerRepository) error {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
var proxyName store.ProxyName = "create_then_get_layer_proxy"
|
|
||||||
var layerName store.LayerName = "create_then_get_layer"
|
|
||||||
var layerType store.LayerType = "dummy"
|
|
||||||
var layerOptions store.LayerOptions = store.LayerOptions{
|
|
||||||
"foo": "bar",
|
|
||||||
"test": struct {
|
|
||||||
Items []int `json:"items"`
|
|
||||||
}{
|
|
||||||
Items: []int{1, 2, 3},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
createdLayer, err := repo.CreateLayer(ctx, proxyName, layerName, layerType, layerOptions)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
foundLayer, err := repo.GetLayer(ctx, proxyName, layerName)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.Name, foundLayer.Name; e != g {
|
|
||||||
return errors.Errorf("foundLayer.Name: expected '%v', got '%v'", createdLayer.Name, foundLayer.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.CreatedAt, foundLayer.CreatedAt; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.CreatedAt: expected '%v', got '%v'", createdLayer.CreatedAt, foundLayer.CreatedAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.UpdatedAt, foundLayer.UpdatedAt; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.UpdatedAt: expected '%v', got '%v'", createdLayer.UpdatedAt, foundLayer.UpdatedAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.Enabled, foundLayer.Enabled; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.Enabled: expected '%v', got '%v'", createdLayer.Enabled, foundLayer.Enabled)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.Weight, foundLayer.Weight; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.Weight: expected '%v', got '%v'", createdLayer.Weight, foundLayer.Weight)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.Proxy, foundLayer.Proxy; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.Proxy: expected '%v', got '%v'", createdLayer.Proxy, foundLayer.Proxy)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdLayer.Options, foundLayer.Options; !reflect.DeepEqual(e, g) {
|
|
||||||
return errors.Errorf("foundLayer.Options: expected '%v', got '%v'", createdLayer.Options, foundLayer.Options)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "Create then delete layer",
|
|
||||||
Do: func(repo store.LayerRepository) error {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
var layerName store.LayerName = "create_then_delete_layer"
|
|
||||||
var proxyName store.ProxyName = store.ProxyName(string(layerName) + "_proxy")
|
|
||||||
var layerType store.LayerType = "dummy"
|
|
||||||
var layerOptions store.LayerOptions = store.LayerOptions{
|
|
||||||
"foo": "bar",
|
|
||||||
"test": struct {
|
|
||||||
Items []int `json:"items"`
|
|
||||||
}{
|
|
||||||
Items: []int{1, 2, 3},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
createdLayer, err := repo.CreateLayer(ctx, proxyName, layerName, layerType, layerOptions)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := repo.DeleteLayer(ctx, createdLayer.Proxy, createdLayer.Name); err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
foundLayer, err := repo.GetLayer(ctx, createdLayer.Proxy, createdLayer.Name)
|
|
||||||
if err == nil {
|
|
||||||
return errors.New("err should not be nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
if !errors.Is(err, store.ErrNotFound) {
|
|
||||||
return errors.Errorf("err should be store.ErrNotFound, got '%+v'", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if foundLayer != nil {
|
|
||||||
return errors.Errorf("foundLayer should be nil, got '%v'", foundLayer)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "Create already existing layer",
|
|
||||||
Do: func(repo store.LayerRepository) error {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
var layerName store.LayerName = "create_already_existing_layer"
|
|
||||||
var proxyName store.ProxyName = store.ProxyName(string(layerName) + "_proxy")
|
|
||||||
var layerType store.LayerType = "dummy"
|
|
||||||
var layerOptions store.LayerOptions = store.LayerOptions{
|
|
||||||
"foo": "bar",
|
|
||||||
"test": struct {
|
|
||||||
Items []int `json:"items"`
|
|
||||||
}{
|
|
||||||
Items: []int{1, 2, 3},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := repo.CreateLayer(ctx, proxyName, layerName, layerType, layerOptions)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err = repo.CreateLayer(ctx, proxyName, layerName, layerType, layerOptions)
|
|
||||||
if err == nil {
|
|
||||||
return errors.New("err should not be nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
if !errors.Is(err, store.ErrAlreadyExist) {
|
|
||||||
return errors.Errorf("err: expected store.ErrAlreadyExists, got '%+v'", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "Create then query layer",
|
|
||||||
Do: func(repo store.LayerRepository) error {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
var layerName store.LayerName = "create_then_query_layer"
|
|
||||||
var proxyName store.ProxyName = store.ProxyName(string(layerName) + "_proxy")
|
|
||||||
var layerType store.LayerType = "dummy"
|
|
||||||
var layerOptions store.LayerOptions = store.LayerOptions{
|
|
||||||
"foo": "bar",
|
|
||||||
"test": struct {
|
|
||||||
Items []int `json:"items"`
|
|
||||||
}{
|
|
||||||
Items: []int{1, 2, 3},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
createdLayer, err := repo.CreateLayer(ctx, proxyName, layerName, layerType, layerOptions)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
headers, err := repo.QueryLayers(ctx, createdLayer.Proxy)
|
|
||||||
if err != nil {
|
|
||||||
return errors.WithStack(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(headers) < 1 {
|
|
||||||
return errors.Errorf("len(headers): expected value > 1, got '%v'", len(headers))
|
|
||||||
}
|
|
||||||
|
|
||||||
found := false
|
|
||||||
|
|
||||||
for _, h := range headers {
|
|
||||||
if h.Name == createdLayer.Name {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !found {
|
|
||||||
return errors.New("could not find created layer in query results")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -83,14 +83,6 @@ var proxyRepositoryTestCases = []proxyRepositoryTestCase{
|
|||||||
return errors.Errorf("foundProxy.To: expected '%v', got '%v'", createdProxy.To, foundProxy.To)
|
return errors.Errorf("foundProxy.To: expected '%v', got '%v'", createdProxy.To, foundProxy.To)
|
||||||
}
|
}
|
||||||
|
|
||||||
if e, g := createdProxy.Enabled, foundProxy.Enabled; e != g {
|
|
||||||
return errors.Errorf("foundProxy.Enabled: expected '%v', got '%v'", createdProxy.Enabled, foundProxy.Enabled)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdProxy.Weight, foundProxy.Weight; e != g {
|
|
||||||
return errors.Errorf("foundProxy.Weight: expected '%v', got '%v'", createdProxy.Weight, foundProxy.Weight)
|
|
||||||
}
|
|
||||||
|
|
||||||
if e, g := createdProxy.CreatedAt, foundProxy.CreatedAt; e != g {
|
if e, g := createdProxy.CreatedAt, foundProxy.CreatedAt; e != g {
|
||||||
return errors.Errorf("foundProxy.CreatedAt: expected '%v', got '%v'", createdProxy.CreatedAt, foundProxy.CreatedAt)
|
return errors.Errorf("foundProxy.CreatedAt: expected '%v', got '%v'", createdProxy.CreatedAt, foundProxy.CreatedAt)
|
||||||
}
|
}
|
||||||
@ -135,7 +127,7 @@ var proxyRepositoryTestCases = []proxyRepositoryTestCase{
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "Create then query layer",
|
Name: "Create then query",
|
||||||
Do: func(repo store.ProxyRepository) error {
|
Do: func(repo store.ProxyRepository) error {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
|
@ -1,196 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "v1",
|
|
||||||
"datasources": {
|
|
||||||
"prometheus": {
|
|
||||||
"prometheus": {
|
|
||||||
"address": "http://127.0.0.1:9090"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dashboard": {
|
|
||||||
"variables": {
|
|
||||||
"job": {
|
|
||||||
"constant": { "value": "bouncer-proxy" }
|
|
||||||
},
|
|
||||||
"interval": {
|
|
||||||
"interval": { "steps": 50 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"widgets": [
|
|
||||||
{
|
|
||||||
"title": "Bouncer - Total queue sessions",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"thresholds": [{ "color": "#47D038" }],
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(bouncer_layer_queue_sessions{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Bouncer Traffic",
|
|
||||||
"gridPos": {
|
|
||||||
"w": 80
|
|
||||||
},
|
|
||||||
"graph": {
|
|
||||||
"queries": [
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(rate(bouncer_proxy_director_proxy_requests_total{job=\"{{.job}}\"}[{{.interval}}]))",
|
|
||||||
"legend": "req/s"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Goroutines",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"thresholds": [{ "color": "#47D038" }],
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_goroutines{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "GC duration",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"unit": "second",
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "max(go_gc_duration_seconds{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Stack",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"unit": "bytes",
|
|
||||||
"thresholds": [{ "color": "#22F1F1" }],
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_stack_inuse_bytes{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Heap",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"unit": "bytes",
|
|
||||||
"thresholds": [{ "color": "#22F1F1" }],
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_heap_inuse_bytes{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Alloc",
|
|
||||||
"gridPos": { "w": 20 },
|
|
||||||
"singlestat": {
|
|
||||||
"unit": "bytes",
|
|
||||||
"thresholds": [{ "color": "#22F1F1" }],
|
|
||||||
"query": {
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_alloc_bytes{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Goroutines",
|
|
||||||
"gridPos": { "w": 50 },
|
|
||||||
"graph": {
|
|
||||||
"visualization": {
|
|
||||||
"legend": { "disable": true },
|
|
||||||
"yAxis": { "unit": "", "decimals": 2 }
|
|
||||||
},
|
|
||||||
"queries": [
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_goroutines{job=\"{{.job}}\"})"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "GC duration",
|
|
||||||
"gridPos": { "w": 50 },
|
|
||||||
"graph": {
|
|
||||||
"queries": [
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "max(go_gc_duration_seconds{job=\"{{.job}}\"}) by (quantile)",
|
|
||||||
"legend": "Q{{.quantile}}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"visualization": {
|
|
||||||
"yAxis": { "unit": "second" },
|
|
||||||
"seriesOverride": [
|
|
||||||
{ "regex": "^Q0$", "color": "#F9E2D2" },
|
|
||||||
{ "regex": "^Q0.25$", "color": "#F2C96D" },
|
|
||||||
{ "regex": "^Q0.5(0)?$", "color": "#EAB839" },
|
|
||||||
{ "regex": "^Q0.75$", "color": "#EF843C" },
|
|
||||||
{ "regex": "^Q1(.0)?$", "color": "#E24D42" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Memory",
|
|
||||||
"gridPos": { "w": 50 },
|
|
||||||
"graph": {
|
|
||||||
"visualization": {
|
|
||||||
"yAxis": { "unit": "byte", "decimals": 0 }
|
|
||||||
},
|
|
||||||
"queries": [
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_stack_inuse_bytes{job=\"{{.job}}\"})",
|
|
||||||
"legend": "stack inuse"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_heap_inuse_bytes{job=\"{{.job}}\"})",
|
|
||||||
"legend": "heap inuse"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(go_memstats_alloc_bytes{job=\"{{.job}}\"})",
|
|
||||||
"legend": "alloc"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "Memory ops rate",
|
|
||||||
"gridPos": {
|
|
||||||
"w": 50
|
|
||||||
},
|
|
||||||
"graph": {
|
|
||||||
"queries": [
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(rate(go_memstats_frees_total{job=\"{{.job}}\"}[{{.interval}}]))",
|
|
||||||
"legend": "frees/s"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(rate(go_memstats_mallocs_total{job=\"{{.job}}\"}[{{.interval}}]))",
|
|
||||||
"legend": "mallocs/s"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"datasourceID": "prometheus",
|
|
||||||
"expr": "sum(rate(go_memstats_lookups_total{job=\"{{.job}}\"}[{{.interval}}]))",
|
|
||||||
"legend": "lookups/s"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,49 +0,0 @@
|
|||||||
FROM golang:1.20 AS BUILD
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y make
|
|
||||||
|
|
||||||
ARG YQ_VERSION=4.34.1
|
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/bin \
|
|
||||||
&& wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64 \
|
|
||||||
&& chmod +x /usr/local/bin/yq
|
|
||||||
|
|
||||||
COPY . /src
|
|
||||||
|
|
||||||
WORKDIR /src
|
|
||||||
|
|
||||||
RUN make GORELEASER_ARGS='build --rm-dist --single-target --snapshot' goreleaser
|
|
||||||
|
|
||||||
# Patch config
|
|
||||||
RUN /src/dist/bouncer_linux_amd64_v1/bouncer -c '' config dump > /src/dist/bouncer_linux_amd64_v1/config.yml \
|
|
||||||
&& yq -i '.layers.queue.templateDir = "/usr/share/bouncer/layers/queue/templates"' /src/dist/bouncer_linux_amd64_v1/config.yml \
|
|
||||||
&& yq -i '.admin.auth.privateKey = "/etc/bouncer/admin-key.json"' /src/dist/bouncer_linux_amd64_v1/config.yml \
|
|
||||||
&& yq -i '.redis.adresses = ["redis:6379"]' /src/dist/bouncer_linux_amd64_v1/config.yml
|
|
||||||
|
|
||||||
FROM alpine:3.18 AS RUNTIME
|
|
||||||
|
|
||||||
ARG DUMB_INIT_VERSION=1.2.5
|
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates
|
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/bin \
|
|
||||||
&& wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 \
|
|
||||||
&& chmod +x /usr/local/bin/dumb-init
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
|
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/bin /usr/share/bouncer/bin /etc/bouncer
|
|
||||||
|
|
||||||
COPY --from=BUILD /src/dist/bouncer_linux_amd64_v1/bouncer /usr/share/bouncer/bin/bouncer
|
|
||||||
COPY --from=BUILD /src/layers /usr/share/bouncer/layers
|
|
||||||
COPY --from=BUILD /src/dist/bouncer_linux_amd64_v1/config.yml /etc/bouncer/config.yml
|
|
||||||
|
|
||||||
RUN ln -s /usr/share/bouncer/bin/bouncer /usr/local/bin/bouncer
|
|
||||||
|
|
||||||
EXPOSE 8080
|
|
||||||
EXPOSE 8081
|
|
||||||
|
|
||||||
ENV BOUNCER_CONFIG=/etc/bouncer/config.yml
|
|
||||||
|
|
||||||
CMD ["bouncer"]
|
|
@ -1,9 +0,0 @@
|
|||||||
# K6 - Load Test
|
|
||||||
|
|
||||||
Very basic load testing script for [k6](https://k6.io/).
|
|
||||||
|
|
||||||
## How to run
|
|
||||||
|
|
||||||
```shell
|
|
||||||
k6 run cadoles-loadtest.js
|
|
||||||
```
|
|
@ -1,29 +0,0 @@
|
|||||||
import { check } from 'k6';
|
|
||||||
import { browser } from 'k6/experimental/browser';
|
|
||||||
|
|
||||||
export const options = {
|
|
||||||
scenarios: {
|
|
||||||
browser: {
|
|
||||||
vus: 10,
|
|
||||||
iterations: 100,
|
|
||||||
executor: 'shared-iterations',
|
|
||||||
options: {
|
|
||||||
browser: {
|
|
||||||
type: 'chromium',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default async function () {
|
|
||||||
const page = browser.newPage();
|
|
||||||
try {
|
|
||||||
await page.goto('https://www.cadoles.com');
|
|
||||||
check(page, {
|
|
||||||
'Homepage loaded': p => p.locator('h1').textContent().trim() == 'La liberté est un choix',
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
page.close();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,66 +0,0 @@
|
|||||||
# Kubernetes
|
|
||||||
|
|
||||||
## Initialize your project
|
|
||||||
|
|
||||||
1. Generate the Docker configuration to enable image builds with Kaniko and communicate with reg.cadoles.com
|
|
||||||
|
|
||||||
```shell
|
|
||||||
docker login reg.cadoles.com
|
|
||||||
mkdir -p misc/k8s/kustomization/base/secrets/dockerconfig
|
|
||||||
docker --config misc/k8s/kustomization/base/secrets/dockerconfig login reg.cadoles.com
|
|
||||||
mv misc/k8s/kustomization/base/secrets/dockerconfig/config.json misc/k8s/kustomization/base/secrets/dockerconfig/.dockerconfigjson
|
|
||||||
mkdir -p misc/k8s/kustomization/overlays/dev/secrets/dockerconfig
|
|
||||||
cp misc/k8s/kustomization/base/secrets/dockerconfig/.dockerconfigjson misc/k8s/kustomization/overlays/dev/secrets/dockerconfig/.dockerconfigjson
|
|
||||||
```
|
|
||||||
|
|
||||||
## Getting started with Kind
|
|
||||||
|
|
||||||
1. Create your [Kind](https://kind.sigs.k8s.io/) cluster
|
|
||||||
|
|
||||||
```shell
|
|
||||||
kind create cluster --config misc/k8s/kind/bouncer-cluster.yaml
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Deploy required operators
|
|
||||||
|
|
||||||
```shell
|
|
||||||
kubectl apply -k misc/k8s/kind/cluster --server-side
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Deploy your Bouncer development environment
|
|
||||||
|
|
||||||
```shell
|
|
||||||
skaffold dev -p dev --cleanup=false --default-repo reg.cadoles.com/<YOUR_PERSONNAL_USER_NAME>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
1. Open shell in bouncer-admin pod
|
|
||||||
|
|
||||||
```shell
|
|
||||||
kubectl exec -it -n bouncer-dev bouncer-admin-<suffix> -- /bin/sh
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Create an authentication token
|
|
||||||
|
|
||||||
```shell
|
|
||||||
bouncer --config /etc/bouncer/config.yml auth create-token --role writer --subject $(whoami) > .bouncer-token
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Create a proxy and enable it
|
|
||||||
|
|
||||||
```shell
|
|
||||||
bouncer admin proxy create --proxy-to https://www.cadoles.com --proxy-name cadoles
|
|
||||||
bouncer admin proxy update --proxy-name cadoles --proxy-enabled=true
|
|
||||||
```
|
|
||||||
|
|
||||||
4. With you host web browser, open http://localhost:9000, you should see the Cadoles website.
|
|
||||||
|
|
||||||
## Benchmarking
|
|
||||||
|
|
||||||
You can use [`siege`](https://github.com/JoeDog/siege) to benchmark your instance with the Cadoles proxy.
|
|
||||||
|
|
||||||
```shell
|
|
||||||
BASE_URL=http://localhost:9000 make siege
|
|
||||||
```
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
kind: Cluster
|
|
||||||
apiVersion: kind.x-k8s.io/v1alpha4
|
|
||||||
name: bouncer-dev
|
|
@ -1,5 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
|
|
@ -1,10 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
namespace: bouncer
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ./resources/namespace.yaml
|
|
||||||
- ./resources/bouncer-server
|
|
||||||
- ./resources/bouncer-admin
|
|
||||||
- ./resources/redis
|
|
||||||
|
|
@ -1 +0,0 @@
|
|||||||
{"d":"JuBw5OsGv3rPgVczxUgtJ6iUQ41LQu4Xpu-t8IKI_z8r-BZBlbndxidPmRlGZASLGL3rhY4qw6_ScFxakrMpCreO1RMU0kqtz--N48BXFnW5tEgr1voyyKP__bPssQNn6PgkoyAd11es7MEKlBff_DtGrcSkVRgU0zDZB-vIU0aNEIZPNw0icbYqc1u_QQNPpBU9cw6P33WHhzvfCVAkZKRszwznhiPM08n1vjpiA7e1kQ8a6OC4IFZBvohkmpmyOq1g1OLRABQ83YPCjGjCAejO-jEWkbLksp6rAl_YYpCvfBAjFV76JuZq4eh5IU82LsSfi3PGYBkhxWuLY779XQ","dp":"gljHOQowGK7fVn2DJizWtgRIDJuKpKnoX2PWNJUbm2WZwcEPZalAkxn7Y-w_reLVJZuRpfKEUMS-Tn3-CwI1ZjCHPqMPTXcoG0Pe2E-Z88jOs9lW4XSOASiiM980VIvkV1xCxDJkN3NsDFQ9j9kRGnKuMnsucCW3AKaU917hXNU","dq":"mqY19JcEBDnzS70_XkAsOKqPzemOScax66b-4N6zrsgeLVlRjHffY9uCAgBWzlxOidRdQN8q23ZJB4fqsKB2w00Iw7Jxx94IoAKGjKDT5iB48Y_kdKLAwSHRTXsqA9GG3po_H_JpP_EqX4TDBYtqQZuBD_tACP9HbLYMi_V2YU8","e":"AQAB","kty":"RSA","n":"sam0X0BGcuFwX8z3Wde8cv2o_zl6A9ghpkT0tCjw8qH3GNWrbAqzncSWdHBzoChBgAbuTOVs-ixYC0KeUhwFdc8Ul-jmKJWFaS8kIr3y4EH62-vLgMuIKfaxbsyUG6KMkJfnftge1jPO4ccddNej9msxcqTxu37dcgstutwtd6QkS9p5RrNbDBc8-Z7SQ4TuxJfP8msXRnCPJ-I44yszGdQF1Np2DXakJHVn8PBrDh3iSFwORw8jxNS4oS0OlBl5aSc0t5XkkaNcSU2a50SKts290w54fl6MPJ1sLnnznLy4uu37-nrfEUvqRLDZL9B1F82RM1dtLIIiN4gnSrMlpQ","p":"wOmFPhAT_wXWzMuwtEdYIer3-CiOWxFKpFL09eEJkJ29MIUchEaoiJaUAghqPxM48llfOVaUaLbFVxmo5U3fyjNMaP-nHMUBwojutykMK-gC2R3J4bQgFWfKbGSL7M7UsextAvpq9iiOuR0LNE-xTfCgPIxHVdPZskO3yx0DkjM","q":"68OGRb0tLRjb_PpkGctcSjEz_vvcyjzxGL-fn4_h4GCw98Xrj6Y4rZ4lfWWRSeDohSvdd-ICSlxvxkQOIOcA0H7jyJcBC0KDs4hX5BRGJNDri3QX0ry4_F1ptAdbfiFgQGqCfMRCr7L60Tfd_6tLczvny7eEBKQNGdj6dLfhgMc","qi":"DFwixyxUDf0REPLLa8hOKieRL95_AH9rbYWzStBOdSjKWra5l0reD6a4bbvAYvl0e8qCcRI6S8Nzpz0BYm4sJL7poVOnjxqvBY3Q9Ppf4Mq8lW39pOCJcqOHIvvYHsMjTC5uwp7Yg2p0GvxuUibbyNL1PXf6WZ_szVP_oSMrCXA"}
|
|
@ -1,36 +0,0 @@
|
|||||||
admin:
|
|
||||||
http:
|
|
||||||
host: 127.0.0.1
|
|
||||||
port: 8081
|
|
||||||
cors:
|
|
||||||
allowedOrigins:
|
|
||||||
- http://localhost:3001
|
|
||||||
allowCredentials: true
|
|
||||||
allowMethods:
|
|
||||||
- POST
|
|
||||||
- GET
|
|
||||||
- PUT
|
|
||||||
- DELETE
|
|
||||||
allowedHeaders:
|
|
||||||
- Origin
|
|
||||||
- Accept
|
|
||||||
- Content-Type
|
|
||||||
- Authorization
|
|
||||||
- Sentry-Trace
|
|
||||||
debug: false
|
|
||||||
auth:
|
|
||||||
issuer: http://127.0.0.1:8081
|
|
||||||
privateKey: /etc/bouncer/admin-key.json
|
|
||||||
metrics:
|
|
||||||
enabled: true
|
|
||||||
endpoint: /.bouncer/metrics
|
|
||||||
basicAuth: null
|
|
||||||
|
|
||||||
redis:
|
|
||||||
addresses:
|
|
||||||
- rfs-bouncer-redis:${RFS_BOUNCER_REDIS_SERVICE_PORT}
|
|
||||||
master: mymaster
|
|
||||||
|
|
||||||
logger:
|
|
||||||
level: 2
|
|
||||||
format: human
|
|
@ -1,12 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ./resources/service.yaml
|
|
||||||
- ./resources/deployment.yaml
|
|
||||||
|
|
||||||
configMapGenerator:
|
|
||||||
- name: bouncer-admin-config
|
|
||||||
files:
|
|
||||||
- ./files/config.yml
|
|
||||||
- ./files/admin-key.json
|
|
@ -1,34 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: bouncer-admin
|
|
||||||
labels:
|
|
||||||
app: bouncer-admin
|
|
||||||
io.kompose.service: bouncer-admin
|
|
||||||
spec:
|
|
||||||
replicas: 3
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: bouncer-admin
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: bouncer-admin
|
|
||||||
io.kompose.service: bouncer-admin
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: bouncer-admin
|
|
||||||
image: reg.cadoles.com/cadoles/bouncer:v2024.2.5-1602626
|
|
||||||
command: ["bouncer", "--debug", "-c", "/etc/bouncer/config.yml", "server", "admin", "run"]
|
|
||||||
imagePullPolicy: Always
|
|
||||||
resources: {}
|
|
||||||
ports:
|
|
||||||
- name: bouncer-admin
|
|
||||||
containerPort: 8081
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /etc/bouncer/
|
|
||||||
name: bouncer-admin-config
|
|
||||||
volumes:
|
|
||||||
- name: bouncer-admin-config
|
|
||||||
configMap:
|
|
||||||
name: bouncer-admin-config
|
|
@ -1,14 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
io.kompose.service: bouncer-admin
|
|
||||||
name: bouncer-admin
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
ports:
|
|
||||||
- name: bouncer-admin
|
|
||||||
port: 8081
|
|
||||||
targetPort: bouncer-admin
|
|
||||||
selector:
|
|
||||||
io.kompose.service: bouncer-admin
|
|
@ -1,22 +0,0 @@
|
|||||||
proxy:
|
|
||||||
http:
|
|
||||||
host: 0.0.0.0
|
|
||||||
port: 8080
|
|
||||||
metrics:
|
|
||||||
enabled: true
|
|
||||||
endpoint: /.bouncer/metrics
|
|
||||||
basicAuth: null
|
|
||||||
|
|
||||||
layers:
|
|
||||||
queue:
|
|
||||||
templateDir: /usr/share/bouncer/layers/queue/templates
|
|
||||||
defaultKeepAlive: 1m0s
|
|
||||||
|
|
||||||
redis:
|
|
||||||
addresses:
|
|
||||||
- rfs-bouncer-redis:${RFS_BOUNCER_REDIS_SERVICE_PORT}
|
|
||||||
master: mymaster
|
|
||||||
|
|
||||||
logger:
|
|
||||||
level: 2
|
|
||||||
format: human
|
|
@ -1,11 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ./resources/service.yaml
|
|
||||||
- ./resources/deployment.yaml
|
|
||||||
|
|
||||||
configMapGenerator:
|
|
||||||
- name: bouncer-server-config
|
|
||||||
files:
|
|
||||||
- ./files/config.yml
|
|
@ -1,34 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: bouncer-server
|
|
||||||
labels:
|
|
||||||
app: bouncer-server
|
|
||||||
io.kompose.service: bouncer-server
|
|
||||||
spec:
|
|
||||||
replicas: 3
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: bouncer-server
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: bouncer-server
|
|
||||||
io.kompose.service: bouncer-server
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: bouncer-server
|
|
||||||
image: reg.cadoles.com/cadoles/bouncer:v2024.2.5-1602626
|
|
||||||
command: ["bouncer", "-c", "/etc/bouncer/config.yml", "server", "proxy", "run"]
|
|
||||||
imagePullPolicy: Always
|
|
||||||
resources: {}
|
|
||||||
ports:
|
|
||||||
- name: bouncer-server
|
|
||||||
containerPort: 8080
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /etc/bouncer/
|
|
||||||
name: bouncer-server-config
|
|
||||||
volumes:
|
|
||||||
- name: bouncer-server-config
|
|
||||||
configMap:
|
|
||||||
name: bouncer-server-config
|
|
@ -1,14 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
io.kompose.service: bouncer-server
|
|
||||||
name: bouncer-server
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
ports:
|
|
||||||
- name: bouncer-server
|
|
||||||
port: 8080
|
|
||||||
targetPort: bouncer-server
|
|
||||||
selector:
|
|
||||||
io.kompose.service: bouncer-server
|
|
@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: bouncer
|
|
@ -1,15 +0,0 @@
|
|||||||
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ./resources/redis-cluster.yaml
|
|
||||||
|
|
||||||
vars:
|
|
||||||
- name: REDIS_SERVICE_NAME
|
|
||||||
objref:
|
|
||||||
name: bouncer-redis
|
|
||||||
apiVersion: databases.spotahome.com/v1
|
|
||||||
kind: RedisFailover
|
|
||||||
fieldref:
|
|
||||||
fieldpath: metadata.name
|
|
@ -1,21 +0,0 @@
|
|||||||
apiVersion: databases.spotahome.com/v1
|
|
||||||
kind: RedisFailover
|
|
||||||
metadata:
|
|
||||||
name: bouncer-redis
|
|
||||||
spec:
|
|
||||||
sentinel:
|
|
||||||
replicas: 3
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
limits:
|
|
||||||
memory: 100Mi
|
|
||||||
redis:
|
|
||||||
replicas: 3
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 100Mi
|
|
||||||
limits:
|
|
||||||
cpu: 400m
|
|
||||||
memory: 500Mi
|
|
@ -1,18 +0,0 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
namespace: bouncer-dev
|
|
||||||
|
|
||||||
resources:
|
|
||||||
- ../../base
|
|
||||||
|
|
||||||
secretGenerator:
|
|
||||||
- files:
|
|
||||||
- secrets/dockerconfig/.dockerconfigjson
|
|
||||||
name: regcred-dev
|
|
||||||
type: kubernetes.io/dockerconfigjson
|
|
||||||
|
|
||||||
patches:
|
|
||||||
- path: patches/add-registry-pull-secret.patch.yaml
|
|
||||||
target:
|
|
||||||
kind: Deployment
|
|
||||||
version: v1
|
|
@ -1,4 +0,0 @@
|
|||||||
- op: add
|
|
||||||
path: "/spec/template/spec/imagePullSecrets"
|
|
||||||
value:
|
|
||||||
- name: regcred-dev
|
|
@ -1,179 +1,176 @@
|
|||||||
# Configuration du service "admin"
|
# Configuration du service "admin"
|
||||||
admin:
|
admin:
|
||||||
http:
|
http:
|
||||||
# Hôte d'écoute du service,
|
# Hôte d'écoute du service,
|
||||||
# 0.0.0.0 pour écouter sur toutes les interfaces
|
# 0.0.0.0 pour écouter sur toutes les interfaces
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
# Port d'écoute du service
|
# Port d'écoute du service
|
||||||
port: 8081
|
port: 8081
|
||||||
# Utiliser les entêtes HTTP True-Client-IP, X-Real-IP ou X-Forwarded-For
|
# Utiliser les entêtes HTTP True-Client-IP, X-Real-IP ou X-Forwarded-For
|
||||||
# pour le calcul de l'adresse distante à l'origine des requêtes
|
# pour le calcul de l'adresse distante à l'origine des requêtes
|
||||||
useRealIP: true
|
useRealIP: true
|
||||||
|
|
||||||
# Configuration CORS du service
|
# Configuration CORS du service
|
||||||
# Uniquement nécessaire si un frontend web
|
# Uniquement nécessaire si un frontend web
|
||||||
# est branché sur l'API d'administration.
|
# est branché sur l'API d'administration.
|
||||||
cors:
|
cors:
|
||||||
allowedOrigins:
|
allowedOrigins:
|
||||||
- http://localhost:8081
|
- http://localhost:8081
|
||||||
allowCredentials: true
|
allowCredentials: true
|
||||||
allowMethods:
|
allowMethods:
|
||||||
- POST
|
- POST
|
||||||
- GET
|
- GET
|
||||||
- PUT
|
- PUT
|
||||||
- DELETE
|
- DELETE
|
||||||
allowedHeaders:
|
allowedHeaders:
|
||||||
- Origin
|
- Origin
|
||||||
- Accept
|
- Accept
|
||||||
- Content-Type
|
- Content-Type
|
||||||
- Authorization
|
- Authorization
|
||||||
- Sentry-Trace
|
- Sentry-Trace
|
||||||
debug: false
|
debug: false
|
||||||
|
|
||||||
|
# Authentification JWT
|
||||||
|
auth:
|
||||||
|
# Origine du jeton JWT
|
||||||
|
issuer: http://127.0.0.1:8081
|
||||||
|
# Clé privée permettant de signer les jetons
|
||||||
|
# JWT générés pour l'usage de l'API d'administration.
|
||||||
|
privateKey: /etc/bouncer/admin-key.json
|
||||||
|
|
||||||
# Authentification JWT
|
# Métriques Prometheus
|
||||||
auth:
|
metrics:
|
||||||
# Origine du jeton JWT
|
# Activer ou désactiver la publication des métriques
|
||||||
issuer: http://127.0.0.1:8081
|
enabled: true
|
||||||
# Clé privée permettant de signer les jetons
|
# Route de publication des métriques
|
||||||
# JWT générés pour l'usage de l'API d'administration.
|
endpoint: /.bouncer/metrics
|
||||||
privateKey: /etc/bouncer/admin-key.json
|
# Authentification "basic auth" sur la page
|
||||||
|
# de publication
|
||||||
# Métriques Prometheus
|
# Mettre à null pour désactiver l'authentification
|
||||||
metrics:
|
basicAuth: null
|
||||||
# Activer ou désactiver la publication des métriques
|
|
||||||
enabled: true
|
# Configuration de l'intégration Sentry
|
||||||
# Route de publication des métriques
|
# Voir https://pkg.go.dev/github.com/getsentry/sentry-go?utm_source=godoc#ClientOptions
|
||||||
endpoint: /.bouncer/metrics
|
sentry:
|
||||||
# Authentification "basic auth" sur la page
|
dsn: ""
|
||||||
# de publication
|
debug: false
|
||||||
# Mettre à null pour désactiver l'authentification
|
flushTimeout: 2s
|
||||||
basicAuth: null
|
attachStacktrace: true
|
||||||
|
sampleRate: 1
|
||||||
# Configuration de l'intégration Sentry
|
enableTracing: true
|
||||||
# Voir https://pkg.go.dev/github.com/getsentry/sentry-go?utm_source=godoc#ClientOptions
|
tracesSampleRate: 0.2
|
||||||
sentry:
|
profilesSampleRate: 1
|
||||||
dsn: ""
|
ignoreErrors: []
|
||||||
debug: false
|
sendDefaultPII: false
|
||||||
flushTimeout: 2s
|
serverName: ""
|
||||||
attachStacktrace: true
|
environment: ""
|
||||||
sampleRate: 1
|
maxBreadcrumbs: 0
|
||||||
enableTracing: true
|
maxSpans: 1000
|
||||||
tracesSampleRate: 0.2
|
maxErrorDepth: 10
|
||||||
profilesSampleRate: 1
|
|
||||||
ignoreErrors: []
|
|
||||||
sendDefaultPII: false
|
|
||||||
serverName: ""
|
|
||||||
environment: ""
|
|
||||||
maxBreadcrumbs: 0
|
|
||||||
maxSpans: 1000
|
|
||||||
maxErrorDepth: 10
|
|
||||||
|
|
||||||
# Configuration du service "proxy"
|
# Configuration du service "proxy"
|
||||||
proxy:
|
proxy:
|
||||||
http:
|
http:
|
||||||
# Hôte d'écoute du service,
|
# Hôte d'écoute du service,
|
||||||
# 0.0.0.0 pour écouter sur toutes les interfaces
|
# 0.0.0.0 pour écouter sur toutes les interfaces
|
||||||
host: 0.0.0.0
|
host: 0.0.0.0
|
||||||
# Port d'écoute du service
|
# Port d'écoute du service
|
||||||
port: 8080
|
port: 8080
|
||||||
# Utiliser les entêtes HTTP True-Client-IP, X-Real-IP ou X-Forwarded-For
|
# Utiliser les entêtes HTTP True-Client-IP, X-Real-IP ou X-Forwarded-For
|
||||||
# pour le calcul de l'adresse distante à l'origine des requêtes
|
# pour le calcul de l'adresse distante à l'origine des requêtes
|
||||||
useRealIP: true
|
useRealIP: true
|
||||||
|
|
||||||
|
# Métriques Prometheus
|
||||||
|
metrics:
|
||||||
|
# Activer ou désactiver la publication des métriques
|
||||||
|
enabled: true
|
||||||
|
# Route de publication des métriques
|
||||||
|
endpoint: /.bouncer/metrics
|
||||||
|
# Authentification "basic auth" sur la page
|
||||||
|
# de publication
|
||||||
|
# Mettre à null pour désactiver l'authentification
|
||||||
|
basicAuth:
|
||||||
|
credentials:
|
||||||
|
prom: etheus
|
||||||
|
|
||||||
# Métriques Prometheus
|
# Configuration du transport HTTP(S)
|
||||||
metrics:
|
# Voir https://pkg.go.dev/net/http#Transport
|
||||||
# Activer ou désactiver la publication des métriques
|
transport:
|
||||||
enabled: true
|
forceAttemptHTTP2: true
|
||||||
# Route de publication des métriques
|
maxIdleConns: 100
|
||||||
endpoint: /.bouncer/metrics
|
maxIdleConnsPerHost: 100
|
||||||
# Authentification "basic auth" sur la page
|
maxConnsPerHost: 100
|
||||||
# de publication
|
idleConnTimeout: 1m30s
|
||||||
# Mettre à null pour désactiver l'authentification
|
tlsHandshakeTimeout: 10s
|
||||||
basicAuth:
|
expectContinueTimeout: 1s
|
||||||
credentials:
|
disableKeepAlives: false
|
||||||
prom: etheus
|
disableCompression: false
|
||||||
|
responseHeaderTimeout: 10s
|
||||||
|
writeBufferSize: 4096
|
||||||
|
readBufferSize: 4096
|
||||||
|
maxResponseHeaderBytes: 0
|
||||||
|
|
||||||
# Configuration du transport HTTP(S)
|
# Configuration de l'intégration Sentry
|
||||||
# Voir https://pkg.go.dev/net/http#Transport
|
# Voir https://pkg.go.dev/github.com/getsentry/sentry-go?utm_source=godoc#ClientOptions
|
||||||
transport:
|
sentry:
|
||||||
forceAttemptHTTP2: true
|
dsn: ""
|
||||||
maxIdleConns: 100
|
debug: false
|
||||||
maxIdleConnsPerHost: 100
|
flushTimeout: 2s
|
||||||
maxConnsPerHost: 100
|
attachStacktrace: true
|
||||||
idleConnTimeout: 1m30s
|
sampleRate: 1
|
||||||
tlsHandshakeTimeout: 10s
|
enableTracing: true
|
||||||
expectContinueTimeout: 1s
|
tracesSampleRate: 0.2
|
||||||
disableKeepAlives: false
|
profilesSampleRate: 1
|
||||||
disableCompression: false
|
ignoreErrors: []
|
||||||
responseHeaderTimeout: 10s
|
sendDefaultPII: false
|
||||||
writeBufferSize: 4096
|
serverName: ""
|
||||||
readBufferSize: 4096
|
environment: ""
|
||||||
maxResponseHeaderBytes: 0
|
maxBreadcrumbs: 0
|
||||||
|
maxSpans: 1000
|
||||||
|
maxErrorDepth: 10
|
||||||
|
|
||||||
# Configuration de l'intégration Sentry
|
# Configuration des connexions TCP
|
||||||
# Voir https://pkg.go.dev/github.com/getsentry/sentry-go?utm_source=godoc#ClientOptions
|
# Voir https://pkg.go.dev/net#Dialer
|
||||||
sentry:
|
dial:
|
||||||
dsn: ""
|
timeout: 30s
|
||||||
debug: false
|
keepAlive: 30s
|
||||||
flushTimeout: 2s
|
fallbackDelay: 300ms
|
||||||
attachStacktrace: true
|
dualStack: true
|
||||||
sampleRate: 1
|
|
||||||
enableTracing: true
|
|
||||||
tracesSampleRate: 0.2
|
|
||||||
profilesSampleRate: 1
|
|
||||||
ignoreErrors: []
|
|
||||||
sendDefaultPII: false
|
|
||||||
serverName: ""
|
|
||||||
environment: ""
|
|
||||||
maxBreadcrumbs: 0
|
|
||||||
maxSpans: 1000
|
|
||||||
maxErrorDepth: 10
|
|
||||||
|
|
||||||
# Configuration des connexions TCP
|
|
||||||
# Voir https://pkg.go.dev/net#Dialer
|
|
||||||
dial:
|
|
||||||
timeout: 30s
|
|
||||||
keepAlive: 30s
|
|
||||||
fallbackDelay: 300ms
|
|
||||||
dualStack: true
|
|
||||||
|
|
||||||
# Configuration du client Redis
|
# Configuration du client Redis
|
||||||
#
|
#
|
||||||
# Les modes "standalone", "sentinel" et "cluster" de Redis sont supportés:
|
# Les modes "standalone", "sentinel" et "cluster" de Redis sont supportés:
|
||||||
# - Mode "standalone": renseigner une seule entrée dans redis.addresses;
|
# - Mode "standalone": renseigner une seule entrée dans redis.addresses;
|
||||||
# - Mode "sentinel": renseigner le nom du master sentinel dans redis.master et une ou plusieurs adresses dans redis.addresses;
|
# - Mode "sentinel": renseigner une adresse dans redis.master et une ou plusieurs adresses dans redis.addresses;
|
||||||
# - Mode "cluster": renseigner plusieurs adresses dans redis.addresses et laisser redis.master vide.
|
# - Mode "cluster": renseigner plusieurs adresses dans redis.addresses et laisser redis.master vide.
|
||||||
redis:
|
redis:
|
||||||
addresses:
|
addresses:
|
||||||
- localhost:6379
|
- localhost:6379
|
||||||
master: ""
|
master: ""
|
||||||
writeTimeout: 30s
|
|
||||||
readTimeout: 30s
|
|
||||||
dialTimeout: 30s
|
|
||||||
|
|
||||||
# Configuration des logs
|
# Configuration des logs
|
||||||
logger:
|
logger:
|
||||||
# Niveau de verbosité
|
# Niveau de verbosité
|
||||||
# 0 - DEBUG
|
# 0 - DEBUG
|
||||||
# 1 - INFO
|
# 1 - INFO
|
||||||
# 2 - WARNING
|
# 2 - WARNING
|
||||||
# 3 - ERROR
|
# 3 - ERROR
|
||||||
# 4 - FATAL
|
# 4 - FATAL
|
||||||
level: 2
|
level: 1
|
||||||
# Format des logs, "human" ou "json"
|
# Format des logs, "human" ou "json"
|
||||||
format: human
|
format: human
|
||||||
|
|
||||||
# Configuration des différents layers
|
# Configuration des différents layers
|
||||||
layers:
|
layers:
|
||||||
# Configuration du layer "queue"
|
# Configuration du layer "queue"
|
||||||
queue:
|
queue:
|
||||||
# Répertoire contenant les templates
|
# Répertoire contenant les templates
|
||||||
templateDir: "/etc/bouncer/layers/queue/templates"
|
templateDir: "/etc/bouncer/layers/queue/templates"
|
||||||
# Temps de vie par défaut d'une session
|
# Temps de vie par défaut d'une session
|
||||||
defaultKeepAlive: 1m
|
defaultKeepAlive: 1m
|
||||||
|
|
||||||
# Configuration du layer "circuitbreaker"
|
# Configuration du layer "circuitbreaker"
|
||||||
circuitbreaker:
|
circuitbreaker:
|
||||||
# Répertoire contenant les templates
|
# Répertoire contenant les templates
|
||||||
templateDir: "/etc/bouncer/layers/circuitbreaker/templates"
|
templateDir: "/etc/bouncer/layers/circuitbreaker/templates"
|
||||||
|
|
@ -1,7 +0,0 @@
|
|||||||
scrape_configs:
|
|
||||||
- job_name: bouncer-proxy
|
|
||||||
metrics_path: /.bouncer/metrics
|
|
||||||
static_configs:
|
|
||||||
- targets:
|
|
||||||
- "localhost:8080"
|
|
||||||
scrape_interval: 5s
|
|
@ -1,6 +0,0 @@
|
|||||||
${BASE_URL}/blog/
|
|
||||||
${BASE_URL}/services/
|
|
||||||
${BASE_URL}
|
|
||||||
${BASE_URL}/recrutement/
|
|
||||||
${BASE_URL}/faq/
|
|
||||||
${BASE_URL}/societe/histoire/
|
|
@ -14,9 +14,4 @@ layers/**
|
|||||||
|
|
||||||
{
|
{
|
||||||
daemon +sigint: make run-redis
|
daemon +sigint: make run-redis
|
||||||
}
|
|
||||||
|
|
||||||
misc/prometheus/prometheus.yml
|
|
||||||
{
|
|
||||||
daemon +sigint: make run-prometheus
|
|
||||||
}
|
}
|
@ -1,53 +0,0 @@
|
|||||||
apiVersion: skaffold/v3
|
|
||||||
kind: Config
|
|
||||||
|
|
||||||
metadata:
|
|
||||||
name: bouncer
|
|
||||||
|
|
||||||
manifests:
|
|
||||||
kustomize:
|
|
||||||
paths:
|
|
||||||
- misc/k8s/kustomization/base
|
|
||||||
|
|
||||||
profiles:
|
|
||||||
- name: dev
|
|
||||||
manifests:
|
|
||||||
kustomize:
|
|
||||||
paths:
|
|
||||||
- misc/k8s/kustomization/overlays/dev
|
|
||||||
activation:
|
|
||||||
- command: dev
|
|
||||||
|
|
||||||
build:
|
|
||||||
local:
|
|
||||||
push: true
|
|
||||||
|
|
||||||
tagPolicy:
|
|
||||||
sha256: {}
|
|
||||||
|
|
||||||
artifacts:
|
|
||||||
- image: reg.cadoles.com/cadoles/bouncer
|
|
||||||
context: .
|
|
||||||
sync:
|
|
||||||
infer:
|
|
||||||
- cmd/**
|
|
||||||
- internal/**
|
|
||||||
- layers/**
|
|
||||||
- misc/**
|
|
||||||
docker:
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
statusCheckDeadlineSeconds: 600
|
|
||||||
|
|
||||||
portForward:
|
|
||||||
- resourceType: service
|
|
||||||
resourceName: bouncer-admin
|
|
||||||
namespace: bouncer-dev
|
|
||||||
port: 8081
|
|
||||||
localPort: 9999
|
|
||||||
- resourceType: service
|
|
||||||
resourceName: bouncer-server
|
|
||||||
namespace: bouncer-dev
|
|
||||||
port: 8080
|
|
||||||
localPort: 9000 # *Optional*
|
|
Reference in New Issue
Block a user