mirrors/sablier
1
0
Fork 0
mirror of https://github.com/sablierapp/sablier.git synced 2026-01-03 03:27:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: changing module to github.com/sablierapp/sablier

Browse Source
This commit is contained in:
Alexis Couvreur
2024-10-20 23:54:53 -04:00
parent 70ab2c4eeb
commit 8b113a3c76
95 changed files with 253 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/caddy/Dockerfile
View File

@@ -4,7 +4,7 @@ FROM caddy:${CADDY_VERSION}-builder AS builder
COPY . .
RUN xcaddy build \
--with github.com/acouvreur/sablier/plugins/caddy=.
--with github.com/sablierapp/sablier/plugins/caddy=.
FROM caddy:${CADDY_VERSION}

4
plugins/caddy/Dockerfile.remote
View File

@@ -2,10 +2,10 @@ ARG CADDY_VERSION=2.8.4
ARG SABLIER_VERSION=v1.6.0
FROM caddy:${CADDY_VERSION}-builder AS builder
ADD https://github.com/acouvreur/sablier.git#${SABLIER_VERSION} /sablier
ADD https://github.com/sablierapp/sablier.git#${SABLIER_VERSION} /sablier
RUN xcaddy build \
--with github.com/acouvreur/sablier/plugins/caddy=/sablier/plugins/caddy
--with github.com/sablierapp/sablier/plugins/caddy=/sablier/plugins/caddy
FROM caddy:${CADDY_VERSION}

8
plugins/caddy/README.md
View File

@@ -16,7 +16,7 @@ Here I'll show you two options with Docker.
### By using the provided Dockerfile
```
docker build https://github.com/acouvreur/sablier.git#v1.8.0-beta.22:plugins/caddy
docker build https://github.com/sablierapp/sablier.git#v1.8.0-beta.22:plugins/caddy
--build-arg=CADDY_VERSION=2.6.4
-t caddy:2.6.4-with-sablier
```
@@ -29,10 +29,10 @@ docker build https://github.com/acouvreur/sablier.git#v1.8.0-beta.22:plugins/cad
ARG CADDY_VERSION=2.6.4
FROM caddy:${CADDY_VERSION}-builder AS builder
ADD https://github.com/acouvreur/sablier.git#v1.8.0-beta.22 /sablier
ADD https://github.com/sablierapp/sablier.git#v1.8.0-beta.22 /sablier
RUN xcaddy build \
--with github.com/acouvreur/sablier/plugins/caddy=/sablier/plugins/caddy
--with github.com/sablierapp/sablier/plugins/caddy=/sablier/plugins/caddy
FROM caddy:${CADDY_VERSION}
@@ -86,6 +86,6 @@ Almost all options are optional and you can setup very simple rules to use the s
1. Build local sablier
`docker build -t caddy:local .`
2. Build local caddy
`docker build -t acouvreur/sablier:local ../..`
`docker build -t sablierapp/sablier:local ../..`
3. Run test
`cd e2e/docker && bash ./run.sh`

2
plugins/caddy/config_test.go
View File

@@ -7,9 +7,9 @@ import (
"testing"
"time"
"github.com/acouvreur/sablier/plugins/caddy"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/sablierapp/sablier/plugins/caddy"
)
var fals bool = false

4
plugins/caddy/e2e/docker/docker-compose.yml
View File

@@ -10,7 +10,7 @@ services:
restart: "no"
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=docker
@@ -19,7 +19,7 @@ services:
- '/var/run/docker.sock:/var/run/docker.sock'
whoami:
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 5s

2
plugins/caddy/e2e/docker/run.sh
View File

@@ -22,7 +22,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier proxy
fi

4
plugins/caddy/e2e/docker_swarm/docker-stack.yml
View File

@@ -15,7 +15,7 @@ services:
condition: none # Do not restart on setup failure
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=swarm
@@ -24,7 +24,7 @@ services:
- '/var/run/docker.sock:/var/run/docker.sock'
whoami:
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 5s

2
plugins/caddy/e2e/docker_swarm/run.sh
View File

