Skip to content

Commit e4eb97f

Browse files
kitsudaikikitsudaiki
authored
Merge pull request #769 from kitsudaiki/qa/various-improvements
related issues: - #762 - #763 - #764
2 parents c13b9fe + a603fce commit e4eb97f

100 files changed

Lines changed: 868 additions & 680 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_test.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ jobs:
400400
name: run Sakura in background
401401
run: |
402402
cd ${GITHUB_REPOSITORY#*/}
403+
export INTERNAL_API_KEY=test-internal-api-key && export SAKURA_REGISTRATION_KEY=sakura-key && export ONSEN_REGISTRATION_KEY=onsen-key
403404
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
404405
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
405406
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan
@@ -492,6 +493,7 @@ jobs:
492493
name: run Sakura in background
493494
run: |
494495
cd ${GITHUB_REPOSITORY#*/}
496+
export INTERNAL_API_KEY=test-internal-api-key && export SAKURA_REGISTRATION_KEY=sakura-key && export ONSEN_REGISTRATION_KEY=onsen-key
495497
chmod +x /tmp/Ainari_debug_build_result/ainari/hanami
496498
chmod +x /tmp/Ainari_debug_build_result/ainari/miko
497499
chmod +x /tmp/Ainari_debug_build_result/ainari/ryokan

‎.secrets.baseline‎

Lines changed: 48 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,24 @@
123123
}
124124
],
125125
"results": {
126+
".github/workflows/build_test.yml": [
127+
{
128+
"type": "Secret Keyword",
129+
"filename": ".github/workflows/build_test.yml",
130+
"hashed_secret": "ff5d8691559e63dd27a5970c7ac29cd638374c7c",
131+
"is_verified": false,
132+
"line_number": 401
133+
}
134+
],
135+
".vscode/launch.json": [
136+
{
137+
"type": "Secret Keyword",
138+
"filename": ".vscode/launch.json",
139+
"hashed_secret": "baed55b8f6cf47ebc9d02cbc4945ebedb22cb05a",
140+
"is_verified": false,
141+
"line_number": 43
142+
}
143+
],
126144
"deploy/k8s/ainari/templates/hanami/hanami-certificate.yaml": [
127145
{
128146
"type": "Secret Keyword",
@@ -138,7 +156,16 @@
138156
"filename": "deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml",
139157
"hashed_secret": "a1b78300299f72872366d7a0c32a5f19512c9d32",
140158
"is_verified": false,
141-
"line_number": 72
159+
"line_number": 82
160+
}
161+
],
162+
"deploy/k8s/ainari/templates/internal-api-key-secret.yaml": [
163+
{
164+
"type": "Secret Keyword",
165+
"filename": "deploy/k8s/ainari/templates/internal-api-key-secret.yaml",
166+
"hashed_secret": "4bd5d8c8ea23b9df9875444c45a4c044026409b6",
167+
"is_verified": false,
168+
"line_number": 7
142169
}
143170
],
144171
"deploy/k8s/ainari/templates/miko/miko-certificate.yaml": [
@@ -156,14 +183,14 @@
156183
"filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
157184
"hashed_secret": "a8fd869cf678cfd350b2aa8fb2bc4e030c75e11d",
158185
"is_verified": false,
159-
"line_number": 61
186+
"line_number": 66
160187
},
161188
{
162189
"type": "Secret Keyword",
163190
"filename": "deploy/k8s/ainari/templates/miko/miko-deployment.yaml",
164191
"hashed_secret": "298bddaea9b4590f81a8c8c5629e7a6417415c64",
165192
"is_verified": false,
166-
"line_number": 67
193+
"line_number": 72
167194
}
168195
],
169196
"deploy/k8s/ainari/templates/omamori/omamori-certificate.yaml": [
@@ -190,7 +217,7 @@
190217
"filename": "deploy/k8s/ainari/templates/omamori/omamori-deployment.yaml",
191218
"hashed_secret": "b42d97659f427e4287f30f0cd8bdc2ac5d3b10b5",
192219
"is_verified": false,
193-
"line_number": 72
220+
"line_number": 77
194221
}
195222
],
196223
"deploy/k8s/ainari/templates/onsen/onsen-deployment.yaml": [
@@ -199,7 +226,7 @@
199226
"filename": "deploy/k8s/ainari/templates/onsen/onsen-deployment.yaml",
200227
"hashed_secret": "a191d9cb43e3f682b350dcdc74b2167ff78ed3b4",
201228
"is_verified": false,
202-
"line_number": 70
229+
"line_number": 80
203230
}
204231
],
205232
"deploy/k8s/ainari/templates/ryokan/ryokan-certificate.yaml": [
@@ -217,14 +244,14 @@
217244
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
218245
"hashed_secret": "04f5ffaec2d0437e26b1e224de6915e15247989f",
219246
"is_verified": false,
220-
"line_number": 84
247+
"line_number": 94
221248
},
222249
{
223250
"type": "Secret Keyword",
224251
"filename": "deploy/k8s/ainari/templates/ryokan/ryokan-deployment.yaml",
225252
"hashed_secret": "8ecbfb09891f75ade7c286346fe355113e680af7",
226253
"is_verified": false,
227-
"line_number": 90
254+
"line_number": 100
228255
}
229256
],
230257
"deploy/k8s/ainari/templates/sakura/sakura-certificate.yaml": [
@@ -242,14 +269,14 @@
242269
"filename": "deploy/k8s/ainari/templates/sakura/sakura-deployment.yaml",
243270
"hashed_secret": "1db3a3e51c405b71091fd7885f714805187b5785",
244271
"is_verified": false,
245-
"line_number": 80
272+
"line_number": 90
246273
},
247274
{
248275
"type": "Secret Keyword",
249276
"filename": "deploy/k8s/ainari/templates/sakura/sakura-deployment.yaml",
250277
"hashed_secret": "845e1c68668309b563d8a17950b9529de8b3616e",
251278
"is_verified": false,
252-
"line_number": 86
279+
"line_number": 96
253280
}
254281
],
255282
"deploy/k8s/ainari/templates/torii/torii-certificate.yaml": [
@@ -267,16 +294,7 @@
267294
"filename": "deploy/k8s/ainari/templates/torii/torii-deployment.yaml",
268295
"hashed_secret": "88f7f6dda5e81f2e7958ef4d21771d2c66f2351a",
269296
"is_verified": false,
270-
"line_number": 72
271-
}
272-
],
273-
"deploy/k8s/ainari/values.yaml": [
274-
{
275-
"type": "Secret Keyword",
276-
"filename": "deploy/k8s/ainari/values.yaml",
277-
"hashed_secret": "9139236dfe89960fee34d53b6089795fe376682e",
278-
"is_verified": false,
279-
"line_number": 25
297+
"line_number": 77
280298
}
281299
],
282300
"deploy/k8s/wg_gen.py": [
@@ -302,6 +320,15 @@
302320
"line_number": 42
303321
}
304322
],
323+
"docs/deployer/config/omamori_config.md": [
324+
{
325+
"type": "Base64 High Entropy String",
326+
"filename": "docs/deployer/config/omamori_config.md",
327+
"hashed_secret": "0bf3d51a345fd1d424906e5d194e126b42648b5f",
328+
"is_verified": false,
329+
"line_number": 38
330+
}
331+
],
305332
"docs/user/rest_api/open_api_docu_hanami.json": [
306333
{
307334
"type": "Base64 High Entropy String",
@@ -510,74 +537,13 @@
510537
"line_number": 234
511538
}
512539
],
513-
"example_configs/ainari/hanami.toml": [
514-
{
515-
"type": "Secret Keyword",
516-
"filename": "example_configs/ainari/hanami.toml",
517-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
518-
"is_verified": false,
519-
"line_number": 10
520-
}
521-
],
522-
"example_configs/ainari/miko.toml": [
523-
{
524-
"type": "Secret Keyword",
525-
"filename": "example_configs/ainari/miko.toml",
526-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
527-
"is_verified": false,
528-
"line_number": 9
529-
}
530-
],
531540
"example_configs/ainari/omamori.toml": [
532-
{
533-
"type": "Secret Keyword",
534-
"filename": "example_configs/ainari/omamori.toml",
535-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
536-
"is_verified": false,
537-
"line_number": 10
538-
},
539541
{
540542
"type": "Base64 High Entropy String",
541543
"filename": "example_configs/ainari/omamori.toml",
542544
"hashed_secret": "0bf3d51a345fd1d424906e5d194e126b42648b5f",
543545
"is_verified": false,
544-
"line_number": 19
545-
}
546-
],
547-
"example_configs/ainari/onsen.toml": [
548-
{
549-
"type": "Secret Keyword",
550-
"filename": "example_configs/ainari/onsen.toml",
551-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
552-
"is_verified": false,
553-
"line_number": 14
554-
}
555-
],
556-
"example_configs/ainari/ryokan.toml": [
557-
{
558-
"type": "Secret Keyword",
559-
"filename": "example_configs/ainari/ryokan.toml",
560-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
561-
"is_verified": false,
562-
"line_number": 10
563-
}
564-
],
565-
"example_configs/ainari/sakura.toml": [
566-
{
567-
"type": "Secret Keyword",
568-
"filename": "example_configs/ainari/sakura.toml",
569-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
570-
"is_verified": false,
571-
"line_number": 11
572-
}
573-
],
574-
"example_configs/ainari/torii.toml": [
575-
{
576-
"type": "Secret Keyword",
577-
"filename": "example_configs/ainari/torii.toml",
578-
"hashed_secret": "3da541559918a808c2402bba5012f6c60b27661c",
579-
"is_verified": false,
580-
"line_number": 10
546+
"line_number": 18
581547
}
582548
],
583549
"src/binaries/omamori/src/database/simple_crypto_table.rs": [
@@ -606,5 +572,5 @@
606572
}
607573
]
608574
},
609-
"generated_at": "2025-11-25T22:35:33Z"
575+
"generated_at": "2025-12-03T20:28:38Z"
610576
}

