feat: authenticate users and agents requests

2023-03-07 23:10:42 +01:00
260 changed files with 2347 additions and 15628 deletions
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@ -1,44 +0,0 @@
 {{ if .Versions -}}
 {{ if .Unreleased.CommitGroups -}}
 <a name="unreleased"></a>
 ## [Unreleased]
 {{ range .Unreleased.CommitGroups -}}
 ### {{ .Title }}
 {{ range .Commits -}}
 - {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
 {{ end }}
 {{ end -}}
 {{ end -}}
 {{ end -}}
 {{ range .Versions }}
 <a name="{{ .Tag.Name }}"></a>
 ## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 {{ range .Commits -}}
 - {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
 {{ end }}
 {{ else }}
 _Nothing functionally significant._
 {{ end -}}
 {{- if .NoteGroups -}}
 {{ range .NoteGroups -}}
 ### {{ .Title }}
 {{ range .Notes }}
 {{ .Body }}
 {{ end }}
 {{ end -}}
 {{ end -}}
 {{ end -}}
 {{- if .Versions }}
 [Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
 {{ range .Versions -}}
 {{ if .Tag.Previous -}}
 [{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
 {{ end -}}
 {{ end -}}
 {{ end -}}
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@ -1,33 +0,0 @@
 style: github
 template: CHANGELOG.tpl.md
 info:
  title: CHANGELOG
  repository_url: https://forge.cadoles.com//
 options:
  commits:
    filters:
      Type:
        - feat
        - fix
        - perf
        - refactor
        - docs
  commit_groups:
    title_maps:
      feat: Features
      fix: Bug Fixes
      perf: Performance Improvements
      refactor: Code Refactoring
      docs: Documentation
  header:
    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
    pattern_maps:
      - Type
      - Scope
      - Subject
  notes:
    keywords:
      - BREAKING CHANGE
  issues:
    prefix:
      - '#'
--- a/.dockerignore
+++ b/.dockerignore
@ -1,14 +0,0 @@
 /apps
 /bin
 /dist
 /out
 /tmp
 /tools
 /.emissary-token
 /.env
 /agent-key.json
 /server-key.json
 /CHANGELOG.md
 /state.json
 /*.sqlite*
 /.mktools
--- a/.gitignore
+++ b/.gitignore
@ -4,14 +4,8 @@ dist/
 /tools
 /tmp
 /state.json
-/emissary.sqlite*
+/emissary.sqlite
 /.gitea-release
 /agent-key.json
 /apps
 /server-key.json
 /.emissary-token
 /.emissary-admin-token
 /.emissary-tenant
 /out
 .mktools/
 /CHANGELOG.md
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -2,7 +2,6 @@ project_name: emissary
 before:
  hooks:
    - go mod tidy
    - go generate ./...
 builds:
  - id: emissary-server
    env:
@ -46,9 +45,6 @@ builds:
      - arm64
      - arm
      - "386"
    goarm:
      - "6"
      - "7"
    main: ./cmd/agent
 archives:
  - id: server
@ -67,7 +63,7 @@ archives:
 checksum:
  name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ .Version }}"
+  name_template: "{{ incpatch .Version }}-next"
 changelog:
  sort: asc
  filters:
@ -105,9 +101,6 @@ nfpms:
        file_info:
          mode: 0755
        packager: apk
      - src: misc/packaging/openrc/emissary-server.logrotate.conf
        dst: /etc/logrotate.d/emissary-server
        packager: apk
      - dst: /var/lib/emissary
        type: dir
        file_info:
@ -150,8 +143,5 @@ nfpms:
        file_info:
          mode: 0755
        packager: apk
      - src: misc/packaging/openrc/emissary-agent.logrotate.conf
        dst: /etc/logrotate.d/emissary-agent
        packager: apk
    scripts:
      postinstall: "misc/packaging/common/postinstall-agent.sh"
--- a/58
+++ b/58
@ -1,12 +1,4 @@
-FROM alpine as certs
+FROM golang:1.19 AS BUILD
 RUN apk update && apk add ca-certificates curl openssl bash
 RUN curl -k https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/common/add-letsencrypt-ca.sh | bash
 #####################################
 #          Emissary Server          #
 #####################################
 FROM golang:1.21 AS build-emissary-server
 RUN apt-get update \
    && apt-get install -y make
@ -15,9 +7,9 @@ COPY . /src
 WORKDIR /src
-RUN make mktools && make GORELEASER_ARGS="build --snapshot --clean --single-target --id emissary-server" goreleaser
+RUN make GORELEASER_ARGS='build --rm-dist --single-target --snapshot' release
-FROM busybox:latest AS emissary-server
+FROM busybox:latest AS RUNTIME
 ARG DUMB_INIT_VERSION=1.2.5
@ -27,47 +19,11 @@ RUN mkdir -p /usr/local/bin \
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
-COPY --from=build-emissary-server /src/dist/emissary-server_linux_amd64_v1 /app
+COPY --from=BUILD /src/dist/emissary_linux_amd64_v1 /app
-COPY misc/docker/server.yml /etc/emissary/server.yml
+COPY --from=BUILD /src/tmp/config.yml /etc/emissary/config.yml
 COPY --from=certs /etc/ssl/certs /etc/ssl/certs
 EXPOSE 3000
-RUN mkdir -p /data
+ENTRYPOINT ["/app/emissary"]
-CMD [ "/app/emissary", "-c", "/etc/emissary/config.yml", "server", "run"]
+CMD ["server", "run", "-c", "/etc/emissary/config.yml"]
 #####################################
 #           Emissary Agent          #
 #####################################
 FROM golang:1.21 AS build-emissary-agent
 RUN apt-get update \
    && apt-get install -y make
 COPY . /src
 WORKDIR /src
 RUN make mktools && make GORELEASER_ARGS="build --snapshot --clean --single-target --id emissary-agent" goreleaser
 FROM busybox:latest AS emissary-agent
 ARG DUMB_INIT_VERSION=1.2.5
 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", "--"]
 COPY --from=build-emissary-agent /src/dist/emissary-agent_linux_amd64_v1 /app
 COPY --chmod=777 misc/docker/docker-agent-wrapper.sh /usr/local/bin/docker-agent-wrapper
 COPY misc/docker/agent.yml /etc/emissary/agent.yml
 COPY --from=certs /etc/ssl/certs /etc/ssl/certs
 RUN mkdir -p /data
 CMD [ "/usr/local/bin/docker-agent-wrapper", "/app/emissary", "-c", "/etc/emissary/agent.yml", "agent", "run" ]
--- a/87
+++ b/87
@ -1,87 +0,0 @@
@Library('cadoles') _
 pipeline {
    agent {
        dockerfile {
            label 'docker'
            filename 'Dockerfile'
            dir 'misc/jenkins'
        }
    }
    stages {
        stage('Cancel older jobs') {
            steps {
                script {
                    def buildNumber = env.BUILD_NUMBER as int
                    if (buildNumber > 1) milestone(buildNumber - 1)
                    milestone(buildNumber)
                }
            }
        }
        stage('Run unit tests') {
            steps {
                script {
                    withCredentials([
                        usernamePassword([
                            credentialsId: 'forge-jenkins',
                            usernameVariable: 'GIT_USERNAME',
                            passwordVariable: 'GIT_PASSWORD'
                        ])
                    ]) {
                        sh '''
                        git config --global credential.https://forge.cadoles.com.username "$GIT_USERNAME"
                        git config --global credential.https://forge.cadoles.com.helper '!f() { test "$1" = get && echo "password=$GIT_PASSWORD"; }; f'
                        export GOPRIVATE=forge.cadoles.com/arcad/edge
                        make test
                        '''
                    }
                }
            }
        }
        stage('Release') {
            when {
                anyOf {
                    branch 'master'
                    branch 'develop'
                }
            }
            steps {
                script {
                    withCredentials([
                        usernamePassword([
                            credentialsId: 'forge-jenkins',
                            usernameVariable: 'GITEA_RELEASE_USERNAME',
                            passwordVariable: 'GITEA_RELEASE_PASSWORD'
                        ])
                    ]) {
                        sh """
                        export MKT_PROJECT_VERSION_BRANCH_NAME=${env.BRANCH_NAME}
                        make mktools
                        make gitea-release
                        """
                    }
                    String currentVersion = sh(script: "MKT_PROJECT_VERSION_BRANCH_NAME=${env.BRANCH_NAME} make version", returnStdout: true).trim()
                    build(
                        job: "../emissary-firmware/${env.GIT_BRANCH}",
                        parameters: [
                            [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
                        ],
                        wait: false
                    )
                }
            }
        }
    }
    post {
        always {
            cleanWs()
        }
    }
 }
--- a/117
+++ b/117
@ -1,12 +1,14 @@
 LINT_ARGS ?= --timeout 5m
-GORELEASER_ARGS ?= release --snapshot --clean
+GORELEASER_VERSION ?= v1.13.1
 GORELEASER_ARGS ?= release --auto-snapshot --snapshot --rm-dist
 GITCHLOG_ARGS ?=
 SHELL := /bin/bash
 EMISSARY_VERSION ?= 
 GIT_VERSION ?= $(shell git describe --always)
-DOCKER_IMAGE_NAME ?= reg.cadoles.com/cadoles/emissary
+DOCKER_IMAGE_NAME ?= bornholm/emissary
-DOCKER_IMAGE_TAG ?= $(MKT_PROJECT_VERSION)
+DOCKER_IMAGE_TAG ?= $(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)
 GOTEST_ARGS ?= -short
@ -15,13 +17,6 @@ OPENWRT_DEVICE ?= 192.168.1.1
 watch: deps ## Watching updated files - live reload
 	( set -o allexport && source .env && set +o allexport && go run -mod=readonly github.com/cortesi/modd/cmd/modd@latest )
 clean:
 	rm -f .emissary-*
 	rm -f emissary.sqlite*
 	rm -f server-key.json
 	rm -f agent-key.json
 	rm -f state.json
 .PHONY: test
 test: test-go ## Executing tests
@ -48,7 +43,7 @@ build-emissary-%: deps ## Build executable
 		-v \
 		-ldflags "\
 			-X 'main.GitRef=$(shell git rev-parse --short HEAD)' \
-			-X 'main.ProjectVersion=$(MKT_PROJECT_VERSION)' \
+			-X 'main.ProjectVersion=$(shell git describe --always)' \
 			-X 'main.BuildDate=$(shell date --utc --rfc-3339=seconds)' \
 		" \
 		-o ./bin/$* \
@ -69,7 +64,7 @@ run-emissary-%: .env
 	( set -o allexport && source .env && set +o allexport && bin/$* $(EMISSARY_CMD))
 .PHONY: deps
-deps: .env .mktools
+deps: .env
 .PHONY: dump-config
 dump-config: build-emissary
@ -77,23 +72,36 @@ dump-config: build-emissary
 	./bin/emissary config dump > tmp/config.yml
 .PHONY: goreleaser
-goreleaser: .env .mktools
+goreleaser: deps
-	( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
+	( set -o allexport && source .env && set +o allexport && VERSION=$(GORELEASER_VERSION) curl -sfL https://goreleaser.com/static/run | bash /dev/stdin $(GORELEASER_ARGS) )
 .PHONY: start-release
 start-release:
 	if [ -z "$(EMISSARY_VERSION)" ]; then echo "You must define environment variable FAQD_VERSION"; exit 1; fi
 	git flow release start $(EMISSARY_VERSION)
 	# Update package.json version
 	jq '.version = "$(EMISSARY_VERSION)"' package.json | sponge package.json
 	git add  package.json
 	git commit -m "chore: bump to version $(EMISSARY_VERSION)" --allow-empty
 	echo "Commit you additional modifications then execute 'make finish-release'"
 .PHONY: finish-release
 finish-release:
 	git flow release finish -m "v$(EMISSARY_VERSION)"
 	git push --all
 	git push --tags
 install-git-hooks:
 	git config core.hooksPath .githooks
-docker-build: docker-build-agent docker-build-server
+docker-build:
 	docker build -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) .
-docker-build-%:
+docker-release:
-	docker build --target emissary-$* -t $(DOCKER_IMAGE_NAME)-$*:latest .
+	docker push $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
 docker-release: docker-release-agent docker-release-server
 docker-release-%:
 	docker tag $(DOCKER_IMAGE_NAME)-$*:latest $(DOCKER_IMAGE_NAME)-$*:$(DOCKER_IMAGE_TAG)
 	docker push $(DOCKER_IMAGE_NAME)-$*:latest
 	docker push $(DOCKER_IMAGE_NAME)-$*:$(DOCKER_IMAGE_TAG)
 deploy-openwrt-agent:
 	$(MAKE) GOARCH="arm" GORELEASER_ARGS='build --single-target --snapshot --clean' goreleaser
@ -109,69 +117,24 @@ deploy-openwrt-agent:
 	scp dist/emissary-agent_linux_arm_6/emissary root@$(OPENWRT_DEVICE):/usr/bin/emissary
 	ssh root@$(OPENWRT_DEVICE) /etc/init.d/emissary-agent start
-gitea-release: .mktools tools/gitea-release/bin/gitea-release.sh goreleaser changelog
+gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
 	mkdir -p .gitea-release
 	rm -rf .gitea-release/*
 	cp dist/*.tar.gz .gitea-release/
 	cp dist/*.apk .gitea-release/
 	cp dist/*.deb .gitea-release/
 	cp CHANGELOG.md .gitea-release/
 	GITEA_RELEASE_PROJECT="emissary" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \
+		GITEA_RELEASE_VERSION="$(GIT_VERSION)" \
-		GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \
+		GITEA_RELEASE_NAME="$(GIT_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_BODY="" \
-		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
+		GITEA_RELEASE_ATTACHMENTS="$(shell find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh
-.emissary-tenant: .emissary-admin-token
+tools/gitea-release/bin/gitea-release.sh:
-	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client tenant create --token-file .emissary-admin-token --tenant-label Dev -f json | jq -r '.[0].id' > .emissary-tenant"
+	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
-.emissary-admin-token:
+	chmod +x tools/gitea-release/bin/gitea-release.sh
 	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml server auth create-token --role admin --output .emissary-admin-token"
 .emissary-token: .emissary-tenant
 	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml server auth create-token --role writer --output .emissary-token --tenant $(shell cat .emissary-tenant)"
 AGENT_ID ?= 1
 claim-agent: .emissary-token
 	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client agent claim --agent-thumbprint $(shell go run ./cmd/agent agent show-thumbprint)"
 load-sample-specs: .emissary-token
 	cat misc/spec-samples/app.emissary.cadoles.com.json | $(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name app.emissary.cadoles.com"
 	cat misc/spec-samples/proxy.emissary.cadoles.com.json | $(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name proxy.emissary.cadoles.com"
 	cat misc/spec-samples/mdns.emissary.cadoles.com.json | $(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name mdns.emissary.cadoles.com"
 	cat misc/spec-samples/uci.emissary.cadoles.com.json | $(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml client agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name uci.emissary.cadoles.com"
 version: .mktools
 	@echo $(MKT_PROJECT_VERSION)
 update-edge-lib:
 	git pull --rebase
 	go clean -modcache
 	GONOPROXY=forge.cadoles.com/arcad/edge GOPRIVATE=forge.cadoles.com/arcad/edge go get -v -u forge.cadoles.com/arcad/edge
 	go mod tidy
 	$(MAKE) test
 	git add go.mod go.sum
 	git commit -m "feat: update arcad/edge dependency"
 	git push
 .PHONY: changelog
 changelog: .mktools
 	$(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag $(MKT_PROJECT_VERSION) --tag-filter-pattern $(MKT_PROJECT_VERSION_CHANNEL) --output CHANGELOG.md' mkt-changelog
 .PHONY: mktools
 mktools:
 	rm -rf .mktools
 	curl -q https://forge.cadoles.com/Cadoles/mktools/raw/branch/master/install.sh | $(SHELL)
 .mktools:
 	$(MAKE) mktools
 -include .mktools/*.mk
--- a/README.md
+++ b/README.md
@ -1,45 +1,9 @@
-<p align="center">
+# Emissary
    <img width="400" src="./misc/resources/logo.svg" />
 </p>
 Control plane for "edge" (and OpenWRT-based) devices.
 > ⚠ Emissary is currently in a very alpha stage ! Expect breaking changes...
 ## Quickstart
 **Dependencies**
 - [Go >= 1.21](https://go.dev/)
 - `GNU Make`
 ```shell
 # Start server and a local agent
 make watch
 # In an other terminal
 # Create an admin token
 make .emissary-admin-token
 # Create a new tenant
 make .emissary-tenant
 # Create a new writer token for this tenant
 make .emissary-token
 # Claim the agent for your newly created tenant
 make claim-agent
 # Query your agents
 ./bin/server client agent query
 # Load sample specs for your agent
 make load-sample-specs
 ## Optional: reset your workspace
 make clean
 ```
 ## Install
 ### Manually
@ -50,8 +14,6 @@ Download the pre-compiled binaries from the [releases page](https://forge.cadole
 See [`doc`](./doc/README.md)
-## Licence & mentions
+## Licence
-[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.html#license-text)
+AGPL-3.0
 Logo by [@aardouin](https://forge.cadoles.com/aardouin)
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@ -6,9 +6,6 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/format"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
 )
 // nolint: gochecknoglobals
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@ -7,9 +7,8 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/server"
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/format"
+	_ "github.com/jackc/pgx/v5/stdlib"
-	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/spec"
+	_ "modernc.org/sqlite"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/sql"
 )
 // nolint: gochecknoglobals
--- a/doc/README.md
+++ b/doc/README.md
@ -1,22 +1,14 @@
 # Documentation
 - (FR) - [Vue d'ensemble](./others/fr/overview.md)
 - (FR) - [Authentification et autorisation](./others/fr/auth.md)
 ## Tutorials
 - (FR) - [Premiers pas](./tutorials/fr/first-steps.md)
 - (FR) - [Déployer un serveur mandataire inverse sur un agent](./tutorials/fr/deploy-reverse-proxy.md)
 - (FR) - [Déployer une configuration UCI personnalisée sur un agent](./tutorials/fr/deploy-uci-configuration.md)
 - (FR) - [Démarrer un agent avec Docker](./tutorials/fr/docker-agent.md)
-### Specifications
+## References
- [Schema `app.emissary.cadoles.com`](../internal/agent/controller/app/spec/schema.json)
+### API
- [Schema `proxy.emissary.cadoles.com`](../internal/spec/proxy/schema.json)
+
- [Schema `mdns.emissary.cadoles.com`](../internal/agent/controller/mdns/spec/schema.json)
+[See `misc/rest/server.rest`](../misc/rest/server.rest)
 - [Schema `uci.emissary.cadoles.com`](../internal/spec/uci/schema.json)
 - [Schema `sysupgrade.openwrt.emissary.cadoles.com`](../internal/agent/controller/openwrt/spec/sysupgrade/schema.json)
 ### Configuration
@ -24,7 +16,3 @@ See:
 - [`misc/packaging/common/config-agent.yml`](../misc/packaging/common/config-agent.yml)
 - [`misc/packaging/common/config-server.yml`](../misc/packaging/common/config-server.yml)
 ### Other projects
 - [`emissary-firmware`](https://forge.cadoles.com/arcad/emissary-firmware) - Preconfigured OpenWRT firmwares with an agent
--- a/doc/others/fr/auth.md
+++ b/doc/others/fr/auth.md
@ -1,27 +0,0 @@
 # Authentification et autorisation
 ## Authentification
 Emissary utilise des [**JSON Web Token**](https://fr.wikipedia.org/wiki/JSON_Web_Token) (JWT) afin d'authentifier les appels à son API REST. 
 L'implémentation est compatible avec tout serveur d'authentification exposant une URL proposant un [**JSON Web Key Set**](https://www.ory.sh/docs/hydra/jwks#the-role-of-well-knownjwksjson). 
 La plupart des serveurs OpenID Connect exposent un point d'entrée du type [`/.well-known/jwks.json`](https://www.ory.sh/docs/hydra/jwks#the-role-of-well-knownjwksjson) remplissant ce rôle.
 Emissary est également en capacité à fonctionner en mode autonome en générant des JWTs signés par une clé privée locale.
 ## Ségrégation des ressources
 Emissary suit une stratégie ["multitenant"](https://fr.wikipedia.org/wiki/Multitenant) de séparer les ressources par organisation.
 Un utilisateur est obligatoirement associé à un `tenant`` et ne peut opérer que sur les ressources associées à celui ci.
 ## Autorisation
 Au sein d'un `tenant`, un utilisateur peut avoir un des rôles suivants:
 - `writer` - Autorisé à visualiser et modifier les ressources;
 - `reader` - Autorisé à visualiser les ressources.
 Un rôle spécial `admin` permet la création et la suppression de `tenants`.
--- a/doc/others/fr/overview.md
+++ b/doc/others/fr/overview.md
@ -1,30 +0,0 @@
 # Vue d'ensemble
 "Emissary" est un programme entrant dans la catégorie des outils de gestion et déploiement de configuration.
 En utilisant un agent déployé sur chaque système cible, il permet aux administrateurs système de centraliser le contrôle et la supervision de la configuration. Grâce à ses fonctionnalités avancées, il est capable de faire converger la configuration d'une machine vers un modèle précis défini par une ou plusieurs spécifications centralisées sur un serveur de pilotage dédié.
 Le principal atout d'"Emissary" réside dans sa capacité à activer des "contrôleurs" spécifiques pour chaque aspect de la configuration système. Ces contrôleurs sont des modules intelligents qui agissent comme des agents spécialisés, veillant à ce que les paramètres de configuration soient correctement appliqués et respectent les spécifications définies.
 Grâce à cette approche modulaire, "Emissary" peut gérer diverses facettes de la configuration, telles que les paramètres réseau, les règles de sécurité, les options de performance et bien plus encore. Chaque contrôleur est conçu pour répondre à des besoins spécifiques, offrant ainsi une flexibilité et une granularité optimales dans la gestion de la configuration.
 Certains contrôleurs permettent également l'exécution de services spécialisés comme des serveurs mandataires inverses ou des applications web autonomes.
 L'utilisation d'un serveur de pilotage centralisé permet à "Emissary" de stocker et de mettre à jour les spécifications de configuration de manière cohérente. Les administrateurs peuvent définir des modèles de configuration précis, les affiner au fil du temps et les appliquer en un seul clic sur l'ensemble du parc de machines gérées. Cela garantit une uniformité et une conformité accrues, tout en facilitant la maintenance et les mises à jour à grande échelle.
 À l'heure actuelle, Emissary est conçu pour cibler spécifiquement le système d'exploitation OpenWRT. L'activation des "contrôleurs" spécifiques à cet OS permet de converger la configuration de la machine OpenWRT vers un modèle correspondant aux spécifications centralisées sur le serveur de pilotage. Ces spécifications peuvent inclure des paramètres réseau, des configurations de sécurité, des règles de pare-feu, des options de routage, des services système, et bien d'autres éléments spécifiques à OpenWRT. 
 ## Vue d'ensemble de l'architecture
 ![](./resources/overview.svg)
 ## Contrôleurs
 Voici la liste des contrôleurs implémentés à ce jour:
 - **Contrôleur UCI** - Permet de modifier les données [UCI](https://openwrt.org/docs/guide-user/base-system/uci) (**U**nified **C**onfiguration **S**ystem) d'un système OpenWRT et ainsi configurer les services systèmes, les règles pare-feu, la configuration des NICs, etc sur celui-ci.
 - **Contrôleur SysUpgrade** - Permet de mettre à jour un système OpenWRT via l'outil [`sysupgrade`](https://openwrt.org/docs/guide-user/installation/generic.sysupgrade).
 - **Contrôleur Proxy** - Permet de déployer des services de type passerelle mandataire inverse ("reverse proxy") sur la machine cible.
 - **Contrôleur mDNS** - Permet d'annoncer des services via mDNS sur les différents réseaux de la machine cible.
 - **Contrôleur App** - Permet de déployer des applications web "embarquées" (s'exécutant localement et non dépendantes d'une connectivité internet) sur la machine cible. Voir le projet ["Edge App"](https://forge.cadoles.com/arcad/edge).
--- a/doc/others/fr/resources/overview.plantuml
+++ b/doc/others/fr/resources/overview.plantuml
@ -1,59 +0,0 @@
@startuml
 top to bottom direction
 skinparam linetype ortho
 node PilotNode as "Pilot Node" {
    database DataStore as "Data Store"
    component EmissaryServer as "Emissary Server" {
        component SpecificationRegistry as "Specification Registry" {
            component UCISpecification as "UCI Spec"
            component MDNSSpecification as "mDNS Spec"
            component AppSpecification as "App Spec"
            component ProxySpecification as "Proxy Spec"
            component SysUpgradeSpecification as "SysUpgrade Spec"
        }
        component HTTPHandler as "HTTP Handler"
        HTTPHandler .down.> SpecificationRegistry: validates agents data with
        HTTPHandler .right.> DataStore: saves agent data in
    }
 }
 node OperatorNode as "Operator Node" {
    component EmissaryClient as "Emissary Client"
    EmissaryClient -left-> HTTPHandler: administrates
 }
 node OpenWRTNode as "OpenWRT Node" {
    component EmissaryAgent as "Emissary Agent" {
        component StateManager as "State Manager"
        StateManager --up-> HTTPHandler: fetches agent ^*specs from
        component UCIController as "UCI Controller"
        UCIController .up.> StateManager: reconciles with
        component SysUpgradeController as "SysUpgrade Controller"
        SysUpgradeController .up.> StateManager: reconciles with
        component ProxyController as "Proxy Controller"
        ProxyController .up.> StateManager: reconciles with
        component MDNSController as "mDNS Controller"
        MDNSController .up.> StateManager: reconciles with
        component AppController as "App Controller"
        AppController .up.> StateManager: reconciles with
    }
 }
--- a/doc/others/fr/resources/overview.svg
+++ b/doc/others/fr/resources/overview.svg
@ -1,99 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="643px" preserveAspectRatio="none" style="width:1713px;height:643px;background:#FFFFFF;" version="1.1" viewBox="0 0 1713 643" width="1713px" zoomAndPan="magnify"><defs/><g><!--MD5=[d09f24f3d7c03358bd8c02f81fe1cb3f]
 cluster PilotNode--><g id="cluster_PilotNode"><polygon fill="none" points="16,16,26,6,685,6,685,511,675,521,16,521,16,16" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="685" y1="16" y2="6"/><line style="stroke:#181818;stroke-width:1.0;" x1="16" x2="675" y1="16" y2="16"/><line style="stroke:#181818;stroke-width:1.0;" x1="675" x2="675" y1="16" y2="521"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="73" x="310" y="33.9659">Pilot Node</text></g><!--MD5=[9c6b5fd9fe3a3a3c784efc27685ccdf9]
 cluster EmissaryServer--><g id="cluster_EmissaryServer"><rect fill="none" height="440" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="523" x="138" y="57"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="641" y="62"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="639" y="64"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="639" y="68"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="110" x="344.5" y="84.9659">Emissary Server</text></g><!--MD5=[5f6297313bdca82dad0981382bb4d88a]
 cluster SpecificationRegistry--><g id="cluster_SpecificationRegistry"><rect fill="none" height="273" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="459" x="170" y="192"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="609" y="197"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="607" y="199"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="607" y="203"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="149" x="325" y="219.9659">Specification Registry</text></g><!--MD5=[b562d696a455f482404b155c6a8fbfca]
 cluster OperatorNode--><g id="cluster_OperatorNode"><polygon fill="none" points="709,62,719,52,889,52,889,150,879,160,709,160,709,62" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="879" x2="889" y1="62" y2="52"/><line style="stroke:#181818;stroke-width:1.0;" x1="709" x2="879" y1="62" y2="62"/><line style="stroke:#181818;stroke-width:1.0;" x1="879" x2="879" y1="62" y2="160"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="104" x="743" y="79.9659">Operator Node</text></g><!--MD5=[68861f6d3d90d2f41bc4d4a2796fc73e]
 cluster OpenWRTNode--><g id="cluster_OpenWRTNode"><polygon fill="none" points="709,313,719,303,1696,303,1696,616,1686,626,709,626,709,313" style="stroke:#181818;stroke-width:1.0;"/><line style="stroke:#181818;stroke-width:1.0;" x1="1686" x2="1696" y1="313" y2="303"/><line style="stroke:#181818;stroke-width:1.0;" x1="709" x2="1686" y1="313" y2="313"/><line style="stroke:#181818;stroke-width:1.0;" x1="1686" x2="1686" y1="313" y2="626"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="109" x="1144" y="330.9659">OpenWRT Node</text></g><!--MD5=[6e6320f5227e3e26302b14a131b17aa5]
 cluster EmissaryAgent--><g id="cluster_EmissaryAgent"><rect fill="none" height="248" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:1.0;" width="939" x="733" y="354"/><rect fill="none" height="10" style="stroke:#181818;stroke-width:1.0;" width="15" x="1652" y="359"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="1650" y="361"/><rect fill="none" height="2" style="stroke:#181818;stroke-width:1.0;" width="4" x="1650" y="365"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="108" x="1148.5" y="381.9659">Emissary Agent</text></g><!--MD5=[45eee4c5a57edb1e2ac175c76a239d17]
 entity DataStore--><g id="elem_DataStore"><path d="M32,105.5 C32,95.5 77,95.5 77,95.5 C77,95.5 122,95.5 122,105.5 L122,133.5679 C122,143.5679 77,143.5679 77,143.5679 C77,143.5679 32,143.5679 32,133.5679 L32,105.5 " fill="#F1F1F1" style="stroke:#181818;stroke-width:0.5;"/><path d="M32,105.5 C32,115.5 77,115.5 77,115.5 C77,115.5 122,115.5 122,105.5 " fill="none" style="stroke:#181818;stroke-width:0.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="70" x="42" y="134.4659">Data Store</text></g><!--MD5=[7d2b259075cd0e421afb7965bd22532b]
 entity HTTPHandler--><g id="elem_HTTPHandler"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="335" y="95"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="447" y="100"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="445" y="102"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="445" y="106"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="92" x="350" y="129.9659">HTTP Handler</text></g><!--MD5=[d74c349cfc963885f78088443cb132a3]
 entity UCISpecification--><g id="elem_UCISpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="213" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="293" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="291" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="291" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="60" x="228" y="272.9659">UCI Spec</text></g><!--MD5=[631d6ad5bad1f198f42ccf56fafe0582]
 entity MDNSSpecification--><g id="elem_MDNSSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="118" x="348" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="446" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="444" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="444" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="363" y="272.9659">mDNS Spec</text></g><!--MD5=[f8753067470155b04e2f3a693924c320]
 entity AppSpecification--><g id="elem_AppSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="103" x="501.5" y="238"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="584.5" y="243"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="582.5" y="245"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="582.5" y="249"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="516.5" y="272.9659">App Spec</text></g><!--MD5=[fd240f711946cd5d0dcadb1ea2ed786c]
 entity ProxySpecification--><g id="elem_ProxySpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="213" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="305" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="303" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="303" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="72" x="228" y="426.9659">Proxy Spec</text></g><!--MD5=[74aafaf76d366e174271de99960a7b8d]
 entity SysUpgradeSpecification--><g id="elem_SysUpgradeSpecification"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="157" x="360.5" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="497.5" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="495.5" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="495.5" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="375.5" y="426.9659">SysUpgrade Spec</text></g><!--MD5=[584b4e495bc4cb9e5d46ff66335fc219]
 entity EmissaryClient--><g id="elem_EmissaryClient"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="725.5" y="95"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="848.5" y="100"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="846.5" y="102"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="846.5" y="106"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="103" x="740.5" y="129.9659">Emissary Client</text></g><!--MD5=[cbe48146c9698f81ea53c2c6f51c8eda]
 entity StateManager--><g id="elem_StateManager"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="139" x="1048.5" y="392"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1167.5" y="397"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1165.5" y="399"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1165.5" y="403"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="1063.5" y="426.9659">State Manager</text></g><!--MD5=[27f8877b35bcf78d2c9b0e363caea569]
 entity UCIController--><g id="elem_UCIController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="135" x="749.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="864.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="862.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="862.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="764.5" y="571.9659">UCI Controller</text></g><!--MD5=[f5a45e51cb66ff1d3b5626d0df038fee]
 entity SysUpgradeController--><g id="elem_SysUpgradeController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="192" x="920" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1092" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1090" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1090" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="152" x="935" y="571.9659">SysUpgrade Controller</text></g><!--MD5=[ed1f476319cb2bbabd1b988180210f61]
 entity ProxyController--><g id="elem_ProxyController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="147" x="1147.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1274.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1272.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1272.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="1162.5" y="571.9659">Proxy Controller</text></g><!--MD5=[dcaaaabc13b59746f8f74cc6285a228b]
 entity MDNSController--><g id="elem_MDNSController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="153" x="1329.5" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1462.5" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1460.5" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1460.5" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="113" x="1344.5" y="571.9659">mDNS Controller</text></g><!--MD5=[f7cab0dbd7f354492deaa54be612571f]
 entity AppController--><g id="elem_AppController"><rect fill="#F1F1F1" height="49.0679" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="1518" y="537"/><rect fill="#F1F1F1" height="10" style="stroke:#181818;stroke-width:0.5;" width="15" x="1636" y="542"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1634" y="544"/><rect fill="#F1F1F1" height="2" style="stroke:#181818;stroke-width:0.5;" width="4" x="1634" y="548"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="1533" y="571.9659">App Controller</text></g><!--MD5=[8c3501b26c9c3ea39952224ab3fba557]
 link HTTPHandler to SpecificationRegistry--><g id="link_HTTPHandler_SpecificationRegistry"><path d="M334.7,128 C268.96,128 178,128 178,128 C178,128 178,158.5475 178,190.5263 C178,190.7761 178,191.026 178,191.276 " fill="none" id="HTTPHandler-to-SpecificationRegistry" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="178,191.276,182,182.276,178,186.276,174,182.276,178,191.276" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="156" x="151.03" y="142.897">validates agents data with</text></g><!--MD5=[1442fca2dc2f53bf9ae23d9e844c6c8b]
 link HTTPHandler to DataStore--><g id="link_HTTPHandler_DataStore"><path d="M334.65,112 C334.65,112 128.41,112 128.41,112 " fill="none" id="HTTPHandler-to-DataStore" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="123.41,112,132.41,116,128.41,112,132.41,108,123.41,112" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="115" x="203.28" y="126.897">saves agent data in</text></g><!--MD5=[04b946759b53ef2d0699bda61eed296c]
 reverse link HTTPHandler to EmissaryClient--><g id="link_HTTPHandler_EmissaryClient"><path d="M473.28,112 C473.28,112 725.14,112 725.14,112 " fill="none" id="HTTPHandler-backto-EmissaryClient" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="468.28,112,477.28,116,473.28,112,477.28,108,468.28,112" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="82" x="516.21" y="107.897">administrates</text></g><!--MD5=[0dd7156c6052ea784bc88dfca61e007b]
 reverse link HTTPHandler to StateManager--><g id="link_HTTPHandler_StateManager"><path d="M473.28,128 C473.28,128 665,128 665,128 C665,128 665,409 665,409 C665,409 921.14,409 1048.21,409 " fill="none" id="HTTPHandler-backto-StateManager" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="468.28,128,477.28,132,473.28,128,477.28,124,468.28,128" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="163" x="501" y="360.137">fetches agent ^*specs from</text></g><!--MD5=[beea302d68a5d9dc6027ab4e0b987cea]
 reverse link StateManager to UCIController--><g id="link_StateManager_UCIController"><path d="M1042.15,425 C1042.15,425 876.5,425 876.5,425 C876.5,425 876.5,497.45 876.5,536.78 " fill="none" id="StateManager-backto-UCIController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1047.15,425,1038.15,421,1042.15,425,1038.15,429,1047.15,425" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="814.43" y="420.897">reconciles with</text></g><!--MD5=[8cf138a1950decb1251fc88353171770]
 reverse link StateManager to SysUpgradeController--><g id="link_StateManager_SysUpgradeController"><path d="M1080.25,447.43 C1080.25,447.43 1080.25,536.9 1080.25,536.9 " fill="none" id="StateManager-backto-SysUpgradeController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1080.25,442.43,1076.25,451.43,1080.25,447.43,1084.25,451.43,1080.25,442.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="991.25" y="488.057">reconciles with</text></g><!--MD5=[8dba0e44c0268b5c6a2c1c6565c41b8b]
 reverse link StateManager to ProxyController--><g id="link_StateManager_ProxyController"><path d="M1167.5,447.43 C1167.5,447.43 1167.5,536.9 1167.5,536.9 " fill="none" id="StateManager-backto-ProxyController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1167.5,442.43,1163.5,451.43,1167.5,447.43,1171.5,451.43,1167.5,442.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1078.5" y="507.057">reconciles with</text></g><!--MD5=[94df0ade1dc92be8853ce902c4f83dad]
 reverse link StateManager to MDNSController--><g id="link_StateManager_MDNSController"><path d="M1193.72,425 C1193.72,425 1406,425 1406,425 C1406,425 1406,497.45 1406,536.78 " fill="none" id="StateManager-backto-MDNSController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1188.72,425,1197.72,429,1193.72,425,1197.72,421,1188.72,425" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1266.75" y="420.897">reconciles with</text></g><!--MD5=[e74434bc519cba41fdddc7c857699717]
 reverse link StateManager to AppController--><g id="link_StateManager_AppController"><path d="M1193.96,409 C1193.96,409 1587,409 1587,409 C1587,409 1587,493.45 1587,536.66 " fill="none" id="StateManager-backto-AppController" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="1188.96,409,1197.96,413,1193.96,409,1197.96,405,1188.96,409" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="88" x="1365.31" y="404.897">reconciles with</text></g><!--MD5=[6fc50b732d8962c26a79ff20e99a40e3]
@startuml
 top to bottom direction
 skinparam linetype ortho
 node PilotNode as "Pilot Node" {
    database DataStore as "Data Store"
    component EmissaryServer as "Emissary Server" {
        component SpecificationRegistry as "Specification Registry" {
            component UCISpecification as "UCI Spec"
            component MDNSSpecification as "mDNS Spec"
            component AppSpecification as "App Spec"
            component ProxySpecification as "Proxy Spec"
            component SysUpgradeSpecification as "SysUpgrade Spec"
        }
        component HTTPHandler as "HTTP Handler"
        HTTPHandler .down.> SpecificationRegistry: validates agents data with
        HTTPHandler .right.> DataStore: saves agent data in
    }
 }
 node OperatorNode as "Operator Node" {
    component EmissaryClient as "Emissary Client"
    EmissaryClient -left-> HTTPHandler: administrates
 }
 node OpenWRTNode as "OpenWRT Node" {
    component EmissaryAgent as "Emissary Agent" {
        component StateManager as "State Manager"
        StateManager - -up-> HTTPHandler: fetches agent ^*specs from
        component UCIController as "UCI Controller"
        UCIController .up.> StateManager: reconciles with
        component SysUpgradeController as "SysUpgrade Controller"
        SysUpgradeController .up.> StateManager: reconciles with
        component ProxyController as "Proxy Controller"
        ProxyController .up.> StateManager: reconciles with
        component MDNSController as "mDNS Controller"
        MDNSController .up.> StateManager: reconciles with
        component AppController as "App Controller"
        AppController .up.> StateManager: reconciles with
    }
 }
@end
 PlantUML version 1.2022.7(Mon Aug 22 19:01:30 CEST 2022)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: fr
 Country: FR
 --></g></svg>
--- a/doc/tutorials/fr/deploy-reverse-proxy.md
+++ b/doc/tutorials/fr/deploy-reverse-proxy.md
@ -1,3 +0,0 @@
 # Déployer un serveur mandataire inverse sur un agent
 > TODO
--- a/doc/tutorials/fr/deploy-uci-configuration.md
+++ b/doc/tutorials/fr/deploy-uci-configuration.md
@ -1,130 +0,0 @@
 # Déployer une configuration UCI personnalisée sur un agent
 Via la spécification [`uci.emissary.cadoles.com`](../../../internal/spec/uci/schema.json) il est possible de configurer un agent avec un système OpenWRT. Dans ce tutoriel nous verrons:
 - Comment exporter une configuration UCI existante au format attendu par Emissary;
 - Comment modifier la spécification d'un agent Emissary pour mettre à jour sa configuration via le serveur de pilotage.
 ## Étapes
 ### Identifier l'empreinte de votre agent
 1. Sur la machine agent, utiliser la commande intégrée pour récupérer l'empreinte ("thumbprint") identifiant l'agent:
    ```
    emissary agent show-thumbprint
    ```
    **Noter la valeur retournée. Elle sera utilisée dans les étapes suivantes.**
 ### Exporter la configuration UCI de votre agent au format Emissary
 1. Se connecter en SSH sur votre agent Emissary:
    ```
    ssh root@<agent_ip>
    ```
 2. Sur la machine agent, utiliser la commande intégrée pour exporter la configuration UCI de votre agent au format Emissary:
    ```
    uci export | emissary agent openwrt uci transform > my-agent-config.json
    ```
    > **Astuce**
    > 
    > Par défaut, l'outil [LuCi](https://openwrt.org/fr/doc/howto/luci.essentials) est disponible sur votre agent. Vous pouvez y accéder via l'URL `http://<agent_ip>/`.
    > 
    > Vous pouvez utiliser LuCi pour modifier la configuration de l'agent (par exemple, configurer le WiFi, créer des règles réseaux, etc) avant d'exporter la configuration.
    >
    > De cette manière, il est possible de répliquer celle ci sur plusieurs agents via Emissary !
 3. Transférer le fichier `my-agent-config.json` sur la machine hébergeant votre serveur de pilotage Emissary.
 ### Transformer la configuration en spécification
 #### Prérequis
 - [`jq`](https://stedolan.github.io/jq/)
 - [`sponge`](https://linux.die.net/man/1/sponge) (paquet `moreutils` sur Ubuntu)
 #### Étapes
 1. Sur la machine hébergeant le serveur de pilotage Emissary, utiliser l'outil `jq` pour créer un objet JSON correspondant au schéma attendu par la spécification [`uci.emissary.cadoles.com`](../../../internal/spec/uci/schema.json):
    ```bash
    # Créer la structure de base de la spécification UCI
    cat >> my-uci-spec.json <<EOF
    {
        "config": null,
        "postImportCommands": [
            { "command": "uci", "args": ["commit"] },
            { "command": "reload_config", "args": [] }
        ]
    }
    EOF
    # Injecter la configuration récupérée de notre agent dans la spécification
    cat my-uci-spec.json | jq --slurpfile config my-agent-config.json '.config = $config[0]' | sponge my-uci-spec.json
    ```
    Notre spécification est prête à être assignée à notre agent !
 ### Assigner la spécification à l'agent
 1. Sur la machine hébergeant le serveur de pilotage Emissary, retrouver l'identifiant associé à l'agent:
    ```bash
    # Déclarer une variable contenant l'empreinte de l'agent précédemment trouvée
    AGENT_THUMBPRINT="<empreinte agent>"
    # Récupérer l'identifiant de l'agent
    AGENT_ID=$(emissary client agent query -f json | jq -r --arg thumbprint "$AGENT_THUMBPRINT" '.[] | select(.thumbprint == $thumbprint) | .id')
    ```
 2. Assigner la spécification à l'agent UCI:
    ```bash
    cat my-uci-spec.json | emissary client agent spec update -a ${AGENT_ID} --no-patch --spec-data - --spec-name uci.emissary.cadoles.com
    ```
    **Bravo, vous avez déployé des spécifications UCI sur votre agent !**
 ### Exemple: modifier le `hostname` de votre agent
 En intervenant directement sur notre spécification, il est possible de modifier la configuration et appliquer ces changements à notre agent.
 1. Sur la machine hébergeant le serveur de pilotage, faire:
    ```bash
    # On créait une variable avec le nouveau hostname de notre agent
    MY_NEW_AGENT_HOSTNAME="MyEmissaryAgent"
    # On utilise jq afin de modifier la valeur de configuration dans notre spécification UCI
    cat my-uci-spec.json | jq --arg hostname "$MY_NEW_AGENT_HOSTNAME" '( .config.packages[] | select(.name == "system") | .configs[].options[] | select(.name == "hostname").value ) |= $hostname' | sponge my-uci-spec.json
    ```
    > **Astuce**
    >
    > En utilisant la commande `grep -C 10 hostname  my-uci-spec.json`, on peut voir que la valeur de configuration `hostname` a bien été mise à jour dans notre spécification.
 2. Mettre à jour la configuration de l'agent:
    ```bash
    cat my-uci-spec.json | emissary client agent spec update -a ${AGENT_ID} --no-patch --spec-data - --spec-name uci.emissary.cadoles.com
    ```
 3. Sur l'agent, après quelques secondes (par défaut, la fréquence de mise à jour est de 1 fois par minute) l'agent devrait avoir son `hostname` mis à jour:
    ```
    uci show system.@system[].hostname
    ```
    Un message de ce type devrait s'afficher:
    ```
    system.cfg01e48a.hostname='MyEmissaryAgent'
    ```
    La modification devrait être également visible dans le prompt du shell de l'agent.
--- a/doc/tutorials/fr/docker-agent.md
+++ b/doc/tutorials/fr/docker-agent.md
@ -1,10 +0,0 @@
 # Lancer un agent avec Docker
 ```shell
 docker run \
    --rm -it \
    --network bridge \
    -v emissary-agent-data:/data \
    -e EMISSARY_AGENT_SERVER_URL=<server_url> \
    reg.cadoles.com/cadoles/emissary-agent:latest
 ```
--- a/doc/tutorials/fr/first-steps.md
+++ b/doc/tutorials/fr/first-steps.md
@ -1,184 +1 @@
 # Premiers pas
 ## Prérequis
 - Pour le serveur, une machine [Ubuntu 22.04](https://ubuntu.com/download/server)
 - Pour l'agent, un [RaspberryPi version 3](https://openwrt.org/toh/raspberry_pi_foundation/raspberry_pi)
 ## Étapes
 ### Préparer votre RaspberryPi
 1. Sur la page des ["versions"](https://forge.cadoles.com/arcad/emissary-firmware/releases) des firmwares du projet Emissary, télécharger la dernière version disponibles correspondant à votre système cible, dans le cas présent `openwrt-<openwrt_version>-emissary-<emissary_firmware_version>-bcm27xx-bcm2710-rpi-3-ext4-factory.img.gz`
 2. Brancher votre carte SD dans le lecteur, flasher celle ci avec le firmware:
    ```bash
    # Chemin vers le fichier de firmware précédemment téléchargé
    FIRMWARE_FILE="openwrt-<openwrt_version>-emissary-<emissary_firmware_version>-bcm27xx-bcm2710-rpi-3-ext4-factory.img.gz"
    SDCARD_DEVICE=/dev/sdX  # Chemin vers le "device" correspondant à votre carte SD
    # Décompresser le firmware
    gzip -d "${FIRMWARE_FILE}"
    # Flash la carte SD
    sudo dd if="${FIRMWARE_FILE%.gz}" of="${SDCARD_DEVICE}" bs=2M conv=fsync
    # Attendre la fin des écritures
    sudo sync
    ```
 3. Placer votre carte SD dans votre RaspberryPi, le connecter à votre réseau en Ethernet puis l'allumer.
 4. Scanner votre réseau pour trouver l'adresse IP de votre Raspberry Pi. Par exemple, avec l'outil `nmap`:
    ```bash
    sudo nmap -sP 192.168.0.*   # À modifier par le préfixe correspondant à votre réseau local
    ```
    Une entrée équivalente à la suivante devrait être affichée:
    ```bash
    Starting Nmap 7.93 ( https://nmap.org ) at 2023-05-25 19:29 CEST
    Nmap scan report for 192.168.0.24
    Host is up (0.0034s latency).
    MAC Address: B8:27:EB:E5:7B:55 (Raspberry Pi Foundation)
    [...]
    ```
 5. Se connecter en SSH sur votre RaspberryPi et définir un mot de passe pour le compte administrateur:
    ```bash
    ssh root@<ip>
    passwd
    ```
 ### Installer le serveur Emissary
 1. Sur la machine Ubuntu 22.04, télécharger les paquets Emissary sur la page ["Versions"](https://forge.cadoles.com/arcad/emissary/releases) du projet. Dans le cas présent, choisir le paquet Debian `emissary-server_<emissary_version>_linux_<arch>.deb` où `<arch>` correspond à l'architecture CPU de votre machine.
 2. Installer le paquet télécharger via `dpkg`:
    ```
    sudo dpkg -i emissary-server_<emissary_version>_linux_<arch>.deb
    ```
 3. Appliquer les migrations sur la base de données:
    ```shell
    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml server database migrate
    ```
 4. Redémarrer le service:
    ```shell
    sudo systemctl restart emissary-server
    ```
 5. Créer un jeton d'administration:
    ```shell
    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml server auth create-token --role admin -o "$HOME/.config/emissary/admin-token"
    ```
    > **Note** Le jeton sera stocké dans le répertoire `$HOME/.config/emissary`.
 6. Créer un nouveau `tenant`:
    ```shell
    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml client tenant create --tenant-label "My Tenant" -o wide --token-file "$HOME/.config/emissary/admin-token"
    ```
    Noter la valeur de l'UUID (de la forme `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`) affiché dans la colonne `ID`. Il sera identifié comme `$EMISSARY_TENANT` dans les étapes suivantes.
 7. Créer un jeton d'authentification pour ce nouveau tenant:
    ```shell
    sudo emissary --workdir /usr/share/emissary --config /etc/emissary/server.yml server auth create-token --role writer --tenant $EMISSARY_TENANT
    ```
    > **Note** Le jeton sera stocké dans le fichier `$HOME/.config/emissary/auth-token`. Il sera le jeton utilisé par défaut par le CLI Emissary.
 8. Vérifier l'authentification sur l'API:
    ```shell
    emissary client agent query
    ```
    Une réponse équivalente à la suivante devrait s'afficher:
    ```shell
    +----+-------+------------+--------+-------------+-----------+
    | ID | LABEL | THUMBPRINT | STATUS | CONTACTEDAT | UPDATEDAT |
    +----+-------+------------+--------+-------------+-----------+
    +----+-------+------------+--------+-------------+-----------+
    ```
 ### Appairer l'agent avec votre serveur
 1. Sur le RaspberryPi, exécuter la commande suivante:
    ```shell
    uci set emissary.agent.server_url='http://<server_ip>:3000'
    uci commit emissary
    reload_config
    ```
 2. Via la commande `logread`, vérifier que l'agent arrive à se connecter avec le serveur:
    ```shell
    logread -f
    ```
    Un message de ce type devrait s'afficher:
    ```
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.611 [INFO]	<./internal/agent/controller/persistence/controller.go:58>	(*Controller).Reconcile	no changes detected, doing nothing	{"controller": "persistence-controller"}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.675 [ERROR]	<./internal/agent/controller/spec/controller.go:43>(*Controller).reconcileAgent	unexpected agent status	{"controller": "spec-controller", "agentID": 1, "status": 0}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.676 [INFO]	<./internal/agent/controller/openwrt/uci_controller.go:32>	(*UCIController).Reconcile	could not find uci spec, doing nothing	{"controller": "uci-controller"}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.677 [INFO]	<./internal/agent/controller/app/controller.go:43>	(*Controller).Reconcile	could not find app spec	{"controller": "app-controller"}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.678 [INFO]	<./internal/agent/controller/proxy/controller.go:35>(*Controller).Reconcile	could not find proxy spec	{"controller": "proxy-controller"}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.680 [INFO]	<./internal/agent/controller/mdns/controller.go:38>(*Controller).Reconcile	could not find mdns spec	{"controller": "mdns-controller"}
    Thu May 25 18:48:51 2023 daemon.info emissary[2202]: 2023-05-25 18:48:51.680 [INFO]	<./internal/agent/controller/openwrt/sysupgrade_controller.go:36>	(*SysUpgradeController).Reconcile	could not find sysupgrade spec, doing nothing	{"controller": "sysupgrade-controller"}
    ```
 2. Récupérer le `thumbprint` de votre agent:
    ```
    emissary agent show-thumbprint
    ```
    Noter la valeur de la chaîne de caractères affichée. Elle sera identifiée comme `$AGENT_THUMBPRINT` dans les étapes suivantes.
 3. Sur le serveur, "réclamer" votre agent:
    ```shell
    emissary client agent claim --agent-thumbprint $AGENT_THUMBPRINT
    ```
    Un message de ce type devrait s'afficher:
    ```
    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
    | ID | LABEL | THUMBPRINT                        | STATUS | CONTACTEDAT                       | UPDATEDAT                         |
    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
    | 1  |       | 21CnUATcboKCaheb2uczWCuoxTZtnp... | 0      | 2023-05-25 18:49:51.652680196 ... | "2023-05-25T18:49:51.589225817... |
    +----+-------+-----------------------------------+--------+-----------------------------------+-----------------------------------+
    ```
    Noter la valeur de l'identifiant affiché dans la colonne `ID`. Il sera identifié comme `$AGENT_ID` dans les étapes suivantes.
 4. Mettre à jour le statut de l'agent afin qu'il soit en capacité à récupérer ses spécifications:
    ```
    emissary client agent update --agent-id $AGENT_ID --status 1
    ```
 **Bravo, vous avez appairé votre premier agent et son serveur Emissary !**
 ## Aller plus loin
 - [Déployer une configuration UCI personnalisée sur un agent](./deploy-uci-configuration.md)
 - [Déployer un serveur mandataire inverse sur votre agent](./deploy-reverse-proxy.md)
--- a/go.mod
+++ b/go.mod
@ -1,115 +1,97 @@
 module forge.cadoles.com/Cadoles/emissary
-go 1.21.4
+go 1.19
 toolchain go1.21.5
 require (
-	forge.cadoles.com/arcad/edge v0.0.0-20240112130429-2fbc7186c077
+	forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
 	github.com/antonmedv/expr v1.12.7
 	github.com/brutella/dnssd v1.2.6
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c
 	github.com/evanphx/json-patch/v5 v5.6.0
-	github.com/getsentry/sentry-go v0.25.0
+	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/go-chi/cors v1.2.1
 	github.com/golang-migrate/migrate/v4 v4.15.2
 	github.com/jackc/pgx/v5 v5.3.1
-	github.com/jedib0t/go-pretty/v6 v6.4.9
+	github.com/jedib0t/go-pretty/v6 v6.4.4
-	github.com/lestrrat-go/jwx/v2 v2.0.9
+	github.com/lestrrat-go/jwx/v2 v2.0.8
 	github.com/lithammer/shortuuid/v4 v4.0.0
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/qri-io/jsonschema v0.2.1
-	github.com/urfave/cli/v2 v2.26.0
+	github.com/santhosh-tekuri/jsonschema/v5 v5.1.1
-	gitlab.com/wpetit/goweb v0.0.0-20240226160244-6b2826c79f88
+	github.com/urfave/cli/v2 v2.24.4
 	gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.21.0
 )
 require (
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 // indirect
-	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac // indirect
-	github.com/Masterminds/semver/v3 v3.2.0 // indirect
+	github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/lipgloss v0.7.1 // indirect
 	github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd // indirect
 	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
-	github.com/google/pprof v0.0.0-20230309165930-d61513b1440d // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/hashicorp/mdns v1.0.5 // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/igm/sockjs-go/v3 v3.0.2 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/miekg/dns v1.1.51 // indirect
 	github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
 	github.com/keegancsmith/rpc v1.3.0 // indirect
 	github.com/klauspost/compress v1.16.6 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/miekg/dns v1.1.57 // indirect
 	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.0 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/oklog/ulid/v2 v2.1.0 // indirect
 	github.com/orcaman/concurrent-map v1.0.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	go.opentelemetry.io/otel v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 require (
-	cdr.dev/slog v1.6.1 // indirect
+	cdr.dev/slog v1.4.1 // indirect
 	github.com/alecthomas/chroma v0.10.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
 	github.com/dlclark/regexp2 v1.8.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/go-chi/chi/v5 v5.0.10
+	github.com/fatih/color v1.14.1 // indirect
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/leodido/go-urn v1.2.2 // indirect
 	github.com/lestrrat-go/blackmagic 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/iter v1.0.2 // indirect
-	github.com/lestrrat-go/option v1.0.1 // indirect
+	github.com/lestrrat-go/option v1.0.0 // indirect
 	github.com/lib/pq v1.10.7 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/qri-io/jsonpointer v0.1.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.6.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
@ -121,6 +103,3 @@ require (
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.1.0 // indirect
 )
 // replace forge.cadoles.com/arcad/edge => ../edge
 // replace gitlab.com/wpetit/goweb => ../goweb
--- a/go.sum
+++ b/go.sum
@ -1,7 +1,8 @@
 bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
 bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
-cdr.dev/slog v1.6.1 h1:IQjWZD0x6//sfv5n+qEhbu3wBkmtBQY5DILXNvMaIv4=
+cdr.dev/slog v1.4.0/go.mod h1:C5OL99WyuOK8YHZdYY57dAPN1jK2WJlCdq2VP6xeQns=
-cdr.dev/slog v1.6.1/go.mod h1:eHEYQLaZvxnIAXC+XdTSNLb/kgA/X2RVSF72v5wsxEI=
+cdr.dev/slog v1.4.1 h1:Q8+X63m8/WB4geelMTDO8t4CTwVh1f7+5Cxi7kS/SZg=
 cdr.dev/slog v1.4.1/go.mod h1:O76C6gZJxa5HK1SXMrjd48V2kJxYZKFRTcFfn/V9OhA=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@ -9,6 +10,7 @@ cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.49.0/go.mod h1:hGvAdzcWNbyuxS3nWhD7H2cIJxjRRTRLQVB0bdputVY=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
@ -38,17 +40,9 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
 cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I=
 cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
 cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=
 cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@ -60,10 +54,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-forge.cadoles.com/arcad/arcast v0.0.0-20231220090835-5d0311b7315d h1:SPDaDDF5StoprDqop8j8zozs8xK32EEWnUHLccWplKM=
+forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9 h1:dleaaf/rV2GWtGvrPunRakjrKVDfXoANxAy8/1ctMVs=
-forge.cadoles.com/arcad/arcast v0.0.0-20231220090835-5d0311b7315d/go.mod h1:QR8p4kUScWBcTQ0dE/gR+2ndpKOx77mIDSYGqSF1gms=
+forge.cadoles.com/arcad/edge v0.0.0-20230303153719-6399196fe5c9/go.mod h1:pl9EMtSLSVr4wbDgQBDjr4aizwtmwasE686dm5arYPw=
 forge.cadoles.com/arcad/edge v0.0.0-20240112130429-2fbc7186c077 h1:6bPO5vRqA9pL6rtSXXJya5TPYSW7VEvYL7ZTiVnqstM=
 forge.cadoles.com/arcad/edge v0.0.0-20240112130429-2fbc7186c077/go.mod h1:kBsyQaw2GmVvNMHLgEpIjOkEAyGUxH987p3qIY5UwHQ=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
@ -90,12 +82,8 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
-github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
-github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
 github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@ -130,12 +118,23 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U=
 github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI=
 github.com/alecthomas/assert/v2 v2.0.3 h1:WKqJODfOiQG0nEJKFKzDIG3E29CN2/4zR9XGJzKIkbg=
-github.com/alecthomas/assert/v2 v2.0.3/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA=
+github.com/alecthomas/chroma v0.7.0/go.mod h1:1U/PfCsTALWWYHDnsIQkxEBM0+6LLe0v8+RSVMOwxeY=
 github.com/alecthomas/chroma v0.9.1/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk=
 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE=
 github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod h1:MRgZdU3vrFd05IQ89AxUZ0aYdF39BYoNFa324SodPCA=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5 h1:y6dsSYVb1G5eK6mgmy+BgI3Mw35a3WghArZ/Hbebrjo=
 github.com/alecthomas/participle/v2 v2.0.0-beta.5/go.mod h1:RC764t6n4L8D8ITAJv0qdokritYSNR3wV5cVwmIEaMM=
 github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
 github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
 github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@ -146,8 +145,6 @@ github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antonmedv/expr v1.12.7 h1:jfV/l/+dHWAadLwAtESXNxXdfbK9bE4+FNMHYCMntwk=
 github.com/antonmedv/expr v1.12.7/go.mod h1:FPC8iWArxls7axbVLsW+kpg1mz29A1b2M6jt+hZfDkU=
 github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY=
 github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@ -183,8 +180,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.6.1/go.mod h1:hLZ/AnkIKHLuPGjEiyghNE
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
 github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 h1:JW4WZlqyaNWUUahfr7MigeDW6jmtam5cTzzo1lwsFhE=
 github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692/go.mod h1:Au0ipPuCBA7zsOC61SnyrYetm8VT3vo1UJtwHeYke44=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@ -202,8 +197,6 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/brutella/dnssd v1.2.6 h1:/0P13JkHLRzeLQkWRPEn4hJCr4T3NfknIFw3aNPIC34=
 github.com/brutella/dnssd v1.2.6/go.mod h1:JoW2sJUrmVIef25G6lrLj7HS6Xdwh6q8WUIvMkkBYXs=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
@ -230,8 +223,6 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@ -241,17 +232,12 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E=
 github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg=
 github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
@ -405,7 +391,10 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
 github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
 github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
 github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
@ -423,6 +412,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dhui/dktest v0.3.10 h1:0frpeeoM9pHouHjhLeZDuDTJ0PqjDTrycaHaMmkJAo8=
 github.com/dhui/dktest v0.3.10/go.mod h1:h5Enh0nG3Qbo9WjNFRrwmKUaePEBhXMOygbz3Ww7Sz0=
 github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0=
@ -451,12 +443,12 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
 github.com/dop251/goja v0.0.0-20221118162653-d4bf6fde1b86/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
-github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c h1:/utv6nmTctV6OVgfk5+O6lEMEWL+6KJy4h9NZ5fnkQQ=
+github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac h1:NGu46Adk2oPN3tinGFItahy4W9l+9uhEf03ZxbwmdVE=
-github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4=
+github.com/dop251/goja v0.0.0-20230226152633-7c93113e17ac/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
-github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd h1:8FguYHL/davT0sAfVoi84iRI4MCVTVFtlnmZqIoAXDQ=
+github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f h1:mmnNidRg3cMfcgyeNtIBSDZgjf/85lA/2pplccwSxYg=
-github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd/go.mod h1:0tlktQL7yHfYEtjcRGi/eiOkbDR5XF7gyFFvbC5//E0=
+github.com/dop251/goja_nodejs v0.0.0-20230226152057-060fa99b809f/go.mod h1:0tlktQL7yHfYEtjcRGi/eiOkbDR5XF7gyFFvbC5//E0=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@ -481,6 +473,9 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
@ -498,16 +493,15 @@ github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkF
 github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI=
 github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
 github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
 github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@ -529,10 +523,7 @@ github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
 github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@ -548,8 +539,10 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
@ -583,8 +576,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
@ -596,6 +589,7 @@ github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
 github.com/gogo/protobuf v0.0.0-20161014173244-50d1bd39ce4e/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@ -613,8 +607,10 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@ -642,9 +638,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@ -656,6 +651,7 @@ github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.2-0.20191216170541-340f1ebe299e/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@ -665,8 +661,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
@ -692,9 +687,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/pprof v0.0.0-20230309165930-d61513b1440d h1:um9/pc7tKMINFfP1eE7Wv6PRGXlcCSJkVajF7KJw3uQ=
 github.com/google/pprof v0.0.0-20230309165930-d61513b1440d/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@ -702,8 +695,6 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@ -712,18 +703,20 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
 github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
 github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.4.1/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grandcat/zeroconf v1.0.1-0.20230119201135-e4f60f8407b1 h1:cNb52t5fkWv8ZiicKWnc2eZnhsCCoH7WmRBMIbMp04Q=
 github.com/grandcat/zeroconf v1.0.1-0.20230119201135-e4f60f8407b1/go.mod h1:I6CSXU4zCGL08JOk9NbcT0ofAgnIkS/fVXbYzfSoDic=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@ -751,38 +744,31 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go.net v0.0.0-20151006203346-104dcad90073/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v0.0.0-20151206042412-9d85cf22f9f8/go.mod h1:aa76Av3qgPeIQp9Y3qIkTBPieQYNkQ13Kxe7pze9Wb0=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/mdns v1.0.5 h1:1M5hW1cunYeoXOqHwEb/GBDDHAFo0Yqb/uz/beC6LbE=
 github.com/hashicorp/mdns v1.0.5/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/igm/sockjs-go/v3 v3.0.2 h1:2m0k53w0DBiGozeQUIEPR6snZFmpFpYvVsGnfLPNXbE=
 github.com/igm/sockjs-go/v3 v3.0.2/go.mod h1:UqchsOjeagIBFHvd+RZpLaVRbCwGilEC08EDHsD1jYE=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
 github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
@ -834,12 +820,10 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.0 h1:RdcDk92EJBuBS55nQMMYFXTxwstHug4jkhT5pq8VxPk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jaevor/go-nanoid v1.3.0 h1:nD+iepesZS6pr3uOVf20vR9GdGgJW1HPaR46gtrxzkg=
+github.com/jedib0t/go-pretty/v6 v6.4.4 h1:N+gz6UngBPF4M288kiMURPHELDMIhF/Em35aYuKrsSc=
-github.com/jaevor/go-nanoid v1.3.0/go.mod h1:SI+jFaPuddYkqkVQoNGHs81navCtH388TcrH0RqFKgY=
+github.com/jedib0t/go-pretty/v6 v6.4.4/go.mod h1:MgmISkTWDSFu0xOqiZ0mKNntMQ2mDgOcwOkwBEkMDJI=
 github.com/jedib0t/go-pretty/v6 v6.4.9 h1:vZ6bjGg2eBSrJn365qlxGcaWu09Id+LHtrfDWlB2Usc=
 github.com/jedib0t/go-pretty/v6 v6.4.9/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@ -877,8 +861,6 @@ github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaR
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/keegancsmith/rpc v1.3.0 h1:wGWOpjcNrZaY8GDYZJfvyxmlLljm3YQWF+p918DXtDk=
 github.com/keegancsmith/rpc v1.3.0/go.mod h1:6O2xnOGjPyvIPbvp0MdrOe5r6cu1GZ4JoTzpzDhWeo0=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@ -890,8 +872,6 @@ github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY
 github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
 github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@ -909,6 +889,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4=
 github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ=
 github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80=
@ -919,11 +900,10 @@ github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJG
 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/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
-github.com/lestrrat-go/jwx/v2 v2.0.9 h1:TRX4Q630UXxPVLvP5vGaqVJO7S+0PE6msRZUsFSBoC8=
+github.com/lestrrat-go/jwx/v2 v2.0.8 h1:jCFT8oc0hEDVjgUgsBy1F9cbjsjAVZSXNi7JaU9HR/Q=
-github.com/lestrrat-go/jwx/v2 v2.0.9/go.mod h1:K68euYaR95FnL0hIQB8VvzL70vB7pSifbJUydCTPmgM=
+github.com/lestrrat-go/jwx/v2 v2.0.8/go.mod h1:zLxnyv9rTlEvOUHbc48FAfIL8iYu2hHvIRaTFGc8mT0=
 github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4=
 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/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@ -933,10 +913,6 @@ github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c=
 github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@ -952,7 +928,11 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@ -960,14 +940,14 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
@ -975,25 +955,21 @@ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOq
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
 github.com/miekg/dns v0.0.0-20161006100029-fc4e1e2843d8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
+github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
-github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
+github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
 github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@ -1001,8 +977,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
@ -1024,10 +998,6 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
@ -1038,6 +1008,7 @@ github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86w
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
 github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@ -1100,6 +1071,7 @@ github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuh
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
 github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@ -1111,8 +1083,6 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -1122,6 +1092,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
@ -1167,10 +1138,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qq
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@ -1190,6 +1159,8 @@ github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2u
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 h1:lEOLY2vyGIqKWUI9nzsOJRV3mb3WC9dXYORsLEUcoeY=
 github.com/santhosh-tekuri/jsonschema/v5 v5.1.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
@ -1201,7 +1172,6 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@ -1212,9 +1182,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@ -1227,8 +1196,6 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
@ -1250,6 +1217,7 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.1.5-0.20160925220609-976c720a22c8/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@ -1259,9 +1227,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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.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/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@ -1274,14 +1242,14 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=
+github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
-github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
@ -1292,8 +1260,6 @@ github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/wlynxg/anet v0.0.1 h1:VbkEEgHxPSrRQSiyRd0pmrbcEQAEU2TTb8fb4DmSYoQ=
 github.com/wlynxg/anet v0.0.1/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
@ -1317,10 +1283,8 @@ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPS
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07 h1:0V95X1cBpdj5zyOe6oGtn/BQHlRpV8WlL3eTs3jaxiA=
+gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3 h1:ddXRTeqEr7LcHQEtkd6gogZOh9tI1Y6Gappr0a1oa2I=
-gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07/go.mod h1:Nfr7aZPiSN6biFumhiHbh9k8A3rKQRzR+o0bVtv78UY=
+gitlab.com/wpetit/goweb v0.0.0-20230227162855-a1f09bafccb3/go.mod h1:3sus4zjoUv1GB7eDLL60QaPkUnXJCWBpjvbe0jWifeY=
 gitlab.com/wpetit/goweb v0.0.0-20240226160244-6b2826c79f88 h1:dsyRrmhp7fl/YaY1YIzz7lm9qfIFI5KpKNbXwuhTULA=
 gitlab.com/wpetit/goweb v0.0.0-20240226160244-6b2826c79f88/go.mod h1:bg+TN16Rq2ygLQbB4VDSHQFNouAEzcy3AAutStehllA=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@ -1342,33 +1306,27 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
 go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
 go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
 go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
 go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
 go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
 go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
 go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@ -1379,8 +1337,6 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@ -1404,6 +1360,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -1413,10 +1370,9 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/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.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@ -1465,9 +1421,10 @@ 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.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/net v0.0.0-20161013035702-8b4af36cd21a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -1524,15 +1481,16 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@ -1541,10 +1499,8 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug
 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.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/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-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@ -1576,9 +1532,8 @@ 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-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.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -1587,6 +1542,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -1635,6 +1591,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -1666,6 +1623,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -1699,17 +1657,14 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 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.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -1717,10 +1672,8 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX
 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.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 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.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -1730,13 +1683,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/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=
@ -1824,19 +1774,18 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 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.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
 golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
 gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
@ -1955,12 +1904,8 @@ google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=
+google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9 h1:d3fKQZK+1rWQMg3xLKQbPMirUCo29I/NRdI2WarSzTg=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108=
+google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
 google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU=
 google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 h1:2FZP5XuJY9zQyGM5N0rtovnoXjiMUEIUMvw0m9wlpLc=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@ -1994,8 +1939,7 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
 google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
 google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@ -2010,8 +1954,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -2027,6 +1971,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M=
 gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
@ -2121,7 +2066,6 @@ modernc.org/ccgo/v3 v3.9.2/go.mod h1:gnJpy6NIVqkETT+L5zPsQFj7L2kkhfPMzOghRNv/CFo
 modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
 modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
 modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
 modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8=
 modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw=
 modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8=
@ -2155,14 +2099,12 @@ modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
 modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo=
 modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
 modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
 modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
 modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
 modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
 modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@ -6,8 +6,8 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/api"
 	"gitlab.com/wpetit/goweb/logger"
@ -30,6 +30,7 @@ func (a *Agent) Run(ctx context.Context) error {
 	ticker := time.NewTicker(a.interval)
 	defer ticker.Stop()
 	logger.Info(ctx, "generating token")
 	token, err := agent.GenerateToken(a.privateKey, a.thumbprint)
 	if err != nil {
 		return errors.WithStack(err)
@ -38,34 +39,29 @@ func (a *Agent) Run(ctx context.Context) error {
 	client := client.New(a.serverURL, client.WithToken(token))
 	ctx = withClient(ctx, client)
 	ctx = withThumbprint(ctx, a.thumbprint)
-	tick := func() {
+	for {
 		select {
 		case <-ticker.C:
 			logger.Debug(ctx, "registering agent")
 			if err := a.registerAgent(ctx, client, state); err != nil {
-			err = errors.WithStack(err)
+				logger.Error(ctx, "could not register agent", logger.E(errors.WithStack(err)))
-			logger.Error(ctx, "could not register agent", logger.CapturedE(err))
+
 				continue
 			}
 			logger.Debug(ctx, "state before reconciliation", logger.F("state", state))
 			if err := a.Reconcile(ctx, state); err != nil {
-			err = errors.WithStack(err)
+				logger.Error(ctx, "could not reconcile node with state", logger.E(errors.WithStack(err)))
 			logger.Error(ctx, "could not reconcile node with state", logger.CapturedE(err))
-			return
+				continue
 			}
 			logger.Debug(ctx, "state after reconciliation", logger.F("state", state))
 	}
 	tick()
 	for {
 		select {
 		case <-ticker.C:
 			tick()
 		case <-ctx.Done():
 			return errors.WithStack(ctx.Err())
 		}
@ -82,8 +78,7 @@ func (a *Agent) Reconcile(ctx context.Context, state *State) error {
 		)
 		if err := ctrl.Reconcile(ctrlCtx, state); err != nil {
-			err = errors.WithStack(err)
+			return errors.WithStack(err)
 			logger.Error(ctx, "could not reconcile", logger.CapturedE(err))
 		}
 	}
@ -114,10 +109,9 @@ func (a *Agent) collectMetadata(ctx context.Context) (map[string]any, error) {
 	for _, collector := range a.collectors {
 		name, value, err := collector.Collect(ctx)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "could not collect metadata",
-				logger.CapturedE(err), logger.F("name", name),
+				logger.E(errors.WithStack(err)), logger.F("name", name),
 			)
 			continue
--- a/internal/agent/context.go
+++ b/internal/agent/context.go
@ -3,7 +3,7 @@ package agent
 import (
 	"context"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"github.com/pkg/errors"
 )
@ -11,7 +11,6 @@ type contextKey string
 const (
 	contextKeyClient contextKey = "client"
 	contextKeyThumbprint contextKey = "thumbprint"
 )
 func withClient(ctx context.Context, client *client.Client) context.Context {
@ -26,16 +25,3 @@ func Client(ctx context.Context) *client.Client {
 	return client
 }
 func withThumbprint(ctx context.Context, thumbprint string) context.Context {
 	return context.WithValue(ctx, contextKeyThumbprint, thumbprint)
 }
 func Thumbprint(ctx context.Context) string {
 	thumbprint, ok := ctx.Value(contextKeyThumbprint).(string)
 	if !ok {
 		panic(errors.New("could not retrieve thumbprint from context"))
 	}
 	return thumbprint
 }
--- a/internal/agent/controller/app/app_handler.go
+++ b/internal/agent/controller/app/app_handler.go
@ -1,318 +0,0 @@
 package app
 import (
 	"bytes"
 	"context"
 	"net"
 	"text/template"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/bus"
 	"forge.cadoles.com/arcad/edge/pkg/bus/memory"
 	edgeHTTP "forge.cadoles.com/arcad/edge/pkg/http"
 	"forge.cadoles.com/arcad/edge/pkg/module"
 	appModule "forge.cadoles.com/arcad/edge/pkg/module/app"
 	"forge.cadoles.com/arcad/edge/pkg/module/blob"
 	"forge.cadoles.com/arcad/edge/pkg/module/cast"
 	"forge.cadoles.com/arcad/edge/pkg/module/fetch"
 	fetchModule "forge.cadoles.com/arcad/edge/pkg/module/fetch"
 	netModule "forge.cadoles.com/arcad/edge/pkg/module/net"
 	"forge.cadoles.com/arcad/edge/pkg/module/rpc"
 	shareModule "forge.cadoles.com/arcad/edge/pkg/module/share"
 	"forge.cadoles.com/arcad/edge/pkg/storage"
 	"forge.cadoles.com/arcad/edge/pkg/storage/driver"
 	"forge.cadoles.com/arcad/edge/pkg/storage/share"
 	"github.com/Masterminds/sprig/v3"
 	"github.com/go-chi/chi/v5"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 	// Register storage drivers
 	_ "forge.cadoles.com/arcad/edge/pkg/storage/driver/cache"
 	_ "forge.cadoles.com/arcad/edge/pkg/storage/driver/rpc"
 	_ "forge.cadoles.com/arcad/edge/pkg/storage/driver/sqlite"
 )
 type Dependencies struct {
 	Bus           bus.Bus
 	DocumentStore storage.DocumentStore
 	BlobStore     storage.BlobStore
 	ShareStore    share.Store
 	KeySet        jwk.Set
 	AppRepository appModule.Repository
 	AppID         app.ID
 }
 func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
 	appEntry, exists := specs.Apps[appKey]
 	if !exists {
 		return nil, errors.Errorf("could not find app entry '%s'", appKey)
 	}
 	storage := appEntry.Storage
 	if storage == nil {
 		return nil, errors.Errorf("could not find app entry '%s' storage configuration", appKey)
 	}
 	documentStore, err := driver.NewDocumentStore(appEntry.Storage.DocumentStoreDSN)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	blobStore, err := driver.NewBlobStore(appEntry.Storage.BlobStoreDSN)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	shareStore, err := driver.NewShareStore(appEntry.Storage.ShareStoreDSN)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	keySet, err := getAuthKeySet(specs.Config)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not retrieve auth key set")
 	}
 	mounts := make([]func(r chi.Router), 0)
 	authMount, err := getAuthMount(specs.Config.Auth, keySet)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	if authMount != nil {
 		mounts = append(mounts, authMount)
 	}
 	mounts = append(
 		mounts,
 		appModule.Mount(c.appRepository),
 		blob.Mount(10<<(10*2)), // 10Mb
 		fetch.Mount(),
 	)
 	deps := Dependencies{
 		Bus:           memory.NewBus(),
 		DocumentStore: documentStore,
 		BlobStore:     blobStore,
 		ShareStore:    shareStore,
 		KeySet:        keySet,
 		AppRepository: c.appRepository,
 		AppID:         app.ID(appKey),
 	}
 	modules := c.getAppModules(deps)
 	anonymousUserMiddleware, err := getAnonymousUserMiddleware(specs.Config.Auth)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not get anonymous user middleware")
 	}
 	options := []edgeHTTP.HandlerOptionFunc{
 		edgeHTTP.WithBus(deps.Bus),
 		edgeHTTP.WithServerModules(modules...),
 		edgeHTTP.WithHTTPMounts(mounts...),
 		edgeHTTP.WithHTTPMiddlewares(
 			anonymousUserMiddleware,
 		),
 	}
 	return options, nil
 }
 func getAuthKeySet(config *spec.Config) (jwk.Set, error) {
 	keySet := jwk.NewSet()
 	if config == nil {
 		return nil, nil
 	}
 	auth := config.Auth
 	if auth == nil {
 		return nil, nil
 	}
 	switch {
 	case auth.Local != nil:
 		var (
 			key jwk.Key
 			err error
 		)
 		switch typedKey := auth.Local.Key.(type) {
 		case string:
 			key, err = jwk.FromRaw([]byte(typedKey))
 			if err != nil {
 				return nil, errors.Wrap(err, "could not parse local auth key")
 			}
 			if err := key.Set(jwk.AlgorithmKey, jwa.HS256); err != nil {
 				return nil, errors.WithStack(err)
 			}
 		default:
 			return nil, errors.Errorf("unexpected key type '%T'", auth.Local.Key)
 		}
 		if err := keySet.AddKey(key); err != nil {
 			return nil, errors.WithStack(err)
 		}
 	}
 	return keySet, nil
 }
 func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
 	rawIfaceMappings := make(map[string]string, 0)
 	if specs.Config != nil && specs.Config.AppURLResolving != nil && specs.Config.AppURLResolving.IfaceMappings != nil {
 		rawIfaceMappings = specs.Config.AppURLResolving.IfaceMappings
 	}
 	ifaceMappings := make(map[string]*template.Template, len(rawIfaceMappings))
 	for iface, rawTemplate := range rawIfaceMappings {
 		tmpl, err := template.New("").Funcs(sprig.TxtFuncMap()).Parse(rawTemplate)
 		if err != nil {
 			return nil, errors.Wrapf(err, "could not parse iface '%s' template", iface)
 		}
 		ifaceMappings[iface] = tmpl
 	}
 	defaultRawTemplate := `http://{{ .DeviceIP }}:{{ .AppPort }}`
 	if specs.Config != nil && specs.Config.AppURLResolving != nil && specs.Config.AppURLResolving.DefaultURLTemplate != "" {
 		defaultRawTemplate = specs.Config.AppURLResolving.DefaultURLTemplate
 	}
 	defaultTemplate, err := template.New("").Funcs(sprig.TxtFuncMap()).Parse(defaultRawTemplate)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	return func(ctx context.Context, manifest *app.Manifest, from string) (string, error) {
 		var (
 			urlTemplate *template.Template
 			deviceIP    net.IP
 		)
 		fromIP := net.ParseIP(from)
 		if fromIP != nil {
 		LOOP:
 			for ifaceName, ifaceTmpl := range ifaceMappings {
 				iface, err := net.InterfaceByName(ifaceName)
 				if err != nil {
 					err = errors.WithStack(err)
 					logger.Warn(
 						ctx, "could not find interface",
 						logger.CapturedE(err), logger.F("iface", ifaceName),
 					)
 					continue
 				}
 				addresses, err := iface.Addrs()
 				if err != nil {
 					err = errors.WithStack(err)
 					logger.Error(
 						ctx, "could not list interface addresses",
 						logger.CapturedE(err),
 						logger.F("iface", iface.Name),
 					)
 					continue
 				}
 				for _, addr := range addresses {
 					ifaIP, network, err := net.ParseCIDR(addr.String())
 					if err != nil {
 						err = errors.WithStack(err)
 						logger.Error(
 							ctx, "could not parse interface ip",
 							logger.CapturedE(err),
 							logger.F("iface", iface.Name),
 						)
 						continue
 					}
 					if !network.Contains(fromIP) {
 						continue
 					}
 					deviceIP = ifaIP
 					urlTemplate = ifaceTmpl
 					break LOOP
 				}
 			}
 		}
 		if urlTemplate == nil {
 			urlTemplate = defaultTemplate
 		}
 		if deviceIP == nil {
 			deviceIP = net.ParseIP("127.0.0.1")
 		}
 		var appEntry *spec.AppEntry
 		for appID, entry := range specs.Apps {
 			if manifest.ID != app.ID(appID) {
 				continue
 			}
 			appEntry = &entry
 			break
 		}
 		if appEntry == nil {
 			return "", errors.Errorf("could not find app '%s' in specs", manifest.ID)
 		}
 		_, port, err := net.SplitHostPort(appEntry.Address)
 		if err != nil {
 			return "", errors.WithStack(err)
 		}
 		data := struct {
 			Manifest *app.Manifest
 			Specs    *spec.Spec
 			DeviceIP string
 			AppPort  string
 		}{
 			Manifest: manifest,
 			Specs:    specs,
 			DeviceIP: deviceIP.String(),
 			AppPort:  port,
 		}
 		var buf bytes.Buffer
 		if err := urlTemplate.Execute(&buf, data); err != nil {
 			return "", errors.WithStack(err)
 		}
 		return buf.String(), nil
 	}, nil
 }
 func (c *Controller) getAppModules(deps Dependencies) []app.ServerModuleFactory {
 	return []app.ServerModuleFactory{
 		module.ContextModuleFactory(),
 		module.ConsoleModuleFactory(),
 		cast.CastModuleFactory(),
 		module.LifecycleModuleFactory(),
 		netModule.ModuleFactory(deps.Bus),
 		rpc.ModuleFactory(deps.Bus),
 		module.StoreModuleFactory(deps.DocumentStore),
 		blob.ModuleFactory(deps.Bus, deps.BlobStore),
 		authModuleFactory(deps.KeySet),
 		appModule.ModuleFactory(deps.AppRepository),
 		fetchModule.ModuleFactory(deps.Bus),
 		shareModule.ModuleFactory(deps.AppID, deps.ShareStore),
 	}
 }
--- a/internal/agent/controller/app/app_handler_test.go
+++ b/internal/agent/controller/app/app_handler_test.go
@ -1,73 +0,0 @@
 package app
 import (
 	"context"
 	"testing"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"github.com/pkg/errors"
 )
 func TestCreateResolveAppURL(t *testing.T) {
 	specs := &spec.Spec{
 		Apps: map[string]spec.AppEntry{
 			"app.arcad.test": {
 				Address: ":8080",
 			},
 			"app.arcad.foo": {
 				Address: ":8081",
 			},
 			"app.arcad.bar": {
 				Address: ":8082",
 			},
 		},
 		Config: &spec.Config{
 			AppURLResolving: &spec.AppURLResolving{
 				IfaceMappings: map[string]string{
 					"lo":              "http://{{ .DeviceIP }}:{{ .AppPort }}",
 					"does-not-exists": "http://{{ .DeviceIP }}:{{ .AppPort }}",
 				},
 				DefaultURLTemplate: `http://{{ last ( splitList "." ( toString .Manifest.ID ) ) }}.arcad.local`,
 			},
 		},
 	}
 	resolveAppURL, err := createResolveAppURL(specs)
 	if err != nil {
 		t.Fatalf("%+v", errors.WithStack(err))
 	}
 	manifest := &app.Manifest{
 		ID: "app.arcad.test",
 	}
 	ctx := context.Background()
 	url, err := resolveAppURL(ctx, manifest, "127.0.0.2")
 	if err != nil {
 		t.Fatalf("%+v", errors.WithStack(err))
 	}
 	if e, g := "http://127.0.0.1:8080", url; e != g {
 		t.Errorf("url: expected '%s', got '%s", e, g)
 	}
 	url, err = resolveAppURL(ctx, manifest, "")
 	if err != nil {
 		t.Fatalf("%+v", errors.WithStack(err))
 	}
 	if e, g := "http://test.arcad.local", url; e != g {
 		t.Errorf("url: expected '%s', got '%s", e, g)
 	}
 	url, err = resolveAppURL(ctx, manifest, "192.168.0.100")
 	if err != nil {
 		t.Fatalf("%+v", errors.WithStack(err))
 	}
 	if e, g := "http://test.arcad.local", url; e != g {
 		t.Errorf("url: expected '%s', got '%s", e, g)
 	}
 }
--- a/internal/agent/controller/app/app_repository.go
+++ b/internal/agent/controller/app/app_repository.go
@ -1,141 +0,0 @@
 package app
 import (
 	"context"
 	"sort"
 	"sync"
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/bundle"
 	appModule "forge.cadoles.com/arcad/edge/pkg/module/app"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type ResolveAppURLFunc func(context.Context, *app.Manifest, string) (string, error)
 type AppRepository struct {
 	resolveAppURL ResolveAppURLFunc
 	bundles       []string
 	mutex         sync.RWMutex
 }
 // Get implements app.Repository
 func (r *AppRepository) Get(ctx context.Context, id app.ID) (*app.Manifest, error) {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 	manifest, err := r.findManifest(ctx, id)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	return manifest, nil
 }
 // GetURL implements app.Repository
 func (r *AppRepository) GetURL(ctx context.Context, id app.ID, from string) (string, error) {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 	manifest, err := r.findManifest(ctx, id)
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
 	url, err := r.resolveAppURL(ctx, manifest, from)
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
 	return url, nil
 }
 // List implements app.Repository
 func (r *AppRepository) List(ctx context.Context) ([]*app.Manifest, error) {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 	manifests := make([]*app.Manifest, 0)
 	for _, path := range r.bundles {
 		bundleCtx := logger.With(ctx, logger.F("path", path))
 		bundle, err := bundle.FromPath(path)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(bundleCtx, "could not load bundle", logger.CapturedE(err))
 			continue
 		}
 		manifest, err := app.LoadManifest(bundle)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(bundleCtx, "could not load manifest", logger.CapturedE(err))
 			continue
 		}
 		manifests = append(manifests, manifest)
 	}
 	sort.Sort(ByID(manifests))
 	return manifests, nil
 }
 func (r *AppRepository) Update(resolveAppURL ResolveAppURLFunc, bundles []string) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	r.resolveAppURL = resolveAppURL
 	r.bundles = bundles
 }
 func (r *AppRepository) findManifest(ctx context.Context, id app.ID) (*app.Manifest, error) {
 	for _, path := range r.bundles {
 		bundleCtx := logger.With(ctx, logger.F("path", path))
 		bundle, err := bundle.FromPath(path)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(bundleCtx, "could not load bundle", logger.CapturedE(err))
 			continue
 		}
 		manifest, err := app.LoadManifest(bundle)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(bundleCtx, "could not load manifest", logger.CapturedE(err))
 			continue
 		}
 		if manifest.ID != id {
 			continue
 		}
 		return manifest, nil
 	}
 	return nil, errors.WithStack(appModule.ErrNotFound)
 }
 func NewAppRepository() *AppRepository {
 	return &AppRepository{
 		resolveAppURL: func(ctx context.Context, m *app.Manifest, from string) (string, error) {
 			return "", errors.New("unavailable")
 		},
 		bundles: []string{},
 	}
 }
 var _ appModule.Repository = &AppRepository{}
 type ByID []*app.Manifest
 func (a ByID) Len() int           { return len(a) }
 func (a ByID) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByID) Less(i, j int) bool { return a[i].ID > a[j].ID }
--- a/internal/agent/controller/app/auth_module.go
+++ b/internal/agent/controller/app/auth_module.go
@ -1,166 +0,0 @@
 package app
 import (
 	"net/http"
 	"time"
 	appSpec "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/module"
 	"forge.cadoles.com/arcad/edge/pkg/module/auth"
 	authModule "forge.cadoles.com/arcad/edge/pkg/module/auth"
 	authHTTP "forge.cadoles.com/arcad/edge/pkg/module/auth/http"
 	authModuleMiddleware "forge.cadoles.com/arcad/edge/pkg/module/auth/middleware"
 	"github.com/dop251/goja"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/pkg/errors"
 )
 const (
 	RoleVisitor    string = "visitor"
 	RoleUser       string = "user"
 	RoleSuperuser  string = "superuser"
 	RoleAdmin      string = "admin"
 	RoleSuperadmin string = "superadmin"
 )
 func authModuleFactory(keySet jwk.Set) app.ServerModuleFactory {
 	return module.Extends(
 		authModule.ModuleFactory(
 			authModule.WithJWT(func() (jwk.Set, error) {
 				return keySet, nil
 			}),
 		),
 		func(o *goja.Object) {
 			if err := o.Set("ROLE_VISITOR", RoleVisitor); err != nil {
 				panic(errors.New("could not set 'ROLE_VISITOR' property"))
 			}
 			if err := o.Set("ROLE_USER", RoleUser); err != nil {
 				panic(errors.New("could not set 'ROLE_USER' property"))
 			}
 			if err := o.Set("ROLE_SUPERUSER", RoleSuperuser); err != nil {
 				panic(errors.New("could not set 'ROLE_SUPERUSER' property"))
 			}
 			if err := o.Set("ROLE_ADMIN", RoleAdmin); err != nil {
 				panic(errors.New("could not set 'ROLE_ADMIN' property"))
 			}
 			if err := o.Set("ROLE_SUPERADMIN", RoleSuperadmin); err != nil {
 				panic(errors.New("could not set 'ROLE_SUPERADMIN' property"))
 			}
 		},
 	)
 }
 func getAuthMount(auth *appSpec.Auth, keySet jwk.Set) (auth.MountFunc, error) {
 	switch {
 	case auth.Local != nil:
 		var rawKey any = auth.Local.Key
 		if strKey, ok := rawKey.(string); ok {
 			rawKey = []byte(strKey)
 		}
 		key, err := jwk.FromRaw(rawKey)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
 		cookieDuration := defaultCookieDuration
 		if auth.Local.CookieDuration != "" {
 			cookieDuration, err = time.ParseDuration(auth.Local.CookieDuration)
 			if err != nil {
 				return nil, errors.WithStack(err)
 			}
 		}
 		return authModule.Mount(
 			authHTTP.NewLocalHandler(
 				key,
 				jwa.HS256,
 				authHTTP.WithRoutePrefix("/auth"),
 				authHTTP.WithAccounts(auth.Local.Accounts...),
 				authHTTP.WithCookieOptions(getCookieDomain, cookieDuration),
 			),
 			authModule.WithJWT(func() (jwk.Set, error) {
 				return keySet, nil
 			}),
 		), nil
 	default:
 		return nil, nil
 	}
 }
 func getAnonymousUserMiddleware(auth *appSpec.Auth) (func(http.Handler) http.Handler, error) {
 	anonymousUserSigningKey, err := getAnonymousUserSigningKey(auth)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not get anonymous user signing key")
 	}
 	cookieDuration := defaultCookieDuration
 	if auth.Local.CookieDuration != "" {
 		cookieDuration, err = time.ParseDuration(auth.Local.CookieDuration)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
 	}
 	middleware := authModuleMiddleware.AnonymousUser(
 		anonymousUserSigningKey,
 		auth.Local.SigningAlgorithm,
 		authModuleMiddleware.WithCookieOptions(getCookieDomain, cookieDuration),
 	)
 	return middleware, nil
 }
 func getAnonymousUserSigningKey(auth *appSpec.Auth) (jwk.Key, error) {
 	var (
 		key jwk.Key
 		err error
 	)
 	generateNewKey := func() (jwk.Key, error) {
 		key, err := jwk.Generate(2048)
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
 		return key, nil
 	}
 	switch {
 	default:
 		fallthrough
 	case auth == nil:
 		key, err = generateNewKey()
 		if err != nil {
 			return nil, errors.Wrap(err, "could not generate anonymous user signing key")
 		}
 		return key, nil
 	case auth.Local != nil:
 		switch typedKey := auth.Local.Key.(type) {
 		case string:
 			key, err = jwk.FromRaw([]byte(typedKey))
 			if err != nil {
 				return nil, errors.Wrap(err, "could not parse local auth key")
 			}
 			if err := key.Set(jwk.AlgorithmKey, jwa.HS256); err != nil {
 				return nil, errors.WithStack(err)
 			}
 		default:
 			return nil, errors.Errorf("unexpected key type '%T'", auth.Local.Key)
 		}
 	}
 	return key, nil
 }
--- a/internal/agent/controller/app/controller.go
+++ b/internal/agent/controller/app/controller.go
@ -8,25 +8,19 @@ import (
 	"path/filepath"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
+	"forge.cadoles.com/Cadoles/emissary/internal/spec/app"
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/bundle"
-	"github.com/mitchellh/hashstructure/v2"
+	"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type serverEntry struct {
 	AppDefHash uint64
 	Server     *Server
 }
 type Controller struct {
 	currentSpecRevision int
 	client              *http.Client
 	downloadDir         string
 	dataDir             string
-	servers       map[string]*serverEntry
+	servers             map[string]*Server
 	appRepository *AppRepository
 }
 // Name implements node.Controller.
@ -36,13 +30,13 @@ func (c *Controller) Name() string {
 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
-	appSpec := spec.NewSpec()
+	appSpec := app.NewSpec()
-	if err := state.GetSpec(spec.Name, spec.Version, appSpec); err != nil {
+	if err := state.GetSpec(app.NameApp, appSpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
-			logger.Info(ctx, "could not find app spec")
+			logger.Info(ctx, "could not find app spec, stopping all remaining apps")
-			c.stopAllApps(ctx, appSpec)
+			c.stopAllApps(ctx)
 			return nil
 		}
@ -50,32 +44,28 @@ func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 		return errors.WithStack(err)
 	}
-	logger.Info(
+	logger.Info(ctx, "retrieved spec", logger.F("spec", appSpec.SpecName()), logger.F("revision", appSpec.SpecRevision()))
-		ctx, "retrieved spec",
+
-		logger.F("name", appSpec.SpecDefinitionName()),
+	if c.currentSpecRevision == appSpec.SpecRevision() {
-		logger.F("version", appSpec.SpecDefinitionVersion()),
+		logger.Info(ctx, "spec revision did not change, doing nothing")
-		logger.F("revision", appSpec.SpecRevision()),
+
-	)
+		return nil
 	}
 	c.updateApps(ctx, appSpec)
 	return nil
 }
-func (c *Controller) stopAllApps(ctx context.Context, spec *spec.Spec) {
+func (c *Controller) stopAllApps(ctx context.Context) {
-	if len(c.servers) > 0 {
+	for appID, server := range c.servers {
 		logger.Info(ctx, "stopping all apps")
 	}
 	for appID, entry := range c.servers {
 		logger.Info(ctx, "stopping app", logger.F("appID", appID))
-		if err := entry.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "error while stopping app",
 				logger.F("appID", appID),
-				logger.CapturedE(err),
+				logger.E(errors.WithStack(err)),
 			)
 			delete(c.servers, appID)
@ -83,171 +73,108 @@ func (c *Controller) stopAllApps(ctx context.Context, spec *spec.Spec) {
 	}
 }
-func (c *Controller) updateApps(ctx context.Context, specs *spec.Spec) {
+func (c *Controller) updateApps(ctx context.Context, spec *app.Spec) {
 	hadError := false
 	// Stop and remove obsolete apps
-	for appKey, server := range c.servers {
+	for appID, server := range c.servers {
-		if _, exists := specs.Apps[appKey]; exists {
+		if _, exists := spec.Apps[appID]; exists {
 			continue
 		}
-		logger.Info(ctx, "stopping app", logger.F("appKey", appKey))
+		logger.Info(ctx, "stopping app", logger.F("appID", appID))
-		if err := server.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "error while stopping app",
-				logger.F("appKey", appKey),
+				logger.F("gatewayID", appID),
-				logger.CapturedE(err),
+				logger.E(errors.WithStack(err)),
 			)
-			delete(c.servers, appKey)
+			delete(c.servers, appID)
 			hadError = true
 		}
 	}
-	if err := c.updateAppRepository(ctx, specs); err != nil {
+	// (Re)start apps
-		err = errors.WithStack(err)
+	for appID, appSpec := range spec.Apps {
-		logger.Error(
+		appCtx := logger.With(ctx, logger.F("appID", appID))
 			ctx, "could not update app repository",
 			logger.CapturedE(err),
 		)
-		return
+		if err := c.updateApp(ctx, appID, appSpec); err != nil {
-	}
+			logger.Error(appCtx, "could not update app", logger.E(errors.WithStack(err)))
-	// (Re)start apps if necessary
+			hadError = true
 	for appKey := range specs.Apps {
 		appCtx := logger.With(ctx, logger.F("appKey", appKey))
 		if err := c.updateApp(ctx, specs, appKey); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(appCtx, "could not update app", logger.CapturedE(err))
 			continue
 		}
 	}
 	if !hadError {
 		c.currentSpecRevision = spec.SpecRevision()
 		logger.Info(ctx, "updating current spec revision", logger.F("revision", c.currentSpecRevision))
 	}
 }
-func (c *Controller) updateAppRepository(ctx context.Context, specs *spec.Spec) error {
+func (c *Controller) updateApp(ctx context.Context, appID string, appSpec app.AppEntry) error {
-	bundles := make([]string, 0, len(specs.Apps))
+	bundle, sha256sum, err := c.ensureAppBundle(ctx, appID, appSpec)
 	for appKey, app := range specs.Apps {
 		path := c.getAppBundlePath(appKey, app.Format)
 		bundles = append(bundles, path)
 	}
 	resolveAppURL, err := createResolveAppURL(specs)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	c.appRepository.Update(resolveAppURL, bundles)
 	return nil
 }
 func (c *Controller) updateApp(ctx context.Context, specs *spec.Spec, appKey string) (err error) {
 	appEntry := specs.Apps[appKey]
 	appDef := struct {
 		App    spec.AppEntry
 		Config *spec.Config
 	}{
 		App:    appEntry,
 		Config: specs.Config,
 	}
 	newAppDefHash, err := hashstructure.Hash(appDef, hashstructure.FormatV2, nil)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	bundle, sha256sum, err := c.ensureAppBundle(ctx, appKey, appEntry)
 	if err != nil {
 		return errors.Wrap(err, "could not download app bundle")
 	}
-	server, exists := c.servers[appKey]
+	dataDir, err := c.ensureAppDataDir(ctx, appID)
 	if err != nil {
 		return errors.Wrap(err, "could not retrieve app data dir")
 	}
 	server, exists := c.servers[appID]
 	if !exists {
 		logger.Info(ctx, "app currently not running")
-	} else if sha256sum != appEntry.SHA256Sum {
+	} else if sha256sum != appSpec.SHA256Sum {
 		logger.Info(
 			ctx, "bundle hash mismatch, stopping app",
 			logger.F("currentHash", sha256sum),
-			logger.F("specHash", appEntry.SHA256Sum),
+			logger.F("specHash", appSpec.SHA256Sum),
 		)
-		if err := server.Server.Stop(); err != nil {
+		if err := server.Stop(); err != nil {
 			return errors.Wrap(err, "could not stop app")
 		}
 		server = nil
 	}
 	newServerEntry := func() (*serverEntry, error) {
 		options, err := c.getHandlerOptions(ctx, appKey, specs)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not create handler options")
 		}
 		server = &serverEntry{
 			Server:     NewServer(bundle, specs.Config, options...),
 			AppDefHash: 0,
 		}
 		return server, nil
 	}
 	if server == nil {
-		serverEntry, err := newServerEntry()
+		dbFile := filepath.Join(dataDir, appID+".sqlite")
 		db, err := sqlite.Open(dbFile)
 		if err != nil {
-			return errors.WithStack(err)
+			return errors.Wrapf(err, "could not opend database file '%s'", dbFile)
 		}
-		c.servers[appKey] = serverEntry
+		server = NewServer(bundle, db)
 		c.servers[appID] = server
 	}
-	defChanged := newAppDefHash != server.AppDefHash
+	logger.Info(
-	if server.Server.Running() && !defChanged {
+		ctx, "starting app",
-		return nil
+		logger.F("address", appSpec.Address),
 	}
 	ctx = logger.With(ctx,
 		logger.F("appKey", appKey),
 		logger.F("address", appEntry.Address),
 	)
-	if defChanged && server.AppDefHash != 0 {
+	if err := server.Start(ctx, appSpec.Address); err != nil {
-		logger.Info(ctx, "restarting app")
+		delete(c.servers, appID)
 		if err := server.Server.Stop(); err != nil {
 			return errors.WithStack(err)
 		}
 		serverEntry, err := newServerEntry()
 		if err != nil {
 			return errors.WithStack(err)
 		}
 		c.servers[appKey] = serverEntry
 	} else {
 		logger.Info(ctx, "starting app")
 	}
 	if err := server.Server.Start(ctx, appEntry.Address); err != nil {
 		delete(c.servers, appKey)
 		return errors.Wrap(err, "could not start app")
 	}
 	server.AppDefHash = newAppDefHash
 	return nil
 }
-func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec spec.AppEntry) (bundle.Bundle, string, error) {
+func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec app.AppEntry) (bundle.Bundle, string, error) {
 	if err := os.MkdirAll(c.downloadDir, os.ModePerm); err != nil {
 		return nil, "", errors.WithStack(err)
 	}
-	bundlePath := c.getAppBundlePath(appID, spec.Format)
+	bundlePath := filepath.Join(c.downloadDir, appID+"."+spec.Format)
 	_, err := os.Stat(bundlePath)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
@ -285,21 +212,7 @@ func (c *Controller) ensureAppBundle(ctx context.Context, appID string, spec spe
 		return nil, "", errors.WithStack(err)
 	}
-	manifest, err := app.LoadManifest(bdle)
+	return bdle, "", nil
 	if err != nil {
 		return nil, "", errors.WithStack(err)
 	}
 	valid, err := validateManifest(manifest)
 	if err != nil {
 		return nil, "", errors.WithStack(err)
 	}
 	if !valid {
 		return nil, "", errors.New("bundle's manifest is invalid")
 	}
 	return bdle, spec.SHA256Sum, nil
 }
 func (c *Controller) downloadFile(url string, sha256sum string, dest string) error {
@ -355,10 +268,6 @@ func (c *Controller) ensureAppDataDir(ctx context.Context, appID string) (string
 	return dataDir, nil
 }
 func (c *Controller) getAppBundlePath(appKey string, format string) string {
 	return filepath.Join(c.downloadDir, appKey+"."+format)
 }
 func NewController(funcs ...OptionFunc) *Controller {
 	opts := defaultOptions()
 	for _, fn := range funcs {
@ -369,8 +278,8 @@ func NewController(funcs ...OptionFunc) *Controller {
 		client:              opts.Client,
 		downloadDir:         opts.DownloadDir,
 		dataDir:             opts.DataDir,
-		servers:       make(map[string]*serverEntry),
+		currentSpecRevision: -1,
-		appRepository: NewAppRepository(),
+		servers:             make(map[string]*Server),
 	}
 }
--- a/internal/agent/controller/app/manifest.go
+++ b/internal/agent/controller/app/manifest.go
@ -1,19 +0,0 @@
 package app
 import (
 	"forge.cadoles.com/arcad/edge/pkg/app"
 	"forge.cadoles.com/arcad/edge/pkg/app/metadata"
 	"github.com/pkg/errors"
 )
 func validateManifest(manifest *app.Manifest) (bool, error) {
 	valid, err := manifest.Validate(
 		metadata.WithMinimumRoleValidator(RoleVisitor, RoleUser, RoleSuperuser, RoleAdmin, RoleSuperadmin),
 		metadata.WithNamedPathsValidator(metadata.NamedPathAdmin, metadata.NamedPathIcon),
 	)
 	if err != nil {
 		return false, errors.WithStack(err)
 	}
 	return valid, nil
 }
--- a/internal/agent/controller/app/server.go
+++ b/internal/agent/controller/app/server.go
@ -2,65 +2,54 @@ package app
 import (
 	"context"
-	"net"
+	"database/sql"
 	"net/http"
 	"strings"
 	"sync"
 	"time"
-	appSpec "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app/spec"
+	"forge.cadoles.com/arcad/edge/pkg/app"
-	"forge.cadoles.com/Cadoles/emissary/internal/proxy/wildcard"
+	"forge.cadoles.com/arcad/edge/pkg/bus"
 	"forge.cadoles.com/arcad/edge/pkg/bus/memory"
 	edgeHTTP "forge.cadoles.com/arcad/edge/pkg/http"
-	"gitlab.com/wpetit/goweb/logger"
+	"forge.cadoles.com/arcad/edge/pkg/module"
 	"forge.cadoles.com/arcad/edge/pkg/module/cast"
 	"forge.cadoles.com/arcad/edge/pkg/module/net"
 	"forge.cadoles.com/arcad/edge/pkg/storage"
 	"forge.cadoles.com/arcad/edge/pkg/storage/sqlite"
 	"forge.cadoles.com/arcad/edge/pkg/bundle"
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/pkg/errors"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/imports/passwd"
 )
 const defaultCookieDuration time.Duration = 24 * time.Hour
 type Server struct {
 	bundle bundle.Bundle
-	handlerOptions []edgeHTTP.HandlerOptionFunc
+	db     *sql.DB
 	server *http.Server
 	serverMutex    sync.RWMutex
 	config         *appSpec.Config
 }
-func (s *Server) Start(ctx context.Context, addr string) (err error) {
+func (s *Server) Start(ctx context.Context, addr string) error {
-	if s.Running() {
+	if s.server != nil {
 		if err := s.Stop(); err != nil {
 			return errors.WithStack(err)
 		}
 	}
 	s.serverMutex.Lock()
 	defer s.serverMutex.Unlock()
 	router := chi.NewRouter()
 	router.Use(middleware.RealIP)
 	router.Use(middleware.Logger)
 	router.Use(middleware.Compress(5))
-	handler := edgeHTTP.NewHandler(s.handlerOptions...)
+	bus := memory.NewBus()
-	if err := handler.Load(ctx, s.bundle); err != nil {
+	ds := sqlite.NewDocumentStoreWithDB(s.db)
 	bs := sqlite.NewBlobStoreWithDB(s.db)
 	handler := edgeHTTP.NewHandler(
 		edgeHTTP.WithBus(bus),
 		edgeHTTP.WithServerModules(s.getAppModules(bus, ds, bs)...),
 	)
 	if err := handler.Load(s.bundle); err != nil {
 		return errors.Wrap(err, "could not load app bundle")
 	}
 	if s.config != nil {
 		if s.config.UnexpectedHostRedirect != nil {
 			router.Use(unexpectedHostRedirect(
 				s.config.UnexpectedHostRedirect.HostTarget,
 				s.config.UnexpectedHostRedirect.AcceptedHostPatterns...,
 			))
 		}
 	}
 	router.Handle("/*", handler)
 	server := &http.Server{
@ -69,19 +58,6 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
 	}
 	go func() {
 		defer func() {
 			if recovered := recover(); recovered != nil {
 				if err, ok := recovered.(error); ok {
 					err = errors.WithStack(err)
 					logger.Error(ctx, err.Error(), logger.CapturedE(err))
 					return
 				}
 				panic(recovered)
 			}
 		}()
 		defer func() {
 			if err := s.Stop(); err != nil {
 				panic(errors.WithStack(err))
@ -98,92 +74,52 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
 	return nil
 }
 func (s *Server) Running() bool {
 	s.serverMutex.RLock()
 	defer s.serverMutex.RUnlock()
 	return s.server != nil
 }
 func (s *Server) Stop() error {
 	if !s.Running() {
 		return nil
 	}
 	s.serverMutex.Lock()
 	defer s.serverMutex.Unlock()
 	if s.server == nil {
 		return nil
 	}
 	defer func() {
 		s.server = nil
 	}()
 	if err := s.server.Close(); err != nil {
-		s.server = nil
+		panic(errors.WithStack(err))
 		return errors.WithStack(err)
 	}
 	s.server = nil
 	return nil
 }
-func NewServer(bundle bundle.Bundle, config *appSpec.Config, handlerOptions ...edgeHTTP.HandlerOptionFunc) *Server {
+func (s *Server) getAppModules(bus bus.Bus, ds storage.DocumentStore, bs storage.BlobStore) []app.ServerModuleFactory {
 	return []app.ServerModuleFactory{
 		module.ContextModuleFactory(),
 		module.ConsoleModuleFactory(),
 		cast.CastModuleFactory(),
 		module.LifecycleModuleFactory(),
 		net.ModuleFactory(bus),
 		module.RPCModuleFactory(bus),
 		module.StoreModuleFactory(ds),
 		module.BlobModuleFactory(bus, bs),
 		// module.Extends(
 		// 	auth.ModuleFactory(
 		// 		auth.WithJWT(dummyKeyFunc),
 		// 	),
 		// 	func(o *goja.Object) {
 		// 		if err := o.Set("CLAIM_ROLE", "role"); err != nil {
 		// 			panic(errors.New("could not set 'CLAIM_ROLE' property"))
 		// 		}
 		// 		if err := o.Set("CLAIM_PREFERRED_USERNAME", "preferred_username"); err != nil {
 		// 			panic(errors.New("could not set 'CLAIM_PREFERRED_USERNAME' property"))
 		// 		}
 		// 	},
 		// ),
 	}
 }
 func NewServer(bundle bundle.Bundle, db *sql.DB) *Server {
 	return &Server{
 		bundle: bundle,
-		config:         config,
+		db:     db,
 		handlerOptions: handlerOptions,
 	}
 }
 func getCookieDomain(r *http.Request) (string, error) {
 	host, _, err := net.SplitHostPort(r.Host)
 	if err != nil {
 		host = r.Host
 	}
 	// If host is an IP address
 	if ip := net.ParseIP(host); ip != nil {
 		return "", nil
 	}
 	// If host is an domain, return top level domain
 	domainParts := strings.Split(host, ".")
 	if len(domainParts) >= 2 {
 		topLevelDomain := strings.Join(domainParts[len(domainParts)-2:], ".")
 		return topLevelDomain, nil
 	}
 	// By default, return host
 	return host, nil
 }
 func unexpectedHostRedirect(hostTarget string, acceptedHostPatterns ...string) func(http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		fn := func(w http.ResponseWriter, r *http.Request) {
 			host, port, err := net.SplitHostPort(r.Host)
 			if err != nil {
 				host = r.Host
 			}
 			matched := wildcard.MatchAny(host, acceptedHostPatterns...)
 			if !matched {
 				url := r.URL
 				url.Host = hostTarget
 				if port != "" {
 					url.Host += ":" + port
 				}
 				http.Redirect(w, r, url.String(), http.StatusTemporaryRedirect)
 				return
 			}
 			h.ServeHTTP(w, r)
 		}
 		return http.HandlerFunc(fn)
 	}
 }
--- a/internal/agent/controller/app/spec/schema.json
+++ b/internal/agent/controller/app/spec/schema.json
@ -1,169 +0,0 @@
 {
    "$schema": "https://json-schema.org/draft/2019-09/schema",
    "$id": "https://app.edge.emissary.cadoles.com/spec.json",
    "title": "AppSpec",
    "description": "Emissary 'App' specification",
    "type": "object",
    "properties": {
        "apps": {
            "type": "object",
            "patternProperties": {
                ".*": {
                    "type": "object",
                    "properties": {
                        "url": {
                            "type": "string"
                        },
                        "sha256sum": {
                            "type": "string"
                        },
                        "address": {
                            "type": "string"
                        },
                        "format": {
                            "type": "string",
                            "enum": [
                                "zip",
                                "tar.gz",
                                "zim"
                            ]
                        },
                        "storage": {
                            "type": "object",
                            "properties": {
                                "blobStoreDsn": {
                                    "type": "string"
                                },
                                "documentStoreDsn": {
                                    "type": "string"
                                },
                                "shareStoreDsn": {
                                    "type": "string"
                                }
                            },
                            "required": [
                                "blobStoreDsn",
                                "documentStoreDsn",
                                "shareStoreDsn"
                            ],
                            "additionalProperties": false
                        }
                    },
                    "required": [
                        "url",
                        "sha256sum",
                        "address",
                        "format",
                        "storage"
                    ],
                    "additionalProperties": false
                }
            }
        },
        "config": {
            "type": "object",
            "properties": {
                "appUrlResolving": {
                    "type": "object",
                    "properties": {
                        "ifaceMappings": {
                            "type": "object",
                            "patternProperties": {
                                ".*": {
                                    "type": "string"
                                }
                            }
                        },
                        "defaultUrlTemplate": {
                            "type": "string"
                        }
                    },
                    "required": [
                        "defaultUrlTemplate"
                    ],
                    "additionalProperties": false
                },
                "unexpectedHostRedirect": {
                    "type": "object",
                    "properties": {
                        "acceptedHostPatterns": {
                            "type": "array",
                            "items": {
                                "type": "string"
                            }
                        },
                        "hostTarget": {
                            "type": "string"
                        }
                    },
                    "required": [
                        "acceptedHostPatterns",
                        "hostTarget"
                    ],
                    "additionalProperties": false
                },
                "auth": {
                    "type": "object",
                    "properties": {
                        "local": {
                            "type": "object",
                            "properties": {
                                "key": {
                                    "type": [
                                        "object",
                                        "string"
                                    ]
                                },
                                "signingAlgorithm": {
                                    "type": "string"
                                },
                                "accounts": {
                                    "type": "array",
                                    "items": {
                                        "type": "object",
                                        "properties": {
                                            "username": {
                                                "type": "string"
                                            },
                                            "password": {
                                                "type": "string"
                                            },
                                            "algo": {
                                                "type": "string"
                                            },
                                            "claims": {
                                                "type": "object"
                                            }
                                        },
                                        "required": [
                                            "username",
                                            "password",
                                            "algo"
                                        ]
                                    }
                                },
                                "cookieDomain": {
                                    "type": "string"
                                },
                                "cookieDuration": {
                                    "type": "string"
                                }
                            },
                            "required": [
                                "key",
                                "signingAlgorithm"
                            ],
                            "additionalProperties": false
                        }
                    },
                    "additionalProperties": false
                }
            },
            "additionalProperties": false
        }
    },
    "required": [
        "apps"
    ],
    "additionalProperties": false
 }
--- a/internal/agent/controller/app/spec/spec.go
+++ b/internal/agent/controller/app/spec/spec.go
@ -1,87 +0,0 @@
 package spec
 import (
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	edgeAuth "forge.cadoles.com/arcad/edge/pkg/module/auth/http"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 )
 const (
 	Name    string = "app.emissary.cadoles.com"
 	Version string = "0.0.0"
 )
 type Spec struct {
 	Revision int                 `json:"revision"`
 	Apps     map[string]AppEntry `json:"apps"`
 	Config   *Config             `json:"config"`
 }
 type AppEntry struct {
 	URL       string      `json:"url"`
 	SHA256Sum string      `json:"sha256sum"`
 	Address   string      `json:"address"`
 	Format    string      `json:"format"`
 	Storage   *AppStorage `json:"storage"`
 }
 type AppStorage struct {
 	ShareStoreDSN    string `json:"shareStoreDsn"`
 	DocumentStoreDSN string `json:"documentStoreDsn"`
 	BlobStoreDSN     string `json:"blobStoreDsn"`
 }
 type Auth struct {
 	Local *LocalAuth `json:"local,omitempty"`
 }
 type LocalAuth struct {
 	Key              any                     `json:"key"`
 	SigningAlgorithm jwa.SignatureAlgorithm  `json:"signingAlgorithm"`
 	Accounts         []edgeAuth.LocalAccount `json:"accounts"`
 	CookieDomain     string                  `json:"cookieDomain"`
 	CookieDuration   string                  `json:"cookieDuration"`
 }
 type Config struct {
 	Auth                   *Auth                   `json:"auth"`
 	UnexpectedHostRedirect *UnexpectedHostRedirect `json:"unexpectedHostRedirect"`
 	AppURLResolving        *AppURLResolving        `json:"appUrlResolving"`
 }
 type UnexpectedHostRedirect struct {
 	AcceptedHostPatterns []string `json:"acceptedHostPatterns"`
 	HostTarget           string   `json:"hostTarget"`
 }
 type AppURLResolving struct {
 	IfaceMappings      map[string]string `json:"ifaceMappings"`
 	DefaultURLTemplate string            `json:"defaultUrlTemplate"`
 }
 func (s *Spec) SpecDefinitionName() string {
 	return Name
 }
 func (s *Spec) SpecDefinitionVersion() string {
 	return Version
 }
 func (s *Spec) SpecRevision() int {
 	return s.Revision
 }
 func (s *Spec) SpecData() map[string]any {
 	return map[string]any{
 		"apps":   s.Apps,
 		"config": s.Config,
 	}
 }
 func NewSpec() *Spec {
 	return &Spec{
 		Revision: -1,
 	}
 }
 var _ spec.Spec = &Spec{}
--- a/internal/agent/controller/app/spec/testdata/spec-ok.json
+++ b/internal/agent/controller/app/spec/testdata/spec-ok.json
@ -1,60 +0,0 @@
 {
  "name": "app.emissary.cadoles.com",
  "data": {
    "apps": {
      "edge.sdk.client.test": {
        "url": "http://example.com/edge.sdk.client.test_0.0.0.zip",
        "sha256sum": "58019192dacdae17755707719707db007e26dac856102280583fbd18427dd352",
        "address": ":8081",
        "format": "zip",
        "storage": {
          "blobStoreDsn": "sqlite://apps/data/edge.sdk.client.test/blobstore.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
          "shareStoreDsn": "sqlite://apps/data/sharestore.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
          "documentStoreDsn": "sqlite://apps/data/edge.sdk.client.test/documentstore.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000"
        }
      }
    },
    "config": {
      "auth": {
        "local": {
          "key": {
            "d": "YOre0WZefGfUGFvDg42oL5Oad5Zsb1N_hqPyLVM5ajpTZzcHpB3wT6In9tFO_VshB6lxVtPA9ckPkpMTFY7ygt1Yomc1HkoOKRtmIaqdr4VgNQifU-4yiLiJkSbdYSeMV-KkkN8mGR1keJpJeS34W1X0W6CkU2nw7F5VueBCJfWJA0funRfuWdI68MTUgT9kRZFp-SfvptvRL6jVYHV_5hqxzHCvgEdBSF6QKwx4M6P6QBMt7ft6uMLmFx9abKFw2V51hX3PkxiSepVB3w5CYg4HtS3AHX6bILL4m0R2pdTIkap7i3tkH_xAOuKWt8D6JhadI8X1rEAwXmCS5KrRgQ",
            "dp": "U0HfvBC6hk-SCpuotGIv3vbHCVt1aF3SHK0y32EYCOe8e_9G6YCEILfcvEJ5fiOCc2kvx6TasHQu4qj1uWRKenZlK1sJ6KDybGCkZL1D3jYnbeLZYBuWBL__YbZiST3ewbxzj_EDMWiZ8sUltahza_1weSgg8auSzTHS2LJBHIE",
            "dq": "hVom4ScDxgqhCsQNVpZlN7M3v0tgWjl_gTOHjOyzKCHQJeC0QmJJaMKkQZPWJ8jjLqy7VwVpqC2nZU7QDuX1Cq5eJDQcXi9XtaAfIBico9WcYDre6mDyhL588YHpekyRke8HnZ810iesr0G3gU1h0QvZVVuW-pXTJOXhZTt6nFc",
            "e": "AQAB",
            "kty": "RSA",
            "n": "vPnpkE3-HfNgJSru_K40LstkjiG2Bq_Tt-m0d_yUBBSbirFxF3qH4EXi7WrtZdeDahg2iV2BvpbVVj9GlmGo9OLol6jc7AP2yvZrkbABiiJhCbuPdkYbNpx6B7Itl8RT_bUSYAMZhmux5lpsn4weQ01fzjICi1rA-bIJpOfotdOjP4_lol-LxGZOGJQv9kndP8bgmssJb3Y_2s4gPtkmXySLrhpr5So-_6dVksyuBD9aLcnsMLDbywusjEMCdhqzQbvOjryomnmEXwyz_Ewb5HFK2PfgFtoHkdjqDz-mrEs3tw5g4TdYhCftzJxgbyNAEq4aEiOQrAncYyrXlotP_w",
            "p": "8TNMF0WUe7CEeNVUTsuEcBAAXRguNtpvVifIjlwzFRGOYVGIpKuHsqQPKlZL07I9gPr9LifQnyQus3oEmTOrVs6LB9sfbukbg43ZRKoGVM40JYF5Xjs7R3mEZhgU0WaYOVe3iLtBGMfXNWFwlbfQP-zEb-dPCBX1jWT3LdgNBcE",
            "q": "yJJLNc9w6O4y2icME8k99FugV9E7ObwUxF3v5JN3y1cmAT0h2njyE3iAGqaDZwcY1_jGCisjwoqX6i5E8xqhxX3Gcy3J7SmUAf8fhY8wU3zv9DK7skg2IdvanDb8Y1OM6GchbYZAOVPEg2IvVio8zI-Ih3DDwDk8Df0ufzoHRb8",
            "qi": "zOE-4R3cjPesm3MX-4PdwmsaF9QZLUVRUvvHJ08pKs6kAXP18hzjctAoOjhQDxlTYqNYNePfKzKwost3OJoPgRIc9w9qwUCK1gNOS4Z_xozCIaXgMddNFhkoAfZ4JaKjNCiinzjGfqG99Lf-yzmmREuuhRv7SdS3ST4VQjiJQew"
          },
          "signingAlgorithm": "RS256",
          "accounts": [
            {
              "username": "foo",
              "algo": "plain",
              "password": "bar",
              "claims": {
                "arcad_role": "user",
                "arcad_tenant": "dev.cli",
                "preferred_username": "Foo",
                "sub": "foo"
              }
            }
          ]
        }
      },
      "unexpectedHostRedirect": {
        "acceptedHostPatterns": ["arcad.local", "*.arcad.local", "arcad-*.local", "*.*.*.*"],
        "hostTarget": "arcad.local"
      },
      "appUrlResolving": {
        "ifaceMappings": {
          "eth0": "http://{{ .DeviceIP }}:{{ .AppHost }}"
        },
        "defaultUrlTemplate": "http://{{ last ( splitList \".\" ( toString .Manifest.ID ) ) }}.arcad.local"
      }
    }
  },
  "revision": 0
 }
--- a/internal/agent/controller/app/spec/validator_test.go
+++ b/internal/agent/controller/app/spec/validator_test.go
@ -1,70 +0,0 @@
 package spec
 import (
 	"context"
 	"encoding/json"
 	"io/ioutil"
 	"testing"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore/memory"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )
 type validatorTestCase struct {
 	Name       string
 	Source     string
 	ShouldFail bool
 }
 var validatorTestCases = []validatorTestCase{
 	{
 		Name:       "SpecOK",
 		Source:     "testdata/spec-ok.json",
 		ShouldFail: false,
 	},
 }
 func TestValidator(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
 	repo := memory.NewSpecDefinitionRepository()
 	if _, err := repo.Upsert(ctx, Name, Version, schema); err != nil {
 		t.Fatalf("+%v", errors.WithStack(err))
 	}
 	validator := spec.NewValidator(repo)
 	for _, tc := range validatorTestCases {
 		func(tc validatorTestCase) {
 			t.Run(tc.Name, func(t *testing.T) {
 				t.Parallel()
 				rawSpec, err := ioutil.ReadFile(tc.Source)
 				if err != nil {
 					t.Fatalf("+%v", errors.WithStack(err))
 				}
 				var spec spec.RawSpec
 				if err := json.Unmarshal(rawSpec, &spec); err != nil {
 					t.Fatalf("+%v", errors.WithStack(err))
 				}
 				ctx := context.Background()
 				err = validator.Validate(ctx, &spec)
 				if !tc.ShouldFail && err != nil {
 					t.Errorf("+%v", errors.WithStack(err))
 				}
 				if tc.ShouldFail && err == nil {
 					t.Error("validation should have failed")
 				}
 			})
 		}(tc)
 	}
 }
--- a/internal/agent/controller/gateway/controller.go
+++ b/internal/agent/controller/gateway/controller.go
@ -0,0 +1,124 @@
 package gateway
 import (
 	"context"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec/gateway"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type Controller struct {
 	proxies             map[gateway.ID]*ReverseProxy
 	currentSpecRevision int
 }
 // Name implements node.Controller.
 func (c *Controller) Name() string {
 	return "gateway-controller"
 }
 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	gatewaySpec := gateway.NewSpec()
 	if err := state.GetSpec(gateway.NameGateway, gatewaySpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
 			logger.Info(ctx, "could not find gateway spec, stopping all remaining proxies")
 			c.stopAllProxies(ctx)
 			return nil
 		}
 		return errors.WithStack(err)
 	}
 	logger.Info(ctx, "retrieved spec", logger.F("spec", gatewaySpec.SpecName()), logger.F("revision", gatewaySpec.SpecRevision()))
 	if c.currentSpecRevision == gatewaySpec.SpecRevision() {
 		logger.Info(ctx, "spec revision did not change, doing nothing")
 		return nil
 	}
 	c.updateProxies(ctx, gatewaySpec)
 	c.currentSpecRevision = gatewaySpec.SpecRevision()
 	logger.Info(ctx, "updating current spec revision", logger.F("revision", c.currentSpecRevision))
 	return nil
 }
 func (c *Controller) stopAllProxies(ctx context.Context) {
 	for gatewayID, proxy := range c.proxies {
 		logger.Info(ctx, "stopping proxy", logger.F("gatewayID", gatewayID))
 		if err := proxy.Stop(); err != nil {
 			logger.Error(
 				ctx, "error while stopping proxy",
 				logger.F("gatewayID", gatewayID),
 				logger.E(errors.WithStack(err)),
 			)
 			delete(c.proxies, gatewayID)
 		}
 	}
 }
 func (c *Controller) updateProxies(ctx context.Context, spec *gateway.Spec) {
 	// Stop and remove obsolete gateways
 	for gatewayID, proxy := range c.proxies {
 		if _, exists := spec.Gateways[gatewayID]; exists {
 			continue
 		}
 		logger.Info(ctx, "stopping proxy", logger.F("gatewayID", gatewayID))
 		if err := proxy.Stop(); err != nil {
 			logger.Error(
 				ctx, "error while stopping proxy",
 				logger.F("gatewayID", gatewayID),
 				logger.E(errors.WithStack(err)),
 			)
 			delete(c.proxies, gatewayID)
 		}
 	}
 	// (Re)start gateways
 	for gatewayID, gatewaySpec := range spec.Gateways {
 		proxy, exists := c.proxies[gatewayID]
 		if !exists {
 			proxy = NewReverseProxy()
 			c.proxies[gatewayID] = proxy
 		}
 		logger.Info(
 			ctx, "starting proxy",
 			logger.F("gatewayID", gatewayID),
 			logger.F("addr", gatewaySpec.Address),
 			logger.F("target", gatewaySpec.Target),
 		)
 		if err := proxy.Start(ctx, gatewaySpec.Address, gatewaySpec.Target); err != nil {
 			logger.Error(
 				ctx, "error while starting proxy",
 				logger.F("gatewayID", gatewayID),
 				logger.E(errors.WithStack(err)),
 			)
 			delete(c.proxies, gatewayID)
 		}
 	}
 }
 func NewController() *Controller {
 	return &Controller{
 		proxies:             make(map[gateway.ID]*ReverseProxy),
 		currentSpecRevision: -1,
 	}
 }
 var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/gateway/reverse_proxy.go
+++ b/internal/agent/controller/gateway/reverse_proxy.go
@ -1,22 +1,28 @@
-package proxy
+package gateway
 import (
 	"context"
 	"net/http"
-	"sync"
+	"net/http/httputil"
 	"net/url"
 	"forge.cadoles.com/Cadoles/emissary/internal/proxy"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type ReverseProxy struct {
 	addr   string
 	target string
 	server *http.Server
 	mutex  sync.RWMutex
 }
-func (p *ReverseProxy) Start(ctx context.Context, addr string, funcs ...proxy.OptionFunc) error {
+func (p *ReverseProxy) Start(ctx context.Context, addr, target string) error {
 	alreadyRunning := p.server != nil && target == p.target && addr == p.target
 	if alreadyRunning {
 		return nil
 	}
 	if p.server != nil {
 		if err := p.Stop(); err != nil {
 			return errors.WithStack(err)
@ -27,42 +33,33 @@ func (p *ReverseProxy) Start(ctx context.Context, addr string, funcs ...proxy.Op
 		Addr: addr,
 	}
-	proxy := proxy.New(funcs...)
+	url, err := url.Parse(target)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	proxy := httputil.NewSingleHostReverseProxy(url)
 	server.Handler = proxy
 	p.mutex.Lock()
 	p.server = server
 	p.addr = addr
-	p.mutex.Unlock()
+	p.target = target
 	go func() {
 		defer func() {
 			if err := p.Stop(); err != nil {
 				err = errors.WithStack(err)
 				logger.Error(ctx, "error while stopping gateway", logger.CapturedE(err))
 			}
 		}()
 		if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			err = errors.WithStack(err)
+			logger.Error(ctx, "error while listening", logger.E(errors.WithStack(err)))
-			logger.Error(ctx, "error while listening", logger.CapturedE(err))
+		}
 		if err := p.Stop(); err != nil {
 			logger.Error(ctx, "error while stopping gateway", logger.E(errors.WithStack(err)))
 		}
 	}()
 	return nil
 }
 func (p *ReverseProxy) Running() bool {
 	p.mutex.RLock()
 	defer p.mutex.RUnlock()
 	return p.server != nil
 }
 func (p *ReverseProxy) Stop() error {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 	if p.server == nil {
 		return nil
 	}
--- a/internal/agent/controller/mdns/controller.go
+++ b/internal/agent/controller/mdns/controller.go
@ -1,188 +0,0 @@
 package mdns
 import (
 	"context"
 	"net"
 	"sync"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	mdns "forge.cadoles.com/Cadoles/emissary/internal/agent/controller/mdns/spec"
 	"github.com/brutella/dnssd"
 	"github.com/mitchellh/hashstructure/v2"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 const (
 	DefaultDomain = "local"
 )
 type Controller struct {
 	serviceDefHash uint64
 	cancel         context.CancelFunc
 	responder      dnssd.Responder
 	mutex          sync.RWMutex
 }
 // Name implements node.Controller.
 func (c *Controller) Name() string {
 	return "mdns-controller"
 }
 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	mdnsSpec := mdns.NewSpec()
 	if err := state.GetSpec(mdns.Name, mdns.Version, mdnsSpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
 			logger.Info(ctx, "could not find mdns spec")
 			c.stopResponder(ctx)
 			return nil
 		}
 		return errors.WithStack(err)
 	}
 	logger.Info(ctx, "retrieved spec",
 		logger.F("name", mdnsSpec.SpecDefinitionName()),
 		logger.F("version", mdnsSpec.SpecDefinitionVersion()),
 		logger.F("revision", mdnsSpec.SpecRevision()),
 	)
 	if err := c.updateResponder(ctx, mdnsSpec); err != nil {
 		return errors.Wrap(err, "could not update responder")
 	}
 	return nil
 }
 func (c *Controller) stopResponder(ctx context.Context) {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
 	if c.responder == nil {
 		return
 	}
 	c.cancel()
 	c.responder = nil
 	c.cancel = nil
 }
 func (c *Controller) updateResponder(ctx context.Context, spec *mdns.Spec) error {
 	serviceDef := struct {
 		Services map[string]mdns.Service
 	}{
 		Services: spec.Services,
 	}
 	newServerDefHash, err := hashstructure.Hash(serviceDef, hashstructure.FormatV2, nil)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	c.mutex.RLock()
 	if newServerDefHash == c.serviceDefHash && c.responder != nil {
 		c.mutex.RUnlock()
 		return nil
 	}
 	c.mutex.RUnlock()
 	c.stopResponder(ctx)
 	defaultIfaces, err := c.getDefaultIfaces()
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	services := make([]dnssd.Service, 0, len(spec.Services))
 	for name, service := range spec.Services {
 		domain := service.Domain
 		if domain == "" {
 			domain = DefaultDomain
 		}
 		ifaces := service.Ifaces
 		if len(ifaces) == 0 {
 			ifaces = defaultIfaces
 		}
 		config := dnssd.Config{
 			Name:   name,
 			Type:   service.Type,
 			Domain: domain,
 			Host:   service.Host,
 			Ifaces: ifaces,
 			Port:   service.Port,
 		}
 		service, err := dnssd.NewService(config)
 		if err != nil {
 			err = errors.WithStack(err)
 			logger.Error(ctx, "could not create mdns service", logger.CapturedE(err))
 			continue
 		}
 		services = append(services, service)
 	}
 	responder, err := dnssd.NewResponder()
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	for _, service := range services {
 		if _, err := responder.Add(service); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(ctx, "could not add mdns service", logger.CapturedE(err))
 			continue
 		}
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	c.responder = responder
 	c.cancel = cancel
 	c.serviceDefHash = newServerDefHash
 	go func() {
 		defer c.stopResponder(ctx)
 		if err := responder.Respond(ctx); err != nil && !errors.Is(err, context.Canceled) {
 			err = errors.WithStack(err)
 			logger.Error(ctx, "could not respond to mdns queries", logger.CapturedE(err))
 		}
 	}()
 	return nil
 }
 func (c *Controller) getDefaultIfaces() ([]string, error) {
 	ifaces, err := net.Interfaces()
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	ifaceNames := make([]string, len(ifaces))
 	for idx, ifa := range ifaces {
 		ifaceNames[idx] = ifa.Name
 	}
 	return ifaceNames, nil
 }
 func NewController() *Controller {
 	return &Controller{
 		cancel:         nil,
 		responder:      nil,
 		serviceDefHash: 0,
 	}
 }
 var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/mdns/spec/schema.json
+++ b/internal/agent/controller/mdns/spec/schema.json
@ -1,47 +0,0 @@
 {
    "$schema": "https://json-schema.org/draft/2019-09/schema",
    "$id": "https://mdns.edge.emissary.cadoles.com/spec.json",
    "title": "MDNSSpec",
    "description": "Emissary 'MDNS' specification",
    "type": "object",
    "properties": {
        "services": {
            "type": "object",
            "patternProperties": {
                ".*": {
                    "type": "object",
                    "properties": {
                        "type": {
                            "type": "string"
                        },
                        "domain": {
                            "type": "string"
                        },
                        "host": {
                            "type": "string"
                        },
                        "ifaces": {
                            "type": "array",
                            "items": {
                                "type": "string"
                            }
                        },
                        "port": {
                            "type": "number"
                        }
                    },
                    "required": [
                        "type",
                        "host",
                        "port"
                    ],
                    "additionalProperties": false
                }
            }
        }
    },
    "required": [
        "services"
    ],
    "additionalProperties": false
 }
--- a/internal/agent/controller/mdns/spec/spec.go
+++ b/internal/agent/controller/mdns/spec/spec.go
@ -1,49 +0,0 @@
 package spec
 import (
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 )
 const (
 	Name    string = "mdns.emissary.cadoles.com"
 	Version string = "0.0.0"
 )
 type Spec struct {
 	Revision int                `json:"revision"`
 	Services map[string]Service `json:"services"`
 }
 type Service struct {
 	Type   string   `json:"type"`
 	Domain string   `json:"domain"`
 	Host   string   `json:"host"`
 	Ifaces []string `json:"ifaces"`
 	Port   int      `json:"port"`
 }
 func (s *Spec) SpecDefinitionName() string {
 	return Name
 }
 func (s *Spec) SpecDefinitionVersion() string {
 	return Version
 }
 func (s *Spec) SpecRevision() int {
 	return s.Revision
 }
 func (s *Spec) SpecData() map[string]any {
 	return map[string]any{
 		"services": s.Services,
 	}
 }
 func NewSpec() *Spec {
 	return &Spec{
 		Revision: -1,
 	}
 }
 var _ spec.Spec = &Spec{}
--- a/internal/agent/controller/mdns/spec/testdata/spec-ok.json
+++ b/internal/agent/controller/mdns/spec/testdata/spec-ok.json
@ -1,15 +0,0 @@
 {
  "name": "mdns.emissary.cadoles.com",
  "data": {
    "services": {
      "My Website": {
        "type": "_http._tcp",
        "domain": "local",
        "host": "mywebsite",
        "ifaces": ["lo", "eth0"],
        "port": 80
      }
    }
  },
  "revision": 0
 }
--- a/internal/agent/controller/openwrt/hash.go
+++ b/internal/agent/controller/openwrt/hash.go
@ -1,31 +0,0 @@
 package openwrt
 import (
 	"crypto/sha256"
 	"encoding/hex"
 	"io"
 	"os"
 	"github.com/pkg/errors"
 )
 func hash(path string) (string, error) {
 	file, err := os.Open(path)
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
 	hasher := sha256.New()
 	defer func() {
 		if err := file.Close(); err != nil {
 			panic(errors.WithStack(err))
 		}
 	}()
 	if _, err := io.Copy(hasher, file); err != nil {
 		return "", errors.WithStack(err)
 	}
 	return hex.EncodeToString(hasher.Sum(nil)), nil
 }
--- a/internal/agent/controller/openwrt/spec/sysupgrade/init.go
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/init.go
@ -1,17 +0,0 @@
 package sysupgrade
 import (
 	_ "embed"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )
 //go:embed schema.json
 var schema []byte
 func init() {
 	if err := spec.Register(string(Name), Version, schema); err != nil {
 		panic(errors.WithStack(err))
 	}
 }
--- a/internal/agent/controller/openwrt/spec/sysupgrade/schema.json
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/schema.json
@ -1,24 +0,0 @@
 {
    "$schema": "https://json-schema.org/draft/2019-09/schema",
    "$id": "https://sysupgrade.openwrt.emissary.cadoles.com/spec.json",
    "title": "SysUpgradeSpec",
    "description": "Emissary 'SysUpgrade' specification",
    "type": "object",
    "properties": {
        "url": {
            "type": "string"
        },
        "sha256sum": {
            "type": "string"
        },
        "version": {
            "type": "string"
        }
    },
    "required": [
        "url",
        "sha256sum",
        "version"
    ],
    "additionalProperties": false
 }
--- a/internal/agent/controller/openwrt/spec/sysupgrade/spec.go
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/spec.go
@ -1,45 +0,0 @@
 package sysupgrade
 import (
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 )
 const (
 	Name    string = "sysupgrade.openwrt.emissary.cadoles.com"
 	Version string = "0.0.0"
 )
 type Spec struct {
 	Revision  int    `json:"revision"`
 	URL       string `json:"url"`
 	SHA256Sum string `json:"sha256sum"`
 	Version   string `json:"version"`
 }
 func (s *Spec) SpecDefinitionName() string {
 	return Name
 }
 func (s *Spec) SpecDefinitionVersion() string {
 	return Version
 }
 func (s *Spec) SpecRevision() int {
 	return s.Revision
 }
 func (s *Spec) SpecData() map[string]any {
 	return map[string]any{
 		"url":       s.URL,
 		"version":   s.Version,
 		"sha256sum": s.SHA256Sum,
 	}
 }
 func NewSpec() *Spec {
 	return &Spec{
 		Revision: -1,
 	}
 }
 var _ spec.Spec = &Spec{}
--- a/internal/agent/controller/openwrt/spec/sysupgrade/testdata/spec-ok.json
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/testdata/spec-ok.json
@ -1,9 +0,0 @@
 {
  "name": "sysupgrade.openwrt.emissary.cadoles.com",
  "data": {
    "url": "http://example.com/firmware.img",
    "sha256sum": "58019192dacdae17755707719707db007e26dac856102280583fbd18427dd352",
    "version": "0.0.0"
  },
  "revision": 0
 }
--- a/internal/agent/controller/openwrt/spec/sysupgrade/validator_test.go
+++ b/internal/agent/controller/openwrt/spec/sysupgrade/validator_test.go
@ -1,70 +0,0 @@
 package sysupgrade
 import (
 	"context"
 	"encoding/json"
 	"io/ioutil"
 	"testing"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore/memory"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )
 type validatorTestCase struct {
 	Name       string
 	Source     string
 	ShouldFail bool
 }
 var validatorTestCases = []validatorTestCase{
 	{
 		Name:       "SpecOK",
 		Source:     "testdata/spec-ok.json",
 		ShouldFail: false,
 	},
 }
 func TestValidator(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()
 	repo := memory.NewSpecDefinitionRepository()
 	if _, err := repo.Upsert(ctx, Name, Version, schema); err != nil {
 		t.Fatalf("+%v", errors.WithStack(err))
 	}
 	validator := spec.NewValidator(repo)
 	for _, tc := range validatorTestCases {
 		func(tc validatorTestCase) {
 			t.Run(tc.Name, func(t *testing.T) {
 				t.Parallel()
 				rawSpec, err := ioutil.ReadFile(tc.Source)
 				if err != nil {
 					t.Fatalf("+%v", errors.WithStack(err))
 				}
 				var spec spec.RawSpec
 				if err := json.Unmarshal(rawSpec, &spec); err != nil {
 					t.Fatalf("+%v", errors.WithStack(err))
 				}
 				ctx := context.Background()
 				err = validator.Validate(ctx, &spec)
 				if !tc.ShouldFail && err != nil {
 					t.Errorf("+%v", errors.WithStack(err))
 				}
 				if tc.ShouldFail && err == nil {
 					t.Error("validation should have failed")
 				}
 			})
 		}(tc)
 	}
 }
--- a/internal/agent/controller/openwrt/sysupgrade_controller.go
+++ b/internal/agent/controller/openwrt/sysupgrade_controller.go
@ -1,178 +0,0 @@
 package openwrt
 import (
 	"context"
 	"io"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/openwrt/spec/sysupgrade"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type SysUpgradeController struct {
 	client          *http.Client
 	command         string
 	args            []string
 	firmwareVersion FirmwareVersion
 }
 // Name implements agent.Controller
 func (*SysUpgradeController) Name() string {
 	return "sysupgrade-controller"
 }
 // Reconcile implements agent.Controller
 func (c *SysUpgradeController) Reconcile(ctx context.Context, state *agent.State) error {
 	sysSpec := sysupgrade.NewSpec()
 	if err := state.GetSpec(sysupgrade.Name, sysupgrade.Version, sysSpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
 			logger.Info(ctx, "could not find sysupgrade spec, doing nothing")
 			return nil
 		}
 		return errors.WithStack(err)
 	}
 	firmwareVersion, err := c.firmwareVersion.FirmwareVersion(ctx)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	ctx = logger.With(ctx,
 		logger.F("currentFirmwareVersion", firmwareVersion),
 		logger.F("newFirmwareVersion", sysSpec.Version),
 	)
 	if firmwareVersion == sysSpec.Version {
 		logger.Info(ctx, "firmware version did not change, doing nothing")
 		return nil
 	}
 	downloadDir, err := os.MkdirTemp(os.TempDir(), "emissary_sysupgrade_*")
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	defer func() {
 		if err := os.RemoveAll(downloadDir); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "could not remove download direction",
 				logger.CapturedE(err),
 				logger.F("downloadDir", downloadDir),
 			)
 		}
 	}()
 	firmwareFile := filepath.Join(downloadDir, "firmware.bin")
 	logger.Info(
 		ctx, "downloading firmware",
 		logger.F("url", sysSpec.URL), logger.F("sha256sum", sysSpec.SHA256Sum),
 	)
 	if err := c.downloadFile(ctx, sysSpec.URL, sysSpec.SHA256Sum, firmwareFile); err != nil {
 		return errors.WithStack(err)
 	}
 	logger.Info(ctx, "upgrading firmware")
 	if err := c.upgradeFirmware(ctx, firmwareFile); err != nil {
 		return errors.WithStack(err)
 	}
 	return nil
 }
 func (c *SysUpgradeController) downloadFile(ctx context.Context, url string, sha256sum string, dest string) error {
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	res, err := c.client.Do(req)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil && !errors.Is(err, os.ErrClosed) {
 			panic(errors.WithStack(err))
 		}
 	}()
 	tmp, err := os.CreateTemp(filepath.Dir(dest), "download_")
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	defer func() {
 		if err := os.Remove(tmp.Name()); err != nil && !os.IsNotExist(err) {
 			panic(errors.WithStack(err))
 		}
 	}()
 	if _, err := io.Copy(tmp, res.Body); err != nil {
 		return errors.WithStack(err)
 	}
 	tmpFileHash, err := hash(tmp.Name())
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	if tmpFileHash != sha256sum {
 		return errors.Errorf("sha256 sum mismatch: expected '%s', got '%s'", sha256sum, tmpFileHash)
 	}
 	if err := os.Rename(tmp.Name(), dest); err != nil {
 		return errors.WithStack(err)
 	}
 	return nil
 }
 func (c *SysUpgradeController) upgradeFirmware(ctx context.Context, firmwareFile string) error {
 	templatizedArgs := make([]string, len(c.args))
 	for i, a := range c.args {
 		templatizedArgs[i] = strings.Replace(a, FirmwareFileTemplate, firmwareFile, 1)
 	}
 	command := exec.CommandContext(ctx, c.command, templatizedArgs...)
 	command.Stdout = os.Stdout
 	command.Stderr = os.Stderr
 	logger.Debug(ctx, "executing command", logger.F("command", c.command), logger.F("args", templatizedArgs))
 	if err := command.Run(); err != nil {
 		return errors.WithStack(err)
 	}
 	return nil
 }
 func NewSysUpgradeController(funcs ...SysUpgradeOptionFunc) *SysUpgradeController {
 	opts := defaultSysUpgradeOptions()
 	for _, fn := range funcs {
 		fn(opts)
 	}
 	return &SysUpgradeController{
 		command:         opts.Command,
 		args:            opts.Args,
 		client:          opts.Client,
 		firmwareVersion: opts.FirmwareVersion,
 	}
 }
 var _ agent.Controller = &SysUpgradeController{}
--- a/internal/agent/controller/openwrt/sysupgrade_firmware_version.go
+++ b/internal/agent/controller/openwrt/sysupgrade_firmware_version.go
@ -1,46 +0,0 @@
 package openwrt
 import (
 	"bytes"
 	"context"
 	"os"
 	"os/exec"
 	"strings"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type ShellFirmwareVersion struct {
 	command string
 	args    []string
 }
 // FirmwareVersion implements FirmwareVersion
 func (fv *ShellFirmwareVersion) FirmwareVersion(ctx context.Context) (string, error) {
 	command := exec.CommandContext(ctx, fv.command, fv.args...)
 	var buf bytes.Buffer
 	command.Stdout = &buf
 	command.Stderr = os.Stderr
 	logger.Debug(ctx, "executing command", logger.F("command", fv.command), logger.F("args", fv.args))
 	if err := command.Run(); err != nil {
 		return "", errors.WithStack(err)
 	}
 	version := strings.TrimSpace(buf.String())
 	return version, nil
 }
 func NewShellFirmwareVersion(command string, args ...string) *ShellFirmwareVersion {
 	return &ShellFirmwareVersion{
 		command: command,
 		args:    args,
 	}
 }
 var _ FirmwareVersion = &ShellFirmwareVersion{}
--- a/internal/agent/controller/openwrt/sysupgrade_options.go
+++ b/internal/agent/controller/openwrt/sysupgrade_options.go
@ -1,58 +0,0 @@
 package openwrt
 import (
 	"context"
 	"net/http"
 	"time"
 )
 const FirmwareFileTemplate = "%FIRMWARE%"
 type FirmwareVersion interface {
 	FirmwareVersion(context.Context) (string, error)
 }
 type SysUpgradeOptions struct {
 	Command         string
 	Args            []string
 	FirmwareVersion FirmwareVersion
 	Client          *http.Client
 }
 func defaultSysUpgradeOptions() *SysUpgradeOptions {
 	return &SysUpgradeOptions{
 		Command: `echo`,
 		Args:    []string{`[DUMMY UPGRADE]`, FirmwareFileTemplate},
 		Client: &http.Client{
 			Timeout: 30 * time.Second,
 		},
 		FirmwareVersion: NewShellFirmwareVersion(`echo`, "0.0.0-dummy"),
 	}
 }
 type SysUpgradeOptionFunc func(*SysUpgradeOptions)
 func WithSysUpgradeCommand(command string, args ...string) SysUpgradeOptionFunc {
 	return func(opts *SysUpgradeOptions) {
 		opts.Command = command
 		opts.Args = args
 	}
 }
 func WithSysUpgradeFirmwareVersion(firmwareVersion FirmwareVersion) SysUpgradeOptionFunc {
 	return func(opts *SysUpgradeOptions) {
 		opts.FirmwareVersion = firmwareVersion
 	}
 }
 func WithSysUpgradeShellFirmwareVersion(command string, args ...string) SysUpgradeOptionFunc {
 	return func(opts *SysUpgradeOptions) {
 		opts.FirmwareVersion = NewShellFirmwareVersion(command, args...)
 	}
 }
 func WithSysUpgradeClient(client *http.Client) SysUpgradeOptionFunc {
 	return func(opts *SysUpgradeOptions) {
 		opts.Client = client
 	}
 }
--- a/internal/agent/controller/openwrt/uci_controller.go
+++ b/internal/agent/controller/openwrt/uci_controller.go
@ -27,7 +27,7 @@ func (*UCIController) Name() string {
 func (c *UCIController) Reconcile(ctx context.Context, state *agent.State) error {
 	uciSpec := ucispec.NewSpec()
-	if err := state.GetSpec(ucispec.Name, ucispec.Version, uciSpec); err != nil {
+	if err := state.GetSpec(ucispec.NameUCI, uciSpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
 			logger.Info(ctx, "could not find uci spec, doing nothing")
@ -37,11 +37,7 @@ func (c *UCIController) Reconcile(ctx context.Context, state *agent.State) error
 		return errors.WithStack(err)
 	}
-	logger.Info(ctx, "retrieved spec",
+	logger.Info(ctx, "retrieved spec", logger.F("spec", uciSpec.SpecName()), logger.F("revision", uciSpec.SpecRevision()))
 		logger.F("name", uciSpec.SpecDefinitionName()),
 		logger.F("version", uciSpec.SpecDefinitionVersion()),
 		logger.F("revision", uciSpec.SpecRevision()),
 	)
 	if c.currentSpecRevision == uciSpec.SpecRevision() {
 		logger.Info(ctx, "spec revision did not change, doing nothing")
@ -50,8 +46,7 @@ func (c *UCIController) Reconcile(ctx context.Context, state *agent.State) error
 	}
 	if err := c.updateConfiguration(ctx, uciSpec); err != nil {
-		err = errors.WithStack(err)
+		logger.Error(ctx, "could not update configuration", logger.E(errors.WithStack(err)))
 		logger.Error(ctx, "could not update configuration", logger.CapturedE(err))
 		return nil
 	}
--- a/internal/agent/controller/persistence/controller.go
+++ b/internal/agent/controller/persistence/controller.go
@ -9,12 +9,13 @@ import (
 	"path/filepath"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type Controller struct {
-	trackedSpecRevisions map[string]map[string]int
+	trackedSpecRevisions map[spec.Name]int
 	filename             string
 	loaded               bool
 }
@ -77,14 +78,8 @@ func (c *Controller) specChanged(specs agent.Specs) bool {
 		return true
 	}
-	for name, specVersions := range specs {
+	for name, spec := range specs {
-		trackedSpecs, exists := c.trackedSpecRevisions[name]
+		trackedRevision, exists := c.trackedSpecRevisions[name]
 		if !exists {
 			return true
 		}
 		for version, spec := range specVersions {
 			trackedRevision, exists := trackedSpecs[version]
 		if !exists {
 			return true
 		}
@ -94,22 +89,25 @@ func (c *Controller) specChanged(specs agent.Specs) bool {
 		}
 	}
 	for trackedSpecName, trackedRevision := range c.trackedSpecRevisions {
 		spec, exists := specs[trackedSpecName]
 		if !exists {
 			return true
 		}
 		if trackedRevision != spec.SpecRevision() {
 			return true
 		}
 	}
 	return false
 }
 func (c *Controller) trackSpecsRevisions(specs agent.Specs) {
-	c.trackedSpecRevisions = make(map[string]map[string]int)
+	c.trackedSpecRevisions = make(map[spec.Name]int)
-	for name, specVersions := range specs {
+	for name, spec := range specs {
-		if _, exists := c.trackedSpecRevisions[name]; !exists {
+		c.trackedSpecRevisions[name] = spec.SpecRevision()
 			c.trackedSpecRevisions[name] = make(map[string]int)
 		}
 		for version, spec := range specVersions {
 			c.trackedSpecRevisions[name][version] = spec.SpecRevision()
 		}
 	}
 }
@ -147,8 +145,7 @@ func (c *Controller) writeState(ctx context.Context, state *agent.State) error {
 				return
 			}
-			err = errors.WithStack(err)
+			logger.Error(ctx, "could not remove temporary file", logger.E(errors.WithStack(err)))
 			logger.Error(ctx, "could not remove temporary file", logger.CapturedE(err))
 		}
 	}()
@ -158,8 +155,7 @@ func (c *Controller) writeState(ctx context.Context, state *agent.State) error {
 				return
 			}
-			err = errors.WithStack(err)
+			logger.Error(ctx, "could not close temporary file", logger.E(errors.WithStack(err)))
 			logger.Error(ctx, "could not close temporary file", logger.CapturedE(err))
 		}
 	}()
@ -169,7 +165,7 @@ func (c *Controller) writeState(ctx context.Context, state *agent.State) error {
 	}
 	name := f.Name()
-	if err := os.WriteFile(name, data, os.ModePerm); err != nil {
+	if err := ioutil.WriteFile(name, data, os.ModePerm); err != nil {
 		return errors.Errorf("cannot write data to temporary file %q: %v", name, err)
 	}
@ -215,7 +211,7 @@ func (c *Controller) writeState(ctx context.Context, state *agent.State) error {
 func NewController(filename string) *Controller {
 	return &Controller{
 		filename:             filename,
-		trackedSpecRevisions: make(map[string]map[string]int),
+		trackedSpecRevisions: make(map[spec.Name]int),
 	}
 }
--- a/internal/agent/controller/proxy/controller.go
+++ b/internal/agent/controller/proxy/controller.go
@ -1,188 +0,0 @@
 package proxy
 import (
 	"context"
 	"net/url"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/proxy"
 	spec "forge.cadoles.com/Cadoles/emissary/internal/spec/proxy"
 	"github.com/mitchellh/hashstructure/v2"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type proxyEntry struct {
 	SpecHash uint64
 	Proxy    *ReverseProxy
 }
 type Controller struct {
 	proxies map[spec.ID]*proxyEntry
 }
 // Name implements node.Controller.
 func (c *Controller) Name() string {
 	return "proxy-controller"
 }
 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	proxySpec := spec.NewSpec()
 	if err := state.GetSpec(spec.Name, spec.Version, proxySpec); err != nil {
 		if errors.Is(err, agent.ErrSpecNotFound) {
 			logger.Info(ctx, "could not find proxy spec")
 			c.stopAllProxies(ctx)
 			return nil
 		}
 		return errors.WithStack(err)
 	}
 	logger.Info(
 		ctx, "retrieved spec",
 		logger.F("name", proxySpec.SpecDefinitionName()),
 		logger.F("version", proxySpec.SpecDefinitionVersion()),
 		logger.F("revision", proxySpec.SpecRevision()),
 	)
 	c.updateProxies(ctx, proxySpec)
 	return nil
 }
 func (c *Controller) stopAllProxies(ctx context.Context) {
 	if len(c.proxies) > 0 {
 		logger.Info(ctx, "stopping all proxies")
 	}
 	for proxyID, entry := range c.proxies {
 		logger.Info(ctx, "stopping proxy", logger.F("proxyID", proxyID))
 		if err := entry.Proxy.Stop(); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "error while stopping proxy",
 				logger.F("proxyID", proxyID),
 				logger.CapturedE(err),
 			)
 			delete(c.proxies, proxyID)
 		}
 	}
 }
 func (c *Controller) updateProxies(ctx context.Context, spec *spec.Spec) {
 	// Stop and remove obsolete proxys
 	for proxyID, entry := range c.proxies {
 		if _, exists := spec.Proxies[proxyID]; exists {
 			continue
 		}
 		logger.Info(ctx, "stopping proxy", logger.F("proxyID", proxyID))
 		if err := entry.Proxy.Stop(); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(
 				ctx, "error while stopping proxy",
 				logger.F("proxyID", proxyID),
 				logger.CapturedE(err),
 			)
 			delete(c.proxies, proxyID)
 		}
 	}
 	// (Re)start proxys
 	for proxyID, proxySpec := range spec.Proxies {
 		proxyCtx := logger.With(ctx, logger.F("proxyID", proxyID))
 		if err := c.updateProxy(ctx, proxyID, proxySpec); err != nil {
 			err = errors.WithStack(err)
 			logger.Error(proxyCtx, "could not update proxy", logger.CapturedE(err))
 			continue
 		}
 	}
 }
 func (c *Controller) updateProxy(ctx context.Context, proxyID spec.ID, proxySpec spec.ProxyEntry) (err error) {
 	newProxySpecHash, err := hashstructure.Hash(proxySpec, hashstructure.FormatV2, nil)
 	if err != nil {
 		return errors.WithStack(err)
 	}
 	var entry *proxyEntry
 	entry, exists := c.proxies[proxyID]
 	if !exists {
 		logger.Info(ctx, "proxy currently not running")
 	}
 	if entry == nil {
 		entry = &proxyEntry{
 			Proxy:    NewReverseProxy(),
 			SpecHash: 0,
 		}
 		c.proxies[proxyID] = entry
 	}
 	specChanged := newProxySpecHash != entry.SpecHash
 	if entry.Proxy.Running() && !specChanged {
 		return nil
 	}
 	if specChanged && entry.SpecHash != 0 {
 		logger.Info(
 			ctx, "restarting proxy",
 			logger.F("address", proxySpec.Address),
 		)
 	} else {
 		logger.Info(
 			ctx, "starting proxy",
 			logger.F("address", proxySpec.Address),
 		)
 	}
 	options := make([]proxy.OptionFunc, 0)
 	allowedHosts := make([]string, len(proxySpec.Mappings))
 	mappings := make(map[string]*url.URL, len(proxySpec.Mappings))
 	for _, m := range proxySpec.Mappings {
 		target, err := url.Parse(m.Target)
 		if err != nil {
 			return errors.WithStack(err)
 		}
 		mappings[m.HostPattern] = target
 		allowedHosts = append(allowedHosts, m.HostPattern)
 	}
 	options = append(
 		options,
 		proxy.WithAllowedHosts(allowedHosts...),
 		proxy.WithRewriteHosts(mappings),
 	)
 	if err := entry.Proxy.Start(ctx, proxySpec.Address, options...); err != nil {
 		delete(c.proxies, proxyID)
 		return errors.Wrap(err, "could not start app")
 	}
 	entry.SpecHash = newProxySpecHash
 	return nil
 }
 func NewController() *Controller {
 	return &Controller{
 		proxies: make(map[spec.ID]*proxyEntry),
 	}
 }
 var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/spec/controller.go
+++ b/internal/agent/controller/spec/controller.go
@ -4,8 +4,8 @@ import (
 	"context"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
@ -21,15 +21,22 @@ func (c *Controller) Name() string {
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	cl := agent.Client(ctx)
-	agent, err := cl.GetAgent(
+	agents, _, err := cl.QueryAgents(
 		ctx,
-		state.AgentID(),
+		client.WithQueryAgentsLimit(1),
 		client.WithQueryAgentsID(state.AgentID()),
 	)
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	if err := c.reconcileAgent(ctx, cl, state, agent); err != nil {
+	if len(agents) == 0 {
 		logger.Error(ctx, "could not find remote matching agent")
 		return nil
 	}
 	if err := c.reconcileAgent(ctx, cl, state, agents[0]); err != nil {
 		return errors.WithStack(err)
 	}
@ -40,34 +47,21 @@ func (c *Controller) reconcileAgent(ctx context.Context, client *client.Client,
 	ctx = logger.With(ctx, logger.F("agentID", agent.ID))
 	if agent.Status != datastore.AgentStatusAccepted {
-		logger.Warn(ctx, "unexpected agent status", logger.F("status", agent.Status))
+		logger.Error(ctx, "unexpected agent status", logger.F("status", agent.Status))
 		return nil
 	}
-	specHeaders, err := client.QueryAgentSpecs(ctx, agent.ID)
+	specs, err := client.GetAgentSpecs(ctx, agent.ID)
 	if err != nil {
-		err = errors.WithStack(err)
+		logger.Error(ctx, "could not retrieve agent specs", logger.E(errors.WithStack(err)))
 		logger.Error(ctx, "could not query agent specs", logger.CapturedE(err))
 		return nil
 	}
 	state.ClearSpecs()
-	for _, sh := range specHeaders {
+	for _, spec := range specs {
 		spec, err := client.GetAgentSpec(ctx, agent.ID, sh.DefinitionName, sh.DefinitionVersion)
 		if err != nil {
 			logger.Error(
 				ctx, "could not retrieve agent spec",
 				logger.F("specName", sh.DefinitionName),
 				logger.F("specVersion", sh.DefinitionVersion),
 				logger.CapturedE(errors.WithStack(err)),
 			)
 			continue
 		}
 		state.SetSpec(spec)
 	}
--- a/internal/agent/controller/status/controller.go
+++ b/internal/agent/controller/status/controller.go
@ -1,138 +0,0 @@
 package status
 import (
 	"context"
 	"fmt"
 	"net/http"
 	"sync/atomic"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/api"
 	"gitlab.com/wpetit/goweb/logger"
 )
 type Status struct {
 	Agent        *datastore.Agent
 	Connected    bool
 	Claimed      bool
 	Thumbprint   string
 	ServerURL    string
 	ClaimURL     string
 	AgentURL     string
 	AgentVersion string
 }
 type Controller struct {
 	status       *atomic.Value
 	server       *atomic.Value
 	addr         string
 	claimURL     string
 	agentURL     string
 	agentVersion string
 }
 // Name implements node.Controller.
 func (c *Controller) Name() string {
 	return "status-controller"
 }
 // Reconcile implements node.Controller.
 func (c *Controller) Reconcile(ctx context.Context, state *agent.State) error {
 	cl := agent.Client(ctx)
 	thumbprint := agent.Thumbprint(ctx)
 	connected := true
 	agent, err := cl.GetAgent(ctx, state.AgentID())
 	if err != nil {
 		logger.Error(ctx, "could not get agent", logger.E(errors.WithStack(err)))
 		var apiErr *api.Error
 		if errors.As(err, &apiErr) {
 			switch apiErr.Code {
 			case api.ErrCodeForbidden:
 				// Contact is ok but agent may be not claimed yet
 			default:
 				connected = false
 			}
 		} else {
 			connected = false
 		}
 	}
 	claimed := agent != nil && agent.TenantID != nil
 	var agentID datastore.AgentID
 	if agent != nil {
 		agentID = agent.ID
 	}
 	c.status.Store(Status{
 		Agent:        agent,
 		Connected:    connected,
 		Claimed:      claimed,
 		Thumbprint:   thumbprint,
 		ServerURL:    cl.ServerURL(),
 		ClaimURL:     fmt.Sprintf(c.claimURL, thumbprint),
 		AgentURL:     fmt.Sprintf(c.agentURL, agentID),
 		AgentVersion: c.agentVersion,
 	})
 	if err := c.startServer(ctx); err != nil {
 		return errors.WithStack(err)
 	}
 	return nil
 }
 func (c *Controller) startServer(ctx context.Context) error {
 	server := c.getServer()
 	if server != nil {
 		return nil
 	}
 	server = &http.Server{
 		Addr: c.addr,
 		Handler: &Handler{
 			status: c.status,
 		},
 	}
 	go func() {
 		defer c.setServer(nil)
 		if err := server.ListenAndServe(); err != nil {
 			logger.Error(ctx, "could not start server", logger.E(errors.WithStack(err)))
 		}
 	}()
 	c.setServer(server)
 	return nil
 }
 func (c *Controller) setServer(s *http.Server) {
 	c.server.Store(s)
 }
 func (c *Controller) getServer() *http.Server {
 	server, ok := c.server.Load().(*http.Server)
 	if !ok {
 		return nil
 	}
 	return server
 }
 func NewController(addr string, claimURL string, agentURL string, agentVersion string) *Controller {
 	return &Controller{
 		addr:         addr,
 		claimURL:     claimURL,
 		agentURL:     agentURL,
 		agentVersion: agentVersion,
 		status:       &atomic.Value{},
 		server:       &atomic.Value{},
 	}
 }
 var _ agent.Controller = &Controller{}
--- a/internal/agent/controller/status/handler.go
+++ b/internal/agent/controller/status/handler.go
@ -1,74 +0,0 @@
 package status
 import (
 	"embed"
 	"html/template"
 	"io/fs"
 	"net/http"
 	"sync"
 	"sync/atomic"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 //go:embed templates/*.gotpl
 var templates embed.FS
 //go:embed public/*
 var public embed.FS
 type Handler struct {
 	status *atomic.Value
 	public    http.Handler
 	templates *template.Template
 	init    sync.Once
 	initErr error
 }
 // ServeHTTP implements http.Handler.
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h.init.Do(func() {
 		root, err := fs.Sub(public, "public")
 		if err != nil {
 			h.initErr = errors.WithStack(err)
 			return
 		}
 		h.public = http.FileServer(http.FS(root))
 		tmpl, err := template.ParseFS(templates, "templates/*.gotpl")
 		if err != nil {
 			h.initErr = errors.WithStack(err)
 			return
 		}
 		h.templates = tmpl
 	})
 	if h.initErr != nil {
 		logger.Error(r.Context(), "could not initialize handler", logger.E(h.initErr))
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 	switch r.URL.Path {
 	case "/":
 		h.serveIndex(w, r)
 	default:
 		h.public.ServeHTTP(w, r)
 	}
 }
 func (h *Handler) serveIndex(w http.ResponseWriter, r *http.Request) {
 	data := h.status.Load()
 	if err := h.templates.ExecuteTemplate(w, "index.html.gotpl", data); err != nil {
 		logger.Error(r.Context(), "could not render template", logger.E(errors.WithStack(err)))
 		return
 	}
 }
 var _ http.Handler = &Handler{}
--- a/internal/agent/controller/status/public/bulma-0.9.4.min.css
+++ b/internal/agent/controller/status/public/bulma-0.9.4.min.css
--- a/internal/agent/controller/status/public/logo.png
+++ b/internal/agent/controller/status/public/logo.png
--- a/internal/agent/controller/status/public/qrcode.min.js
+++ b/internal/agent/controller/status/public/qrcode.min.js
--- a/internal/agent/controller/status/templates/index.html.gotpl
+++ b/internal/agent/controller/status/templates/index.html.gotpl
@ -1,145 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <link rel="icon" type="image/x-icon" href="logo.png">
    <title>Status | Emissary Agent</title>
    <link rel="stylesheet" href="bulma-0.9.4.min.css">
    <style>
        body {
            background-color: #f7f7f7f7;
        }
        .logo {
            left: 50%;
            position: absolute;
            margin-left: -40px;
            width: 100px;
            margin-top: -120px
        }
        .card {
            position:relative;
            padding-top: 70px;
            margin-top: 70px;
        }
        #qrcode {
            display: flex;
            flex-direction: row;
            justify-content: center;
        }
    </style>
    {{if or .Connected ( not .Claimed ) }}
    <script type="text/javascript" src="qrcode.min.js"></script>
    {{ end }}
 </head>
 <body>
    <section class="section">
        <div class="container">
            <div class="column">
                <div class="has-text-centered">
                    <h1 class="title is-size-1 ">Emissary</h1>
                    <h2 class="subtitle is-size-4">Agent Status</h2>
                </div>
                <div class="box card">
                    <img class="logo" src="logo.png" />
                    <div class="overflow:hidden">
                        <div class="level is-mobile" style="margin-top:-50px">
                            <div class="level-left">
                                <div class="level-item is-size-4-tablet is-size-7-mobile">
                                    <strong class="mr-2">Connected:</strong>{{if .Connected }}<span class="has-text-success">✔</span>{{ else }}<span class="has-text-danger">✕</span>{{ end }}
                                </div>
                            </div>
                            <div class="level-right">
                                <div class="level-item is-size-4-tablet is-size-7-mobile">
                                    <strong class="mr-2">Claimed:</strong>{{if .Claimed }}<span class="has-text-success">✔</span>{{ else }}<span class="has-text-warning">✕</span>{{ end }}
                                </div>
                            </div>
                        </div>
                        {{ if and .Connected ( not .Claimed ) }}
                        <h3 class="is-size-3 mt-4">Claim your agent</h3>
                        <p class="has-text-centered">
                            You can claim your agent by clicking the following link:<br />
                            <a class="button is-link is-medium mt-3" href="{{ .ClaimURL }}" target="_blank" rel="nofollow">Claim me</a><br />
                        </p>
                        <p class="has-text-centered mt-3">
                            You can also scan the following QRCode:
                            <div id="qrcode" class="mt-3" data-claim-url="{{ .ClaimURL }}"></div>
                            <script type="text/javascript">
                                (function() {
                                    const qrCodeElement = document.getElementById("qrcode");
                                    const claimUrl = qrCodeElement.dataset.claimUrl;
                                    new QRCode(qrCodeElement, claimUrl);
                                }())
                            </script>
                        </p>
                        {{ end }}
                        {{ if and .Connected .Claimed }}
                        <h3 class="is-size-3 mt-4">Manage your agent</h3>
                        <p class="has-text-centered">
                            You can manage your agent by clicking the following link:<br />
                            <a class="button is-link is-medium mt-3" href="{{ .AgentURL }}" target="_blank" rel="nofollow">Manage me</a><br />
                        </p>
                        <p class="has-text-centered mt-3">
                            You can also scan the following QRCode:
                            <div id="qrcode" class="mt-3" data-agent-url="{{ .AgentURL }}"></div>
                            <script type="text/javascript">
                               (function() {
                                    const qrCodeElement = document.getElementById("qrcode");
                                    const agentUrl = qrCodeElement.dataset.agentUrl;
                                    new QRCode(qrCodeElement, agentUrl);
                               }())
                            </script>
                        </p>
                        {{ end }}
                        <h3 class="is-size-3 mt-4">Informations</h3>
                        <div class="table-container">
                            <table class="table is-fullwidth">
                                <thead>
                                    <tr>
                                        <th>Attribute</th>
                                        <th>Value</th>
                                    </tr>
                                </thead>
                                <tbody>
                                    <tr>
                                        <td>Thumbprint</td>
                                        <td><code>{{ .Thumbprint }}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Agent ID</td>
                                        <td><code>{{ if .Agent }}{{ .Agent.ID }}{{ else }}unknown{{end}}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Agent Label</td>
                                        <td><code>{{ with .Agent }}{{ if .Label }}{{ .Label }}{{ else }}empty{{end}}{{ else }}unknown{{end}}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Last server contact</td>
                                        <td><code>{{ if .Agent }}{{ .Agent.ContactedAt }}{{ else }}unknown{{end}}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Server URL</td>
                                        <td><code>{{ .ServerURL }}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Claim URL</td>
                                        <td><code>{{ .ClaimURL }}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Agent URL</td>
                                        <td><code>{{ if .Agent }}{{ .AgentURL }}{{ else }}unknown{{end}}</code></td>
                                    </tr>
                                    <tr>
                                        <td>Agent version</td>
                                        <td><code>{{ .AgentVersion }}</code></td>
                                    </tr>
                                </tbody>
                            </table>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </section>
 </body>
 </html>
--- a/internal/agent/options.go
+++ b/internal/agent/options.go
@ -4,7 +4,7 @@ import (
 	"time"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/client"
 )
 type Options struct {
--- a/internal/agent/state.go
+++ b/internal/agent/state.go
@ -11,7 +11,7 @@ import (
 var ErrSpecNotFound = errors.New("spec not found")
-type Specs map[string]map[string]spec.Spec
+type Specs map[spec.Name]spec.Spec
 type State struct {
 	agentID datastore.AgentID
@ -20,35 +20,27 @@ type State struct {
 func NewState() *State {
 	return &State{
-		specs: make(map[string]map[string]spec.Spec),
+		specs: make(map[spec.Name]spec.Spec),
 	}
 }
 func (s *State) MarshalJSON() ([]byte, error) {
 	state := struct {
 		ID    datastore.AgentID           `json:"agentId"`
-		Specs map[string]map[string]*spec.RawSpec `json:"specs"`
+		Specs map[spec.Name]*spec.RawSpec `json:"specs"`
 	}{
 		ID: s.agentID,
-		Specs: func(specs map[string]map[string]spec.Spec) map[string]map[string]*spec.RawSpec {
+		Specs: func(specs map[spec.Name]spec.Spec) map[spec.Name]*spec.RawSpec {
-			rawSpecs := make(map[string]map[string]*spec.RawSpec)
+			rawSpecs := make(map[spec.Name]*spec.RawSpec)
-			for name, versions := range specs {
+			for name, sp := range specs {
-				if _, exists := rawSpecs[name]; !exists {
+				rawSpecs[name] = &spec.RawSpec{
-					rawSpecs[name] = make(map[string]*spec.RawSpec)
+					Name:     sp.SpecName(),
 				}
 				for version, sp := range versions {
 					rawSpecs[name][version] = &spec.RawSpec{
 						DefinitionName:    sp.SpecDefinitionName(),
 						DefinitionVersion: sp.SpecDefinitionVersion(),
 					Revision: sp.SpecRevision(),
 					Data:     sp.SpecData(),
 				}
 			}
 			}
 			return rawSpecs
 		}(s.specs),
 	}
@ -64,23 +56,18 @@ func (s *State) MarshalJSON() ([]byte, error) {
 func (s *State) UnmarshalJSON(data []byte) error {
 	state := struct {
 		AgentID datastore.AgentID           `json:"agentId"`
-		Specs   map[string]map[string]*spec.RawSpec `json:"specs"`
+		Specs   map[spec.Name]*spec.RawSpec `json:"specs"`
 	}{}
 	if err := json.Unmarshal(data, &state); err != nil {
 		return errors.WithStack(err)
 	}
-	s.specs = func(rawSpecs map[string]map[string]*spec.RawSpec) Specs {
+	s.specs = func(rawSpecs map[spec.Name]*spec.RawSpec) Specs {
 		specs := make(Specs)
-		for name, versions := range rawSpecs {
+		for name, raw := range rawSpecs {
-			if _, exists := specs[name]; !exists {
+			specs[name] = spec.Spec(raw)
 				specs[name] = make(map[string]spec.Spec)
 			}
 			for version, raw := range versions {
 				specs[name][version] = spec.Spec(raw)
 			}
 		}
 		return specs
@ -98,36 +85,23 @@ func (s *State) Specs() Specs {
 }
 func (s *State) ClearSpecs() *State {
-	s.specs = make(map[string]map[string]spec.Spec)
+	s.specs = make(map[spec.Name]spec.Spec)
 	return s
 }
 func (s *State) SetSpec(sp spec.Spec) *State {
 	if s.specs == nil {
-		s.specs = make(map[string]map[string]spec.Spec)
+		s.specs = make(map[spec.Name]spec.Spec)
 	}
-	name := sp.SpecDefinitionName()
+	s.specs[sp.SpecName()] = sp
 	if _, exists := s.specs[name]; !exists {
 		s.specs[name] = make(map[string]spec.Spec)
 	}
 	version := sp.SpecDefinitionVersion()
 	s.specs[name][version] = sp
 	return s
 }
-func (s *State) GetSpec(name string, version string, dest any) error {
+func (s *State) GetSpec(name spec.Name, dest any) error {
-	versions, exists := s.specs[name]
+	spec, exists := s.specs[name]
 	if !exists {
 		return errors.WithStack(ErrSpecNotFound)
 	}
 	spec, exists := versions[version]
 	if !exists {
 		return errors.WithStack(ErrSpecNotFound)
 	}
--- a/internal/auth/agent/authenticator.go
+++ b/internal/auth/agent/authenticator.go
@ -4,7 +4,6 @@ import (
 	"context"
 	"net/http"
 	"strings"
 	"time"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
@ -14,15 +13,14 @@ import (
 	"gitlab.com/wpetit/goweb/logger"
 )
 const DefaultAcceptableSkew = 5 * time.Minute
 type Authenticator struct {
 	repo datastore.AgentRepository
 	acceptableSkew time.Duration
 }
 // Authenticate implements auth.Authenticator.
 func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth.User, error) {
 	ctx = logger.With(r.Context(), logger.F("remoteAddr", r.RemoteAddr))
 	authorization := r.Header.Get("Authorization")
 	if authorization == "" {
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
@ -35,19 +33,17 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 	token, err := jwt.Parse([]byte(rawToken), jwt.WithVerify(false))
 	if err != nil {
-		logger.Debug(ctx, "could not parse jwt token", logger.CapturedE(errors.WithStack(err)))
+		return nil, errors.WithStack(err)
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	rawThumbprint, exists := token.Get(keyThumbprint)
 	if !exists {
-		return nil, errors.WithStack(auth.ErrUnauthenticated)
+		return nil, errors.Errorf("could not find '%s' claim", keyThumbprint)
 	}
 	thumbrint, ok := rawThumbprint.(string)
 	if !ok {
-		logger.Debug(ctx, "unexpected claim value", logger.F("claim", rawThumbprint), logger.F("value", rawThumbprint))
+		return nil, errors.Errorf("unexpected '%s' claim value: '%v'", keyThumbprint, rawThumbprint)
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	agents, _, err := a.repo.Query(
@ -60,8 +56,7 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 	}
 	if len(agents) != 1 {
-		logger.Debug(ctx, "unexpected number of found agents", logger.F("total", len(agents)))
+		return nil, errors.Errorf("unexpected number of found agents: '%d'", len(agents))
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	agent, err := a.repo.Get(
@ -76,18 +71,9 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 		[]byte(rawToken),
 		jwt.WithKeySet(agent.KeySet.Set, jws.WithRequireKid(false)),
 		jwt.WithValidate(true),
 		jwt.WithAcceptableSkew(a.acceptableSkew),
 	)
 	if err != nil {
-		logger.Error(ctx, "could not parse jwt", logger.CapturedE(errors.WithStack(err)))
+		return nil, errors.WithStack(err)
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	contactedAt := time.Now().UTC()
 	agent, err = a.repo.Update(ctx, agent.ID, datastore.WithAgentUpdateContactedAt(contactedAt))
 	if err != nil {
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	user := &User{
@ -97,10 +83,9 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 	return user, nil
 }
-func NewAuthenticator(repo datastore.AgentRepository, acceptableSkew time.Duration) *Authenticator {
+func NewAuthenticator(repo datastore.AgentRepository) *Authenticator {
 	return &Authenticator{
 		repo: repo,
 		acceptableSkew: acceptableSkew,
 	}
 }
--- a/internal/auth/agent/jwt.go
+++ b/internal/auth/agent/jwt.go
@ -18,7 +18,7 @@ func GenerateToken(key jwk.Key, thumbprint string) (string, error) {
 		return "", errors.WithStack(err)
 	}
-	now := time.Now().UTC()
+	now := time.Now()
 	if err := token.Set(jwt.NotBeforeKey, now); err != nil {
 		return "", errors.WithStack(err)
--- a/internal/auth/agent/user.go
+++ b/internal/auth/agent/user.go
@ -1,7 +1,6 @@
 package agent
 import (
 	"encoding/json"
 	"fmt"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth"
@ -14,34 +13,11 @@ type User struct {
 // Subject implements auth.User
 func (u *User) Subject() string {
-	return fmt.Sprintf("agent-%d", u.agent.ID)
+	return fmt.Sprintf("agent#%d", u.agent.ID)
 }
 // Subject implements auth.User
 func (u *User) Tenant() datastore.TenantID {
 	if u.agent.TenantID == nil {
 		return ""
 	}
 	return *u.agent.TenantID
 }
 func (u *User) Agent() *datastore.Agent {
 	return u.agent
 }
 func (u *User) MarshalJSON() ([]byte, error) {
 	type user struct {
 		Subject string `json:"subject"`
 		Tenant  string `json:"tenant"`
 	}
 	jsonUser := user{
 		Subject: u.Subject(),
 		Tenant:  string(u.Tenant()),
 	}
 	return json.Marshal(jsonUser)
 }
 var _ auth.User = &User{}
--- a/internal/auth/error.go
+++ b/internal/auth/error.go
@ -1,8 +0,0 @@
 package auth
 import "github.com/pkg/errors"
 var (
 	ErrUnauthenticated = errors.New("unauthenticated")
 	ErrUnauthorized    = errors.New(("unauthorized"))
 )
--- a/internal/auth/middleware.go
+++ b/internal/auth/middleware.go
@ -4,7 +4,6 @@ import (
 	"context"
 	"net/http"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/api"
 	"gitlab.com/wpetit/goweb/logger"
@ -21,8 +20,8 @@ const (
 	contextKeyUser contextKey = "user"
 )
-func CtxUser(ctx context.Context) (User, error) {
+func CtxUser(ctx context.Context) (*User, error) {
-	user, ok := ctx.Value(contextKeyUser).(User)
+	user, ok := ctx.Value(contextKeyUser).(*User)
 	if !ok {
 		return nil, errors.Errorf("unexpected user type: expected '%T', got '%T'", new(User), ctx.Value(contextKeyUser))
 	}
@ -30,9 +29,13 @@ func CtxUser(ctx context.Context) (User, error) {
 	return user, nil
 }
 var (
 	ErrUnauthenticated = errors.New("unauthenticated")
 	ErrForbidden       = errors.New("forbidden")
 )
 type User interface {
 	Subject() string
 	Tenant() datastore.TenantID
 }
 type Authenticator interface {
@ -49,12 +52,11 @@ func Middleware(authenticators ...Authenticator) func(http.Handler) http.Handler
 				err  error
 			)
 			var errs []error
 			for _, auth := range authenticators {
 				user, err = auth.Authenticate(ctx, r)
 				if err != nil {
-					errs = append(errs, errors.WithStack(err))
+					logger.Warn(ctx, "could not authenticate request", logger.E(errors.WithStack(err)))
 					continue
 				}
@ -64,25 +66,11 @@ func Middleware(authenticators ...Authenticator) func(http.Handler) http.Handler
 			}
 			if user == nil {
 				hasUnauthorized, hasUnauthenticated, hasUnknown := checkErrors(errs)
 				switch {
 				case hasUnauthorized && !hasUnknown:
 					api.ErrorResponse(w, http.StatusForbidden, api.ErrCodeForbidden, nil)
 					return
 				case hasUnauthenticated && !hasUnknown:
 					api.ErrorResponse(w, http.StatusUnauthorized, api.ErrCodeUnauthorized, nil)
 					return
 				case hasUnknown:
 					api.ErrorResponse(w, http.StatusInternalServerError, api.ErrCodeUnknownError, nil)
 					return
 				default:
 				api.ErrorResponse(w, http.StatusUnauthorized, ErrCodeUnauthorized, nil)
 				return
 			}
 			}
 			ctx = logger.With(ctx, logger.F("user", user.Subject()))
 			ctx = context.WithValue(ctx, contextKeyUser, user)
 			h.ServeHTTP(w, r.WithContext(ctx))
@ -91,22 +79,3 @@ func Middleware(authenticators ...Authenticator) func(http.Handler) http.Handler
 		return http.HandlerFunc(fn)
 	}
 }
 func checkErrors(errs []error) (isUnauthorized bool, isUnauthenticated bool, isUnknown bool) {
 	isUnauthenticated = false
 	isUnauthorized = false
 	isUnknown = false
 	for _, e := range errs {
 		switch {
 		case errors.Is(e, ErrUnauthorized):
 			isUnauthorized = true
 		case errors.Is(e, ErrUnauthenticated):
 			isUnauthenticated = true
 		default:
 			isUnknown = true
 		}
 	}
 	return
 }
--- a/internal/auth/user/authenticator.go
+++ b/internal/auth/user/authenticator.go
@ -4,33 +4,22 @@ import (
 	"context"
 	"net/http"
 	"strings"
 	"time"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"github.com/lestrrat-go/jwx/v2/jwt"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 )
 const DefaultAcceptableSkew = 5 * time.Minute
 type (
 	GetKeySet      func(context.Context) (jwk.Set, error)
 	GetTokenRole   func(context.Context, jwt.Token) (string, error)
 	GetTokenTenant func(context.Context, jwt.Token) (string, error)
 )
 type Authenticator struct {
-	getKeySet      GetKeySet
+	keys   jwk.Set
-	getTokenRole   GetTokenRole
+	issuer string
 	getTokenTenant GetTokenTenant
 	acceptableSkew time.Duration
 }
 // Authenticate implements auth.Authenticator.
 func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth.User, error) {
 	ctx = logger.With(r.Context(), logger.F("remoteAddr", r.RemoteAddr))
 	authorization := r.Header.Get("Authorization")
 	if authorization == "" {
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
@ -41,54 +30,37 @@ func (a *Authenticator) Authenticate(ctx context.Context, r *http.Request) (auth
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
-	keys, err := a.getKeySet(ctx)
+	token, err := parseToken(ctx, a.keys, a.issuer, rawToken)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-	token, err := parseToken(ctx, keys, rawToken, a.acceptableSkew)
+	rawRole, exists := token.Get(keyRole)
-	if err != nil {
+	if !exists {
-		logger.Debug(ctx, "could not parse jwt token", logger.CapturedE(errors.WithStack(err)))
+		return nil, errors.New("could not find 'thumbprint' claim")
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
-	rawRole, err := a.getTokenRole(ctx, token)
+	role, ok := rawRole.(string)
-	if err != nil {
+	if !ok {
-		logger.Debug(ctx, "could not retrieve token role", logger.CapturedE(errors.WithStack(err)))
+		return nil, errors.Errorf("unexpected '%s' claim value: '%v'", keyRole, rawRole)
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
-	if !isValidRole(rawRole) {
+	if !isValidRole(role) {
-		return nil, errors.WithStack(auth.ErrUnauthorized)
+		return nil, errors.Errorf("invalid role '%s'", role)
 	}
 	rawTenantID, err := a.getTokenTenant(ctx, token)
 	if err != nil {
 		logger.Debug(ctx, "could not retrieve token tenant", logger.CapturedE(errors.WithStack(err)))
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	tenantID, err := datastore.ParseTenantID(rawTenantID)
 	if err != nil {
 		logger.Debug(ctx, "could not retrieve token tenant", logger.CapturedE(errors.WithStack(err)))
 		return nil, errors.WithStack(auth.ErrUnauthenticated)
 	}
 	user := &User{
 		subject: token.Subject(),
-		role:     Role(rawRole),
+		role:    Role(role),
 		tenantID: tenantID,
 	}
 	return user, nil
 }
-func NewAuthenticator(getKeySet GetKeySet, getTokenRole GetTokenRole, getTokenTenant GetTokenTenant, acceptableSkew time.Duration) *Authenticator {
+func NewAuthenticator(keys jwk.Set, issuer string) *Authenticator {
 	return &Authenticator{
-		getTokenRole:   getTokenRole,
+		keys:   keys,
-		getTokenTenant: getTokenTenant,
+		issuer: issuer,
 		getKeySet:      getKeySet,
 		acceptableSkew: acceptableSkew,
 	}
 }
--- a/internal/auth/user/jwt.go
+++ b/internal/auth/user/jwt.go
@ -4,7 +4,6 @@ import (
 	"context"
 	"time"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/lestrrat-go/jwx/v2/jws"
@ -12,13 +11,14 @@ import (
 	"github.com/pkg/errors"
 )
-func parseToken(ctx context.Context, keys jwk.Set, rawToken string, acceptableSkew time.Duration) (jwt.Token, error) {
+const keyRole = "role"
 func parseToken(ctx context.Context, keys jwk.Set, issuer string, rawToken string) (jwt.Token, error) {
 	token, err := jwt.Parse(
 		[]byte(rawToken),
 		jwt.WithKeySet(keys, jws.WithRequireKid(false)),
 		jwt.WithIssuer(issuer),
 		jwt.WithValidate(true),
 		jwt.WithAcceptableSkew(acceptableSkew),
 		jwt.WithContext(ctx),
 	)
 	if err != nil {
 		return nil, errors.WithStack(err)
@ -27,27 +27,14 @@ func parseToken(ctx context.Context, keys jwk.Set, rawToken string, acceptableSk
 	return token, nil
 }
-const (
+func GenerateToken(ctx context.Context, key jwk.Key, role Role) (string, error) {
 	DefaultRoleKey   string = "role"
 	DefaultTenantKey string = "tenant"
 )
 func GenerateToken(ctx context.Context, key jwk.Key, tenant datastore.TenantID, subject string, role Role) (string, error) {
 	token := jwt.New()
-	if err := token.Set(jwt.SubjectKey, subject); err != nil {
+	if err := token.Set(keyRole, role); err != nil {
 		return "", errors.WithStack(err)
 	}
-	if err := token.Set(DefaultRoleKey, role); err != nil {
+	now := time.Now()
 		return "", errors.WithStack(err)
 	}
 	if err := token.Set(DefaultTenantKey, tenant); err != nil {
 		return "", errors.WithStack(err)
 	}
 	now := time.Now().UTC()
 	if err := token.Set(jwt.NotBeforeKey, now); err != nil {
 		return "", errors.WithStack(err)
--- a/internal/auth/user/user.go
+++ b/internal/auth/user/user.go
@ -1,29 +1,22 @@
 package user
-import (
+import "forge.cadoles.com/Cadoles/emissary/internal/auth"
 	"encoding/json"
 	"forge.cadoles.com/Cadoles/emissary/internal/auth"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 )
 type Role string
 const (
 	RoleWriter Role = "writer"
 	RoleReader Role = "reader"
 	RoleAdmin  Role = "admin"
 )
 func isValidRole(r string) bool {
 	rr := Role(r)
-	return rr == RoleWriter || rr == RoleReader || rr == RoleAdmin
+	return rr == RoleWriter || rr == RoleReader
 }
 type User struct {
 	subject string
 	tenantID datastore.TenantID
 	role    Role
 }
@ -32,29 +25,8 @@ func (u *User) Subject() string {
 	return u.subject
 }
 // Tenant implements auth.User
 func (u *User) Tenant() datastore.TenantID {
 	return u.tenantID
 }
 func (u *User) Role() Role {
 	return u.role
 }
 func (u *User) MarshalJSON() ([]byte, error) {
 	type user struct {
 		Subject string `json:"subject"`
 		Tenant  string `json:"tenant"`
 		Role    string `json:"role"`
 	}
 	jsonUser := user{
 		Subject: u.Subject(),
 		Tenant:  string(u.Tenant()),
 		Role:    string(u.Role()),
 	}
 	return json.Marshal(jsonUser)
 }
 var _ auth.User = &User{}
--- a/internal/client/client.go
+++ b/internal/client/client.go
@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"github.com/pkg/errors"
@ -19,10 +18,6 @@ type Client struct {
 	serverURL   string
 }
 func (c *Client) ServerURL() string {
 	return c.serverURL
 }
 func (c *Client) apiGet(ctx context.Context, path string, result any, funcs ...OptionFunc) error {
 	if err := c.apiDo(ctx, http.MethodGet, path, nil, result, funcs...); err != nil {
 		return errors.WithStack(err)
@ -96,13 +91,10 @@ func (c *Client) apiDo(ctx context.Context, method string, path string, payload
 	defer res.Body.Close()
-	data, err := io.ReadAll(res.Body)
+	decoder := json.NewDecoder(res.Body)
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	if err := json.Unmarshal(data, &response); err != nil {
+	if err := decoder.Decode(&response); err != nil {
-		return errors.Wrapf(err, "could not parse json: got '%s'", data)
+		return errors.WithStack(err)
 	}
 	return nil
--- a/internal/client/get_agent.go
+++ b/internal/client/get_agent.go
@ -4,12 +4,13 @@ import (
 	"context"
 	"fmt"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"github.com/pkg/errors"
 )
-func (c *Client) GetAgent(ctx context.Context, agentID AgentID, funcs ...OptionFunc) (*Agent, error) {
+func (c *Client) GetAgent(ctx context.Context, agentID datastore.AgentID, funcs ...OptionFunc) (*datastore.Agent, error) {
 	response := withResponse[struct {
-		Agent *Agent `json:"agent"`
+		Agent *datastore.Agent `json:"agent"`
 	}]()
 	path := fmt.Sprintf("/api/v1/agents/%d", agentID)
--- a/internal/client/get_agent_specs.go
+++ b/internal/client/get_agent_specs.go
@ -5,12 +5,13 @@ import (
 	"fmt"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )
-func (c *Client) QueryAgentSpecs(ctx context.Context, agentID AgentID, funcs ...OptionFunc) ([]*datastore.SpecHeader, error) {
+func (c *Client) GetAgentSpecs(ctx context.Context, agentID datastore.AgentID, funcs ...OptionFunc) ([]spec.Spec, error) {
 	response := withResponse[struct {
-		Specs []*datastore.SpecHeader `json:"specs"`
+		Specs []*spec.RawSpec `json:"specs"`
 	}]()
 	path := fmt.Sprintf("/api/v1/agents/%d/specs", agentID)
@ -23,5 +24,10 @@ func (c *Client) QueryAgentSpecs(ctx context.Context, agentID AgentID, funcs ...
 		return nil, errors.WithStack(response.Error)
 	}
-	return response.Data.Specs, nil
+	specs := make([]spec.Spec, 0, len(response.Data.Specs))
 	for _, s := range response.Data.Specs {
 		specs = append(specs, spec.Spec(s))
 	}
 	return specs, nil
 }
--- a/internal/client/options.go
+++ b/internal/client/options.go
--- a/internal/client/query_agents.go
+++ b/internal/client/query_agents.go
@ -16,8 +16,8 @@ type QueryAgentsOptions struct {
 	Limit       *int
 	Offset      *int
 	Thumbprints []string
-	IDs         []AgentID
+	IDs         []datastore.AgentID
-	Statuses    []AgentStatus
+	Statuses    []datastore.AgentStatus
 }
 func WithQueryAgentsOptions(funcs ...OptionFunc) QueryAgentsOptionFunc {
@ -56,7 +56,7 @@ func WithQueryAgentsStatus(statuses ...datastore.AgentStatus) QueryAgentsOptionF
 	}
 }
-func (c *Client) QueryAgents(ctx context.Context, funcs ...QueryAgentsOptionFunc) ([]*Agent, int, error) {
+func (c *Client) QueryAgents(ctx context.Context, funcs ...QueryAgentsOptionFunc) ([]*datastore.Agent, int, error) {
 	options := &QueryAgentsOptions{}
 	for _, fn := range funcs {
 		fn(options)
--- a/internal/client/register_agent.go
+++ b/internal/client/register_agent.go
@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 )
-func (c *Client) RegisterAgent(ctx context.Context, key Key, thumbprint string, meta []MetadataTuple, funcs ...OptionFunc) (*Agent, error) {
+func (c *Client) RegisterAgent(ctx context.Context, key jwk.Key, thumbprint string, meta []metadata.Tuple, funcs ...OptionFunc) (*datastore.Agent, error) {
-	keySet, err := jwk.RS256PublicKeySet(key)
+	keySet, err := jwk.PublicKeySet(key)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
--- a/internal/client/update_agent.go
+++ b/internal/client/update_agent.go
@ -10,7 +10,6 @@ import (
 type UpdateAgentOptions struct {
 	Status  *int
 	Label   *string
 	Options []OptionFunc
 }
@ -22,19 +21,13 @@ func WithAgentStatus(status int) UpdateAgentOptionFunc {
 	}
 }
 func WithAgentLabel(label string) UpdateAgentOptionFunc {
 	return func(opts *UpdateAgentOptions) {
 		opts.Label = &label
 	}
 }
 func WithUpdateAgentsOptions(funcs ...OptionFunc) UpdateAgentOptionFunc {
 	return func(opts *UpdateAgentOptions) {
 		opts.Options = funcs
 	}
 }
-func (c *Client) UpdateAgent(ctx context.Context, agentID AgentID, funcs ...UpdateAgentOptionFunc) (*datastore.Agent, error) {
+func (c *Client) UpdateAgent(ctx context.Context, agentID datastore.AgentID, funcs ...UpdateAgentOptionFunc) (*datastore.Agent, error) {
 	opts := &UpdateAgentOptions{}
 	for _, fn := range funcs {
 		fn(opts)
@ -46,10 +39,6 @@ func (c *Client) UpdateAgent(ctx context.Context, agentID AgentID, funcs ...Upda
 		payload["status"] = *opts.Status
 	}
 	if opts.Label != nil {
 		payload["label"] = *opts.Label
 	}
 	response := withResponse[struct {
 		Agent *datastore.Agent `json:"agent"`
 	}]()
--- a/internal/client/update_agent_spec.go
+++ b/internal/client/update_agent_spec.go
@ -6,18 +6,17 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"github.com/pkg/errors"
 )
-func (c *Client) UpdateAgentSpec(ctx context.Context, agentID AgentID, spc Spec, funcs ...OptionFunc) (Spec, error) {
+func (c *Client) UpdateAgentSpec(ctx context.Context, agentID datastore.AgentID, spc spec.Spec, funcs ...OptionFunc) (*datastore.Spec, error) {
 	payload := struct {
-		Name     string            `json:"name"`
+		Name     spec.Name         `json:"name"`
 		Version  string            `json:"version"`
 		Revision int               `json:"revision"`
 		Data     metadata.Metadata `json:"data"`
 	}{
-		Name:     spc.SpecDefinitionName(),
+		Name:     spc.SpecName(),
 		Version:  spc.SpecDefinitionVersion(),
 		Revision: spc.SpecRevision(),
 		Data:     spc.SpecData(),
 	}
--- a/internal/command/agent/openwrt/uci/transform.go
+++ b/internal/command/agent/openwrt/uci/transform.go
@ -10,6 +10,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
 	"forge.cadoles.com/Cadoles/emissary/internal/openwrt/uci"
 	"github.com/pkg/errors"
 	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 )
--- a/internal/command/agent/root.go
+++ b/internal/command/agent/root.go
@ -14,7 +14,6 @@ func Root() *cli.Command {
 			openwrt.Root(),
 			config.Root(),
 			RunCommand(),
 			ShowThumbprintCommand(),
 		},
 	}
 }
--- a/internal/command/agent/run.go
+++ b/internal/command/agent/run.go
@ -5,12 +5,10 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/app"
-	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/mdns"
+	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/gateway"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/openwrt"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/persistence"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/proxy"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/spec"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/controller/status"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata/collector/buildinfo"
 	"forge.cadoles.com/Cadoles/emissary/internal/agent/metadata/collector/shell"
@ -19,6 +17,7 @@ import (
 	"forge.cadoles.com/Cadoles/emissary/internal/jwk"
 	"forge.cadoles.com/Cadoles/emissary/internal/machineid"
 	"github.com/pkg/errors"
 	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/logger"
 )
@ -51,6 +50,10 @@ func RunCommand() *cli.Command {
 				controllers = append(controllers, spec.NewController())
 			}
 			if ctrlConf.Gateway.Enabled {
 				controllers = append(controllers, gateway.NewController())
 			}
 			if ctrlConf.UCI.Enabled {
 				controllers = append(controllers, openwrt.NewUCIController(
 					string(ctrlConf.UCI.BinPath),
@ -64,46 +67,6 @@ func RunCommand() *cli.Command {
 				))
 			}
 			if ctrlConf.Proxy.Enabled {
 				controllers = append(controllers, proxy.NewController())
 			}
 			if ctrlConf.MDNS.Enabled {
 				controllers = append(controllers, mdns.NewController())
 			}
 			if ctrlConf.SysUpgrade.Enabled {
 				sysUpgradeArgs := make([]string, 0)
 				if len(ctrlConf.SysUpgrade.SysUpgradeCommand) > 1 {
 					sysUpgradeArgs = ctrlConf.SysUpgrade.SysUpgradeCommand[1:]
 				}
 				firmwareVersionArgs := make([]string, 0)
 				if len(ctrlConf.SysUpgrade.FirmwareVersionCommand) > 1 {
 					firmwareVersionArgs = ctrlConf.SysUpgrade.FirmwareVersionCommand[1:]
 				}
 				controllers = append(controllers, openwrt.NewSysUpgradeController(
 					openwrt.WithSysUpgradeCommand(
 						ctrlConf.SysUpgrade.SysUpgradeCommand[0],
 						sysUpgradeArgs...,
 					),
 					openwrt.WithSysUpgradeShellFirmwareVersion(
 						ctrlConf.SysUpgrade.FirmwareVersionCommand[0],
 						firmwareVersionArgs...,
 					),
 				))
 			}
 			if ctrlConf.Status.Enabled {
 				controllers = append(controllers, status.NewController(
 					string(ctrlConf.Status.Address),
 					string(ctrlConf.Status.ClaimURL),
 					string(ctrlConf.Status.AgentURL),
 					string(ctx.String("projectVersion")),
 				))
 			}
 			key, err := jwk.LoadOrGenerate(string(conf.Agent.PrivateKeyPath), jwk.DefaultKeySize)
 			if err != nil {
 				return errors.WithStack(err)
@ -114,10 +77,6 @@ func RunCommand() *cli.Command {
 				return errors.WithStack(err)
 			}
 			logger.SetLevel(logger.LevelInfo)
 			logger.Info(ctx.Context, "agent thumbprint", logger.F("thumbprint", thumbprint))
 			logger.SetLevel(logger.Level(conf.Logger.Level))
 			collectors := createShellCollectors(&conf.Agent)
 			collectors = append(collectors, buildinfo.NewCollector())
--- a/internal/command/agent/show_thumbprint.go
+++ b/internal/command/agent/show_thumbprint.go
@ -1,30 +0,0 @@
 package agent
 import (
 	"fmt"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/common"
 	"forge.cadoles.com/Cadoles/emissary/internal/machineid"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
 func ShowThumbprintCommand() *cli.Command {
 	flags := common.Flags()
 	return &cli.Command{
 		Name:  "show-thumbprint",
 		Usage: "Show the current agent thumbprint",
 		Flags: flags,
 		Action: func(ctx *cli.Context) error {
 			thumbprint, err := machineid.Get()
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			fmt.Println(thumbprint)
 			return nil
 		},
 	}
 }
--- a/internal/command/client/agent/claim.go
+++ b/internal/command/client/agent/claim.go
@ -1,51 +0,0 @@
 package agent
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func ClaimCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "claim",
 		Usage: "Claim agent",
 		Flags: clientFlag.ComposeFlags(
 			&cli.StringFlag{
 				Name:     "agent-thumbprint",
 				Value:    "",
 				Required: true,
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			agentThumbprint := ctx.String("agent-thumbprint")
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			agent, err := client.ClaimAgent(ctx.Context, agentThumbprint)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := agentHints(baseFlags.OutputMode)
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, agent); err != nil {
 				return errors.WithStack(err)
 			}
 			return nil
 		},
 	}
 }
--- a/internal/command/client/agent/count.go
+++ b/internal/command/client/agent/count.go
@ -3,12 +3,12 @@ package agent
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func CountCommand() *cli.Command {
@ -18,13 +18,7 @@ func CountCommand() *cli.Command {
 		Flags: clientFlag.ComposeFlags(),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
-
+			client := client.New(baseFlags.ServerURL)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			_, total, err := client.QueryAgents(ctx.Context)
 			if err != nil {
--- a/internal/command/client/agent/delete.go
+++ b/internal/command/client/agent/delete.go
@ -1,56 +0,0 @@
 package agent
 import (
 	"os"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func DeleteCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "delete",
 		Usage: "Delete agent",
 		Flags: agentFlag.WithAgentFlags(),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			agentID, err = client.DeleteAgent(ctx.Context, agentID)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := format.Hints{
 				OutputMode: baseFlags.OutputMode,
 			}
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, struct {
 				ID datastore.AgentID `json:"id"`
 			}{
 				ID: agentID,
 			}); err != nil {
 				return errors.WithStack(err)
 			}
 			return nil
 		},
 	}
 }
--- a/internal/command/client/agent/get.go
+++ b/internal/command/client/agent/get.go
@ -3,13 +3,13 @@ package agent
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func GetCommand() *cli.Command {
@ -20,17 +20,12 @@ func GetCommand() *cli.Command {
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			client := client.New(baseFlags.ServerURL)
 			agent, err := client.GetAgent(ctx.Context, agentID)
 			if err != nil {
--- a/internal/command/client/agent/hints.go
+++ b/internal/command/client/agent/hints.go
@ -1,20 +0,0 @@
 package agent
 import (
 	"gitlab.com/wpetit/goweb/cli/format"
 	"gitlab.com/wpetit/goweb/cli/format/table"
 )
 func agentHints(outputMode format.OutputMode) format.Hints {
 	return format.Hints{
 		OutputMode: outputMode,
 		Props: []format.Prop{
 			format.NewProp("ID", "ID"),
 			format.NewProp("Label", "Label"),
 			format.NewProp("Thumbprint", "Thumbprint"),
 			format.NewProp("Status", "Status"),
 			format.NewProp("ContactedAt", "ContactedAt", table.WithCompactModeMaxColumnWidth(20)),
 			format.NewProp("UpdatedAt", "UpdatedAt", table.WithCompactModeMaxColumnWidth(20)),
 		},
 	}
 }
--- a/internal/command/client/agent/query.go
+++ b/internal/command/client/agent/query.go
@ -3,76 +3,24 @@ package agent
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
-	"forge.cadoles.com/Cadoles/emissary/internal/datastore"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func QueryCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "query",
 		Usage: "Query agents",
-		Flags: clientFlag.ComposeFlags(
+		Flags: clientFlag.ComposeFlags(),
 			&cli.StringSliceFlag{
 				Name:  "thumbprints",
 				Usage: "use `THUMBPRINTS` as query filter",
 				Value: nil,
 			},
 			&cli.Int64SliceFlag{
 				Name:  "statuses",
 				Usage: "use `STATUSES` as query filter",
 			},
 			&cli.Int64SliceFlag{
 				Name:  "ids",
 				Usage: "use `IDS` as query filter",
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			client := client.New(baseFlags.ServerURL)
-			token, err := clientFlag.GetToken(baseFlags)
+			agents, _, err := client.QueryAgents(ctx.Context)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			options := make([]client.QueryAgentsOptionFunc, 0)
 			thumbprints := ctx.StringSlice("thumbprints")
 			if thumbprints != nil {
 				options = append(options, client.WithQueryAgentsThumbprints(thumbprints...))
 			}
 			rawIDs := ctx.Int64Slice("ids")
 			if rawIDs != nil {
 				agentIDs := func(ids []int64) []datastore.AgentID {
 					agentIDs := make([]datastore.AgentID, len(ids))
 					for i, id := range ids {
 						agentIDs[i] = datastore.AgentID(id)
 					}
 					return agentIDs
 				}(rawIDs)
 				options = append(options, client.WithQueryAgentsID(agentIDs...))
 			}
 			rawStatuses := ctx.Int64Slice("statuses")
 			if rawStatuses != nil {
 				statuses := func(rawStatuses []int64) []datastore.AgentStatus {
 					statuses := make([]datastore.AgentStatus, len(rawStatuses))
 					for i, status := range rawStatuses {
 						statuses[i] = datastore.AgentStatus(status)
 					}
 					return statuses
 				}(rawStatuses)
 				options = append(options, client.WithQueryAgentsStatus(statuses...))
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			agents, _, err := client.QueryAgents(ctx.Context, options...)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
--- a/internal/command/client/agent/root.go
+++ b/internal/command/client/agent/root.go
@ -14,8 +14,6 @@ func Root() *cli.Command {
 			CountCommand(),
 			UpdateCommand(),
 			GetCommand(),
 			DeleteCommand(),
 			ClaimCommand(),
 			spec.Root(),
 		},
 	}
--- a/internal/command/client/agent/spec/delete.go
+++ b/internal/command/client/agent/spec/delete.go
@ -1,78 +0,0 @@
 package spec
 import (
 	"os"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func DeleteCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "delete",
 		Usage: "Delete spec",
 		Flags: agentFlag.WithAgentFlags(
 			&cli.StringFlag{
 				Name:  "spec-name",
 				Usage: "use `NAME` as specification's name",
 			},
 			&cli.StringFlag{
 				Name:  "spec-version",
 				Usage: "use `VERSION` as specification's version",
 				Value: "0.0.0",
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			specDefName, err := assertSpecDefName(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			specDefVersion, err := assertSpecDefVersion(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			specDefName, specDefVersion, err = client.DeleteAgentSpec(ctx.Context, agentID, specDefName, specDefVersion)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := format.Hints{
 				OutputMode: baseFlags.OutputMode,
 			}
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, struct {
 				Name    string `json:"name"`
 				Version string `json:"version"`
 			}{
 				Name:    specDefName,
 				Version: specDefVersion,
 			}); err != nil {
 				return errors.WithStack(err)
 			}
 			return nil
 		},
 	}
 }
--- a/internal/command/client/agent/spec/get.go
+++ b/internal/command/client/agent/spec/get.go
@ -3,30 +3,20 @@ package spec
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func GetCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "get",
-		Usage: "Get agent specification",
+		Usage: "Get agent specifications",
-		Flags: agentFlag.WithAgentFlags(
+		Flags: agentFlag.WithAgentFlags(),
 			&cli.StringFlag{
 				Name:  "spec-name",
 				Usage: "use `NAME` as specification's name",
 			},
 			&cli.StringFlag{
 				Name:  "spec-version",
 				Usage: "use `VERSION` as specification's version",
 				Value: "0.0.0",
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			agentID, err := agentFlag.AssertAgentID(ctx)
@ -34,31 +24,18 @@ func GetCommand() *cli.Command {
 				return errors.WithStack(err)
 			}
-			token, err := clientFlag.GetToken(baseFlags)
+			client := client.New(baseFlags.ServerURL)
 			specs, err := client.GetAgentSpecs(ctx.Context, agentID)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
-			specDefName, err := assertSpecDefName(ctx)
+			hints := format.Hints{
-			if err != nil {
+				OutputMode: baseFlags.OutputMode,
 				return errors.WithStack(err)
 			}
-			specDefVersion, err := assertSpecDefVersion(ctx)
+			if err := format.Write(baseFlags.Format, os.Stdout, hints, clientFlag.AsAnySlice(specs)...); err != nil {
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			spec, err := client.GetAgentSpec(ctx.Context, agentID, specDefName, specDefVersion)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := specHints(baseFlags.OutputMode)
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, spec); err != nil {
 				return errors.WithStack(err)
 			}
--- a/internal/command/client/agent/spec/hints.go
+++ b/internal/command/client/agent/spec/hints.go
@ -1,35 +0,0 @@
 package spec
 import (
 	"gitlab.com/wpetit/goweb/cli/format"
 	"gitlab.com/wpetit/goweb/cli/format/table"
 )
 func specHeaderHints(outputMode format.OutputMode) format.Hints {
 	return format.Hints{
 		OutputMode: outputMode,
 		Props: []format.Prop{
 			format.NewProp("ID", "ID"),
 			format.NewProp("DefinitionName", "Def. Name"),
 			format.NewProp("DefinitionVersion", "Def. Version"),
 			format.NewProp("Revision", "Revision"),
 			format.NewProp("CreatedAt", "CreatedAt", table.WithCompactModeMaxColumnWidth(20)),
 			format.NewProp("UpdatedAt", "UpdatedAt", table.WithCompactModeMaxColumnWidth(20)),
 		},
 	}
 }
 func specHints(outputMode format.OutputMode) format.Hints {
 	return format.Hints{
 		OutputMode: outputMode,
 		Props: []format.Prop{
 			format.NewProp("ID", "ID"),
 			format.NewProp("DefinitionName", "Def. Name"),
 			format.NewProp("DefinitionVersion", "Def. Version"),
 			format.NewProp("Revision", "Revision"),
 			format.NewProp("Data", "Data"),
 			format.NewProp("CreatedAt", "CreatedAt", table.WithCompactModeMaxColumnWidth(20)),
 			format.NewProp("UpdatedAt", "UpdatedAt", table.WithCompactModeMaxColumnWidth(20)),
 		},
 	}
 }
--- a/internal/command/client/agent/spec/query.go
+++ b/internal/command/client/agent/spec/query.go
@ -1,48 +0,0 @@
 package spec
 import (
 	"os"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func QueryCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "query",
 		Usage: "Query agent specifications",
 		Flags: agentFlag.WithAgentFlags(),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			specs, err := client.QueryAgentSpecs(ctx.Context, agentID)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := specHeaderHints(baseFlags.OutputMode)
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, clientFlag.AsAnySlice(specs)...); err != nil {
 				return errors.WithStack(err)
 			}
 			return nil
 		},
 	}
 }
--- a/internal/command/client/agent/spec/root.go
+++ b/internal/command/client/agent/spec/root.go
@ -10,9 +10,7 @@ func Root() *cli.Command {
 		Usage: "Specifications related commands",
 		Subcommands: []*cli.Command{
 			GetCommand(),
 			QueryCommand(),
 			UpdateCommand(),
 			DeleteCommand(),
 		},
 	}
 }
--- a/internal/command/client/agent/spec/update.go
+++ b/internal/command/client/agent/spec/update.go
@ -4,16 +4,20 @@ import (
 	"encoding/json"
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"forge.cadoles.com/Cadoles/emissary/internal/spec"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
-	"gitlab.com/wpetit/goweb/api"
+
-	"gitlab.com/wpetit/goweb/cli/format"
+	// Import specs
 	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/app"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/gateway"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/spec/uci"
 )
 func UpdateCommand() *cli.Command {
@ -23,16 +27,11 @@ func UpdateCommand() *cli.Command {
 		Flags: agentFlag.WithAgentFlags(
 			&cli.StringFlag{
 				Name:  "spec-name",
-				Usage: "use `NAME` as specification's name",
+				Usage: "use `NAME` as spec name",
 			},
 			&cli.StringFlag{
 				Name:  "spec-version",
 				Usage: "use `VERSION` as specification's version",
 				Value: "0.0.0",
 			},
 			&cli.StringFlag{
 				Name:  "spec-data",
-				Usage: "use `DATA` as specification's data, '-' to read from STDIN",
+				Usage: "use `DATA` as spec data, '-' to read from STDIN",
 			},
 			&cli.BoolFlag{
 				Name:  "no-patch",
@ -50,12 +49,7 @@ func UpdateCommand() *cli.Command {
 				return errors.WithStack(err)
 			}
-			specDefName, err := assertSpecDefName(ctx)
+			specName, err := assertSpecName(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
 			specDefVersion, err := assertSpecDefVersion(ctx)
 			if err != nil {
 				return errors.WithStack(err)
 			}
@ -67,19 +61,23 @@ func UpdateCommand() *cli.Command {
 			noPatch := ctx.Bool("no-patch")
-			token, err := clientFlag.GetToken(baseFlags)
+			client := client.New(baseFlags.ServerURL)
 			specs, err := client.GetAgentSpecs(ctx.Context, agentID)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
-			client := client.New(baseFlags.ServerURL, client.WithToken(token))
+			var existingSpec spec.Spec
-			existingSpec, err := client.GetAgentSpec(ctx.Context, agentID, specDefName, specDefVersion)
+			for _, s := range specs {
-			if err != nil {
+				if s.SpecName() != specName {
-				var apiErr api.Error
+					continue
 				if !errors.As(err, &apiErr) || apiErr.Code != api.ErrCodeNotFound {
 					return errors.WithStack(apierr.Wrap(err))
 				}
 				existingSpec = s
 				break
 			}
 			revision := 0
@ -102,18 +100,23 @@ func UpdateCommand() *cli.Command {
 			}
 			rawSpec := &spec.RawSpec{
-				DefinitionName:    specDefName,
+				Name:     specName,
 				DefinitionVersion: specDefVersion,
 				Revision: revision,
 				Data:     specData,
 			}
 			if err := spec.Validate(ctx.Context, rawSpec); err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			spec, err := client.UpdateAgentSpec(ctx.Context, agentID, rawSpec)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
-			hints := specHints(baseFlags.OutputMode)
+			hints := format.Hints{
 				OutputMode: baseFlags.OutputMode,
 			}
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, spec); err != nil {
 				return errors.WithStack(err)
@ -124,24 +127,14 @@ func UpdateCommand() *cli.Command {
 	}
 }
-func assertSpecDefName(ctx *cli.Context) (string, error) {
+func assertSpecName(ctx *cli.Context) (spec.Name, error) {
-	specDefName := ctx.String("spec-name")
+	specName := ctx.String("spec-name")
-	if specDefName == "" {
+	if specName == "" {
 		return "", errors.New("flag 'spec-name' is required")
 	}
-	return specDefName, nil
+	return spec.Name(specName), nil
 }
 func assertSpecDefVersion(ctx *cli.Context) (string, error) {
 	specDefVersion := ctx.String("spec-version")
 	if specDefVersion == "" {
 		return "", errors.New("flag 'spec-name' is required")
 	}
 	return specDefVersion, nil
 }
 func assertSpecData(ctx *cli.Context) (map[string]any, error) {
--- a/internal/command/client/agent/update.go
+++ b/internal/command/client/agent/update.go
@ -3,13 +3,13 @@ package agent
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/client"
 	agentFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/agent/flag"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
-	"forge.cadoles.com/Cadoles/emissary/pkg/client"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func UpdateCommand() *cli.Command {
@ -22,20 +22,10 @@ func UpdateCommand() *cli.Command {
 				Usage: "Set `STATUS` to selected agent",
 				Value: -1,
 			},
 			&cli.StringFlag{
 				Name:  "label",
 				Usage: "Set `LABEL` to selected agent",
 				Value: "",
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			agentID, err := agentFlag.AssertAgentID(ctx)
 			if err != nil {
 				return errors.WithStack(err)
@ -48,12 +38,7 @@ func UpdateCommand() *cli.Command {
 				options = append(options, client.WithAgentStatus(status))
 			}
-			label := ctx.String("label")
+			client := client.New(baseFlags.ServerURL)
 			if label != "" {
 				options = append(options, client.WithAgentLabel(label))
 			}
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			agent, err := client.UpdateAgent(ctx.Context, agentID, options...)
 			if err != nil {
--- a/internal/command/client/agent/util.go
+++ b/internal/command/client/agent/util.go
@ -0,0 +1,16 @@
 package agent
 import "forge.cadoles.com/Cadoles/emissary/internal/format"
 func agentHints(outputMode format.OutputMode) format.Hints {
 	return format.Hints{
 		OutputMode: outputMode,
 		Props: []format.Prop{
 			format.NewProp("ID", "ID"),
 			format.NewProp("Thumbprint", "Thumbprint"),
 			format.NewProp("Status", "Status"),
 			format.NewProp("CreatedAt", "CreatedAt"),
 			format.NewProp("UpdatedAt", "UpdatedAt"),
 		},
 	}
 }
--- a/internal/command/client/flag/flag.go
+++ b/internal/command/client/flag/flag.go
@ -2,18 +2,10 @@ package flag
 import (
 	"fmt"
 	"os"
 	"strings"
-	"github.com/pkg/errors"
+	"forge.cadoles.com/Cadoles/emissary/internal/format"
 	"forge.cadoles.com/Cadoles/emissary/internal/format/table"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 	"gitlab.com/wpetit/goweb/cli/format/table"
 )
 const (
 	AuthTokenDefaultHomePath  = "$HOME/.config/emissary/auth-token"
 	AuthTokenDefaultLocalPath = ".emissary-token"
 )
 func ComposeFlags(flags ...cli.Flag) []cli.Flag {
@ -36,17 +28,6 @@ func ComposeFlags(flags ...cli.Flag) []cli.Flag {
 			Usage:   fmt.Sprintf("use `MODE` as output mode (available: %s)", []format.OutputMode{format.OutputModeCompact, format.OutputModeWide}),
 			Value:   string(format.OutputModeCompact),
 		},
 		&cli.StringFlag{
 			Name:    "token",
 			Aliases: []string{"t"},
 			Usage:   "use `TOKEN` as authentication token",
 		},
 		&cli.StringSliceFlag{
 			Name:      "token-file",
 			Usage:     "use `TOKEN_FILE` as file containing the authentication token",
 			Value:     cli.NewStringSlice(AuthTokenDefaultLocalPath, AuthTokenDefaultHomePath),
 			TakesFile: true,
 		},
 	}
 	flags = append(flags, baseFlags...)
@ -58,45 +39,16 @@ type BaseFlags struct {
 	ServerURL  string
 	Format     format.Format
 	OutputMode format.OutputMode
 	Token      string
 	TokenFiles []string
 }
 func GetBaseFlags(ctx *cli.Context) *BaseFlags {
 	serverURL := ctx.String("server")
 	rawFormat := ctx.String("format")
 	rawOutputMode := ctx.String("output-mode")
 	tokenFiles := ctx.StringSlice("token-file")
 	token := ctx.String("token")
 	return &BaseFlags{
 		ServerURL:  serverURL,
 		Format:     format.Format(rawFormat),
 		OutputMode: format.OutputMode(rawOutputMode),
 		Token:      token,
 		TokenFiles: tokenFiles,
 	}
 }
 func GetToken(flags *BaseFlags) (string, error) {
 	if flags.Token != "" {
 		return flags.Token, nil
 	}
 	for _, tokenFile := range flags.TokenFiles {
 		tokenFile = os.ExpandEnv(tokenFile)
 		rawToken, err := os.ReadFile(tokenFile)
 		if err != nil && !errors.Is(err, os.ErrNotExist) {
 			return "", errors.WithStack(err)
 		}
 		if rawToken == nil {
 			continue
 		}
 		return strings.TrimSpace(string(rawToken)), nil
 	}
 	return "", nil
 }
--- a/internal/command/client/root.go
+++ b/internal/command/client/root.go
@ -2,17 +2,19 @@ package client
 import (
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/agent"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/tenant"
 	"github.com/urfave/cli/v2"
 	// Output format
 	_ "forge.cadoles.com/Cadoles/emissary/internal/format/json"
 	_ "forge.cadoles.com/Cadoles/emissary/internal/format/table"
 )
 func Root() *cli.Command {
 	return &cli.Command{
 		Name:  "client",
-		Usage: "API client related commands",
+		Usage: "Client related commands",
 		Subcommands: []*cli.Command{
 			agent.Root(),
 			tenant.Root(),
 		},
 	}
 }
--- a/internal/command/client/tenant/create.go
+++ b/internal/command/client/tenant/create.go
@ -1,51 +0,0 @@
 package tenant
 import (
 	"os"
 	"forge.cadoles.com/Cadoles/emissary/internal/command/client/apierr"
 	clientFlag "forge.cadoles.com/Cadoles/emissary/internal/command/client/flag"
 	"forge.cadoles.com/Cadoles/emissary/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 	"gitlab.com/wpetit/goweb/cli/format"
 )
 func CreateCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "create",
 		Usage: "Create tenant",
 		Flags: clientFlag.ComposeFlags(
 			&cli.StringFlag{
 				Name:  "tenant-label",
 				Usage: "Set `TENANT_LABEL` to targeted tenant",
 				Value: "",
 			},
 		),
 		Action: func(ctx *cli.Context) error {
 			baseFlags := clientFlag.GetBaseFlags(ctx)
 			token, err := clientFlag.GetToken(baseFlags)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			tenantLabel := ctx.String("tenant-label")
 			client := client.New(baseFlags.ServerURL, client.WithToken(token))
 			agent, err := client.CreateTenant(ctx.Context, tenantLabel)
 			if err != nil {
 				return errors.WithStack(apierr.Wrap(err))
 			}
 			hints := tenantHints(baseFlags.OutputMode)
 			if err := format.Write(baseFlags.Format, os.Stdout, hints, agent); err != nil {
 				return errors.WithStack(err)
 			}
 			return nil
 		},
 	}
 }
--- a/Show More
+++ b/Show More
		`@ -1,3 +0,0 @@`
			`# Déployer un serveur mandataire inverse sur un agent`

			`> TODO`