Skip to content

Commit 3796f7e

Browse files
committed
make ci happy
1 parent 4313b80 commit 3796f7e

12 files changed

Lines changed: 5073 additions & 3851 deletions

File tree

.markdownlint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"MD013": {
66
"line_length": 180
77
}
8-
}
8+
}

apps/login-test-acceptance/docker-compose-ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
services:
2-
32
zitadel:
43
environment:
54
ZITADEL_EXTERNALDOMAIN: traefik

apps/login-test-acceptance/docker-compose.yaml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
services:
2-
32
zitadel:
43
user: "${UID:-1000}:${GID:-1000}"
54
image: "${ZITADEL_TAG:-ghcr.io/zitadel/zitadel:latest}"
@@ -9,7 +8,7 @@ services:
98
- "traefik.enable=true"
109
- "traefik.http.routers.zitadel.rule=!PathPrefix(`/ui/v2/login`)"
1110
# - "traefik.http.middlewares.zitadel.headers.customrequestheaders.Host=localhost"
12-
# - "traefik.http.routers.zitadel.middlewares=zitadel@docker"
11+
# - "traefik.http.routers.zitadel.middlewares=zitadel@docker"
1312
- "traefik.http.services.zitadel-service.loadbalancer.server.scheme=h2c"
1413
ports:
1514
- "8080:8080"
@@ -54,7 +53,7 @@ services:
5453
- "traefik.http.routers.login.rule=PathPrefix(`/ui/v2/login`)"
5554
- "traefik.http.services.login-service.loadbalancer.server.url=http://host.docker.internal:3000"
5655
command:
57-
# - "--log.level=DEBUG"
56+
# - "--log.level=DEBUG"
5857
- "--ping"
5958
- "--api.insecure=true"
6059
- "--providers.docker=true"
@@ -113,16 +112,16 @@ services:
113112
args:
114113
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
115114
environment:
116-
PORT: '3333'
115+
PORT: "3333"
117116
command:
118117
- -port
119-
- '3333'
118+
- "3333"
120119
- -email
121-
- '/email'
120+
- "/email"
122121
- -sms
123-
- '/sms'
122+
- "/sms"
124123
- -notification
125-
- '/notification'
124+
- "/notification"
126125
ports:
127126
- "3333:3333"
128127
depends_on:
@@ -139,14 +138,14 @@ services:
139138
args:
140139
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
141140
environment:
142-
API_URL: 'http://traefik'
143-
API_DOMAIN: 'traefik'
144-
PAT_FILE: '/pat/zitadel-admin-sa.pat'
145-
LOGIN_URL: 'https://traefik/ui/v2/login'
146-
ISSUER: 'https://traefik'
147-
HOST: 'traefik'
148-
PORT: '8000'
149-
SCOPES: 'openid profile email'
141+
API_URL: "http://traefik"
142+
API_DOMAIN: "traefik"
143+
PAT_FILE: "/pat/zitadel-admin-sa.pat"
144+
LOGIN_URL: "https://traefik/ui/v2/login"
145+
ISSUER: "https://traefik"
146+
HOST: "traefik"
147+
PORT: "8000"
148+
SCOPES: "openid profile email"
150149
ports:
151150
- "8000:8000"
152151
volumes:
@@ -167,11 +166,11 @@ services:
167166
args:
168167
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
169168
environment:
170-
API_URL: 'http://traefik'
171-
API_DOMAIN: 'traefik'
172-
PAT_FILE: '/pat/zitadel-admin-sa.pat'
173-
SCHEMA: 'https'
174-
HOST: 'traefik'
169+
API_URL: "http://traefik"
170+
API_DOMAIN: "traefik"
171+
PAT_FILE: "/pat/zitadel-admin-sa.pat"
172+
SCHEMA: "https"
173+
HOST: "traefik"
175174
PORT: "8004"
176175
ports:
177176
- 8004:8004
@@ -193,13 +192,13 @@ services:
193192
args:
194193
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
195194
environment:
196-
API_URL: 'http://traefik'
197-
API_DOMAIN: 'traefik'
198-
PAT_FILE: '/pat/zitadel-admin-sa.pat'
199-
LOGIN_URL: 'https://traefik/ui/v2/login'
200-
IDP_URL: 'http://zitadel:8080/saml/v2/metadata'
201-
HOST: 'https://traefik'
202-
PORT: '8001'
195+
API_URL: "http://traefik"
196+
API_DOMAIN: "traefik"
197+
PAT_FILE: "/pat/zitadel-admin-sa.pat"
198+
LOGIN_URL: "https://traefik/ui/v2/login"
199+
IDP_URL: "http://zitadel:8080/saml/v2/metadata"
200+
HOST: "https://traefik"
201+
PORT: "8001"
203202
ports:
204203
- 8001:8001
205204
volumes:
@@ -220,11 +219,11 @@ services:
220219
args:
221220
- LOGIN_TEST_ACCEPTANCE_GOLANG_TAG=${LOGIN_TEST_ACCEPTANCE_GOLANG_TAG:-golang:1.24-alpine}
222221
environment:
223-
API_URL: 'http://traefik:8080'
224-
API_DOMAIN: 'traefik'
225-
PAT_FILE: '/pat/zitadel-admin-sa.pat'
226-
SCHEMA: 'https'
227-
HOST: 'traefik'
222+
API_URL: "http://traefik:8080"
223+
API_DOMAIN: "traefik"
224+
PAT_FILE: "/pat/zitadel-admin-sa.pat"
225+
SCHEMA: "https"
226+
HOST: "traefik"
228227
PORT: "8003"
229228
ports:
230229
- 8003:8003