‎.vscode/launch.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
"env": {
4141
"RUST_BACKTRACE": "full",
4242
"RUST_LOG": "debug,h2=info",
43+
"INTERNAL_API_KEY": "test-internal-api-key",
44+
"SAKURA_REGISTRATION_KEY": "sakura-key",
4345
},
4446
},
4547
{
@@ -54,6 +56,8 @@
5456
"sourceLanguages": ["rust"],
5557
"env": {
5658
"RUST_LOG": "debug,h2=info",
59+
"INTERNAL_API_KEY": "test-internal-api-key",
60+
"SAKURA_REGISTRATION_KEY": "sakura-key",
5761
},
5862
},
5963
{
@@ -69,6 +73,8 @@
6973
"env": {
7074
"RUST_BACKTRACE": "full",
7175
"RUST_LOG": "debug",
76+
"INTERNAL_API_KEY": "test-internal-api-key",
77+
"SAKURA_REGISTRATION_KEY": "sakura-key",
7278
},
7379
},
7480
{
@@ -83,6 +89,8 @@
8389
"sourceLanguages": ["rust"],
8490
"env": {
8591
"RUST_LOG": "debug",
92+
"INTERNAL_API_KEY": "test-internal-api-key",
93+
"SAKURA_REGISTRATION_KEY": "sakura-key",
8694
},
8795
},
8896
{
@@ -102,6 +110,7 @@
102110
"AINARI_ADMIN_PASSPHRASE": "asdfasdf",
103111
"RUST_BACKTRACE": "full",
104112
"RUST_LOG": "debug",
113+
"INTERNAL_API_KEY": "test-internal-api-key",
105114
},
106115
},
107116
{
@@ -120,6 +129,7 @@
120129
"AINARI_ADMIN_NAME": "asdf",
121130
"AINARI_ADMIN_PASSPHRASE": "asdfasdf",
122131
"RUST_LOG": "debug",
132+
"INTERNAL_API_KEY": "test-internal-api-key",
123133
},
124134
},
125135
{
@@ -135,6 +145,8 @@
135145
"env": {
136146
"RUST_BACKTRACE": "full",
137147
"RUST_LOG": "debug",
148+
"INTERNAL_API_KEY": "test-internal-api-key",
149+
"ONSEN_REGISTRATION_KEY": "onsen-key",
138150
},
139151
},
140152
{
@@ -149,6 +161,8 @@
149161
"sourceLanguages": ["rust"],
150162
"env": {
151163
"RUST_LOG": "debug",
164+
"INTERNAL_API_KEY": "test-internal-api-key",
165+
"ONSEN_REGISTRATION_KEY": "onsen-key",
152166
},
153167
},
154168
{
@@ -164,6 +178,7 @@
164178
"env": {
165179
"RUST_BACKTRACE": "full",
166180
"RUST_LOG": "debug",
181+
"INTERNAL_API_KEY": "test-internal-api-key",
167182
},
168183
},
169184
{
@@ -178,6 +193,7 @@
178193
"sourceLanguages": ["rust"],
179194
"env": {
180195
"RUST_LOG": "debug",
196+
"INTERNAL_API_KEY": "test-internal-api-key",
181197
},
182198
},
183199
{
@@ -193,6 +209,7 @@
193209
"env": {
194210
"RUST_BACKTRACE": "full",
195211
"RUST_LOG": "debug",
212+
"INTERNAL_API_KEY": "test-internal-api-key",
196213
},
197214
},
198215
{
@@ -207,6 +224,7 @@
207224
"sourceLanguages": ["rust"],
208225
"env": {
209226
"RUST_LOG": "debug",
227+
"INTERNAL_API_KEY": "test-internal-api-key",
210228
},
211229
},
212230
{
@@ -222,6 +240,8 @@
222240
"env": {
223241
"RUST_BACKTRACE": "full",
224242
"RUST_LOG": "debug,h2=info",
243+
"INTERNAL_API_KEY": "test-internal-api-key",
244+
"ONSEN_REGISTRATION_KEY": "onsen-key",
225245
},
226246
},
227247
{
@@ -236,6 +256,8 @@
236256
"sourceLanguages": ["rust"],
237257
"env": {
238258
"RUST_LOG": "debug,h2=info",
259+
"INTERNAL_API_KEY": "test-internal-api-key",
260+
"ONSEN_REGISTRATION_KEY": "onsen-key",
239261
},
240262
},
241263
{

‎Earthfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ test-hanami:
114114
RUN apt-get update && \
115115
apt-get install -y protobuf-compiler libsqlite3-dev libssl-dev
116116
# only one test-thread to avoid conflicts between tests, which access the same singleton
117-
RUN cargo test -- --test-threads=1
117+
RUN export INTERNAL_API_KEY=test-internal-api-key && \
118+
export SAKURA_REGISTRATION_KEY=sakura-key && \
119+
export ONSEN_REGISTRATION_KEY=sakura-key && \
120+
cargo test -- --test-threads=1
118121

119122

120123
generate-docs:

0 commit comments

Comments
 (0)