@@ -32,7 +32,7 @@ run_docker_swarm_test() {
prepare_docker_stack
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker service logs ${DOCKER_STACK_NAME}_sablier
docker service logs ${DOCKER_STACK_NAME}_proxy

2
plugins/caddy/e2e/kubernetes/docker-kubernetes.yml
View File

@@ -19,7 +19,7 @@ services:
volumes:
# This is just so that we get the kubeconfig file out
- .:/output
- '../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../..:/plugins-local/src/github.com/sablierapp/sablier'
ports:
- 6443:6443 # Kubernetes API Server
- 8080:80 # Ingress controller port 80

6
plugins/caddy/e2e/kubernetes/run.sh
View File

@@ -13,8 +13,8 @@ docker version
prepare_kubernetes() {
docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d
until kubectl get nodes | grep " Ready "; do sleep 1; done
echo "Loading acouvreur/sablier:local into k3s..."
docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading sablierapp/sablier:local into k3s..."
docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading succeeded."
}
@@ -45,7 +45,7 @@ run_kubernetes_deployment_test() {
prepare_deployment
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
kubectl -n kube-system logs deployments/sablier-deployment
# kubectl -n kube-system logs deployments/caddy

6
plugins/caddy/e2e/kubernetes/values.yaml
View File

@@ -3,7 +3,7 @@ image:
tag: "2.9.1"
additionalArguments:
- "--experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier"
- "--experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier"
providers:
kubernetesIngress:
@@ -13,13 +13,13 @@ providers:
additionalVolumeMounts:
- name: local-sablier-plugin
mountPath: /plugins-local/src/github.com/acouvreur/sablier
mountPath: /plugins-local/src/github.com/sablierapp/sablier
deployment:
additionalVolumes:
- name: local-sablier-plugin
hostPath:
# directory location on host
path: /plugins-local/src/github.com/acouvreur/sablier
path: /plugins-local/src/github.com/sablierapp/sablier
# this field is optional
type: Directory

2
plugins/caddy/go.mod
View File

@@ -1,4 +1,4 @@
module github.com/acouvreur/sablier/plugins/caddy
module github.com/sablierapp/sablier/plugins/caddy
go 1.22.3

2
plugins/caddy/main_test.go
View File

@@ -7,9 +7,9 @@ import (
"net/http/httptest"
"testing"
plugin "github.com/acouvreur/sablier/plugins/caddy"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
plugin "github.com/sablierapp/sablier/plugins/caddy"
)
func TestSablierMiddleware_ServeHTTP(t *testing.T) {

4
plugins/nginx/e2e/docker/docker-compose.yml
View File

@@ -12,7 +12,7 @@ services:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
ports:
- 10000:10000
command:
@@ -23,7 +23,7 @@ services:
- '/var/run/docker.sock:/var/run/docker.sock'
whoami:
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 5s

2
plugins/nginx/e2e/docker/run.sh
View File

@@ -21,7 +21,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier proxy
fi

4
plugins/nginx/e2e/docker_swarm/docker-stack.yml
View File

@@ -15,7 +15,7 @@ services:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
ports:
- 10000:10000
command:
@@ -26,7 +26,7 @@ services:
- '/var/run/docker.sock:/var/run/docker.sock'
whoami:
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 5s

2
plugins/nginx/e2e/docker_swarm/run.sh
View File

@@ -32,7 +32,7 @@ run_docker_swarm_test() {
prepare_docker_stack
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker service logs ${DOCKER_STACK_NAME}_sablier
docker service logs ${DOCKER_STACK_NAME}_proxy

2
plugins/nginx/e2e/kubernetes/docker-kubernetes.yml
View File

@@ -19,7 +19,7 @@ services:
volumes:
# This is just so that we get the kubeconfig file out
- .:/output
- '../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../..:/plugins-local/src/github.com/sablierapp/sablier'
ports:
- 6443:6443 # Kubernetes API Server
- 8080:80 # Ingress controller port 80

2
plugins/nginx/e2e/kubernetes/manifests/deployment.yml
View File

@@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: whoami
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
---
apiVersion: v1
kind: Service

2
plugins/nginx/e2e/kubernetes/manifests/sablier.yml
View File

@@ -18,7 +18,7 @@ spec:
serviceAccountName: sablier
containers:
- name: sablier
image: acouvreur/sablier:local
image: sablierapp/sablier:local
args: ["start", "--provider.name=kubernetes", "--logging.level=trace"]
ports:
- containerPort: 10000

4
plugins/nginx/e2e/kubernetes/run.sh
View File

@@ -13,8 +13,8 @@ docker version
prepare_kubernetes() {
docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d
until kubectl get nodes | grep " Ready "; do sleep 1; done
echo "Loading acouvreur/sablier:local into k3s..."
docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading sablierapp/sablier:local into k3s..."
docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading succeeded."
}

2
plugins/proxywasm/go.mod
View File

@@ -1,4 +1,4 @@
module github.com/acouvreur/sablier/plugins/proxy-wasm
module github.com/sablierapp/sablier/plugins/proxy-wasm
go 1.22.0

2
plugins/traefik/README.md
View File

@@ -16,7 +16,7 @@
experimental:
plugins:
sablier:
moduleName: "github.com/acouvreur/sablier"
moduleName: "github.com/sablierapp/sablier"
version: "v1.8.0-beta.22"
```

2
plugins/traefik/config_test.go
View File

@@ -6,7 +6,7 @@ import (
"reflect"
"testing"
"github.com/acouvreur/sablier/plugins/traefik"
"github.com/sablierapp/sablier/plugins/traefik"
)
var fals bool = false

6
plugins/traefik/e2e/docker/docker-compose.yml
View File

@@ -4,7 +4,7 @@ services:
traefik:
image: traefik:v3.1.4
command:
- --experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier
- --experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier
- --entryPoints.http.address=:80
- --providers.docker=true
- --providers.file.filename=/etc/traefik/dynamic-config.yml
@@ -12,12 +12,12 @@ services:
- "8080:80"
volumes:
- '/var/run/docker.sock:/var/run/docker.sock'
- '../../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../../..:/plugins-local/src/github.com/sablierapp/sablier'
- './dynamic-config.yml:/etc/traefik/dynamic-config.yml'
restart: "no"
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=docker

2
plugins/traefik/e2e/docker/run.sh
View File

@@ -22,7 +22,7 @@ run_docker_classic_test() {
prepare_docker_classic
sleep 2
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier traefik
fi

8
plugins/traefik/e2e/docker_swarm/docker-stack.yml
View File

@@ -4,7 +4,7 @@ services:
traefik:
image: traefik:v3.0.4
command:
- --experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier
- --experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier
- --entryPoints.http.address=:80
- --providers.swarm=true
- --providers.swarm.refreshSeconds=1 # Default is 15s
@@ -16,7 +16,7 @@ services:
mode: host # Won't work in github actions otherwise
volumes:
- '/var/run/docker.sock:/var/run/docker.sock'
- '../../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../../..:/plugins-local/src/github.com/sablierapp/sablier'
deploy:
labels:
- traefik.http.services.traefik.loadbalancer.server.port=8080
@@ -24,7 +24,7 @@ services:
condition: none # Do not restart on setup failure
sablier:
image: acouvreur/sablier:local
image: sablierapp/sablier:local
command:
- start
- --provider.name=swarm
@@ -62,7 +62,7 @@ services:
- traefik.http.services.sablier.loadbalancer.server.port=10000
whoami:
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost" ]
interval: 5s

2
plugins/traefik/e2e/docker_swarm/run.sh
View File

@@ -32,7 +32,7 @@ run_docker_swarm_test() {
prepare_docker_stack
sleep 10
go clean -testcache
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then
if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then
errors=1
docker service logs ${DOCKER_STACK_NAME}_sablier
docker service logs ${DOCKER_STACK_NAME}_traefik

2
plugins/traefik/e2e/kubernetes/docker-kubernetes.yml
View File

@@ -19,7 +19,7 @@ services:
volumes:
# This is just so that we get the kubeconfig file out
- .:/output
- '../../../..:/plugins-local/src/github.com/acouvreur/sablier'
- '../../../..:/plugins-local/src/github.com/sablierapp/sablier'
ports:
- 6443:6443 # Kubernetes API Server
- 8080:80 # Ingress controller port 80

2
plugins/traefik/e2e/kubernetes/manifests/deployment.yml
View File

@@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: whoami
image: acouvreur/whoami:v1.10.2
image: sablierapp/whoami:v1.10.2
livenessProbe:
httpGet:
path: /health

2
plugins/traefik/e2e/kubernetes/manifests/sablier.yml
View File

@@ -18,7 +18,7 @@ spec:
serviceAccountName: sablier
containers:
- name: sablier
image: acouvreur/sablier:local
image: sablierapp/sablier:local
args: ["start", "--provider.name=kubernetes", "--logging.level=trace"]
ports:
- containerPort: 10000

2
plugins/traefik/e2e/kubernetes/run.sh
View File

@@ -13,7 +13,7 @@ docker version
prepare_kubernetes() {
docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d
until kubectl get nodes | grep " Ready "; do sleep 1; done
echo "Loading acouvreur/sablier:local into k3s..."
echo "Loading sablierapp/sablier:local into k3s..."
docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import -
echo "Loading succeeded."
}

6
plugins/traefik/e2e/kubernetes/values.yaml
View File

@@ -1,5 +1,5 @@
additionalArguments:
- "--experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier"
- "--experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier"
providers:
kubernetesIngress:
@@ -9,13 +9,13 @@ providers:
additionalVolumeMounts:
- name: local-sablier-plugin
mountPath: /plugins-local/src/github.com/acouvreur/sablier
mountPath: /plugins-local/src/github.com/sablierapp/sablier
deployment:
additionalVolumes:
- name: local-sablier-plugin
hostPath:
# directory location on host
path: /plugins-local/src/github.com/acouvreur/sablier
path: /plugins-local/src/github.com/sablierapp/sablier
# this field is optional
type: Directory

2
plugins/traefik/go.mod
View File

@@ -1,3 +1,3 @@
module github.com/acouvreur/sablier/plugins/traefik
module github.com/sablierapp/sablier/plugins/traefik
go 1.22.3