apps/login/src/app/(main)/(boxed)/signedin/page.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ export default async function Page(props: { searchParams: Promise<any> }) {
5858
});
5959
} catch (err) {
6060
deviceAuthorizationError =
61-
err instanceof Error ? err.message : "Could not complete device authorization";
61+
err instanceof Error
62+
? err.message
63+
: "Could not complete device authorization";
6264
}
6365
}
6466

config/base/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ spec:
6969
scheme: HTTP
7070
dnsPolicy: ClusterFirst
7171
restartPolicy: Always
72-
terminationGracePeriodSeconds: 30
72+
terminationGracePeriodSeconds: 30

config/base/http-route.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ spec:
1616
backendRefs:
1717
- name: auth-ui
1818
kind: Service
19-
group: ''
20-
port: 3000
19+
group: ""
20+
port: 3000

config/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
resources:
22
- deployment.yaml
33
- service.yaml
4-
- http-route.yaml
4+
- http-route.yaml

config/base/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ spec:
1818
app.kubernetes.io/instance: auth-ui
1919
app.kubernetes.io/name: auth-ui
2020
sessionAffinity: None
21-
type: ClusterIP
21+
type: ClusterIP

docker-compose.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ services:
22
zitadel:
33
# The user should have the permission to write to ./machinekey
44
user: "${UID:-1000}"
5-
restart: 'always'
5+
restart: "always"
66
networks:
7-
- 'zitadel'
8-
image: 'ghcr.io/zitadel/zitadel:v3.3.0'
7+
- "zitadel"
8+
image: "ghcr.io/zitadel/zitadel:v3.3.0"
99
command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled'
1010
environment:
1111
ZITADEL_DATABASE_POSTGRES_HOST: db
@@ -24,34 +24,34 @@ services:
2424
ZITADEL_FIRSTINSTANCE_ORG_MACHINE_MACHINEKEY_TYPE: 1
2525
depends_on:
2626
db:
27-
condition: 'service_healthy'
27+
condition: "service_healthy"
2828
ports:
29-
- '8080:8080'
29+
- "8080:8080"
3030
volumes:
3131
- ./machinekey:/machinekey
3232

3333
db:
34-
restart: 'always'
34+
restart: "always"
3535
image: postgres:17-alpine
3636
environment:
3737
PGUSER: postgres
3838
POSTGRES_PASSWORD: postgres
3939
networks:
40-
- 'zitadel'
40+
- "zitadel"
4141
healthcheck:
4242
test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"]
43-
interval: '10s'
44-
timeout: '30s'
43+
interval: "10s"
44+
timeout: "30s"
4545
retries: 5
46-
start_period: '20s'
46+
start_period: "20s"
4747

4848
mailhog: # Mailhog is a fake local SMTP server for testing
4949
image: mailhog/mailhog:latest
5050
ports:
51-
- '1025:1025'
52-
- '8025:8025' # Web UI
51+
- "1025:1025"
52+
- "8025:8025" # Web UI
5353
networks:
54-
- 'zitadel'
54+
- "zitadel"
5555

5656
networks:
5757
zitadel:

packages/zitadel-prettier-config/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export default {
44
useTabs: false,
55
semi: true,
66
singleQuote: false,
7-
trailingComma: 'all',
7+
trailingComma: "all",
88
bracketSpacing: true,
9-
arrowParens: 'always',
10-
plugins: ["prettier-plugin-organize-imports"]
9+
arrowParens: "always",
10+
plugins: ["prettier-plugin-organize-imports"],
1111
};

0 commit comments

Comments
 (0)