Commit 6364abe
fix(s3): use EmulatorConfig for FLOCI_HOSTNAME to fix native image crash
S3VirtualHostFilter used @ConfigProperty injection in its constructor,
which gets baked into the GraalVM native binary at build time. Setting
FLOCI_HOSTNAME at runtime via Docker env var caused an
IllegalStateException because the runtime value differed from the
build-time value (null).
Refactor to inject EmulatorConfig (which uses @ConfigMapping and is
runtime-safe) instead of raw @ConfigProperty, following the established
pattern used by StorageFactory, ServiceRegistry, RegionResolver, etc.
Also make bucket extraction hostname-aware: only treat the first label
as a bucket name when the remainder matches the configured base
hostname (or a well-known AWS S3 domain). This prevents false positives
when Floci sits behind a multi-label hostname like
floci.svc.cluster.local.
Co-Authored-By: Matej Snuderl <ematej.snuderl@gmail.com>1 parent 17841d2 commit 6364abe
2 files changed
Lines changed: 38 additions & 23 deletions
File tree
- src
- main/java/io/github/hectorvent/floci/services/s3
- test/java/io/github/hectorvent/floci/services/s3
Lines changed: 22 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | | - | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
| 20 | + | |
| 21 | + | |
28 | 22 | | |
29 | 23 | | |
30 | 24 | | |
| |||
71 | 65 | | |
72 | 66 | | |
73 | 67 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
78 | 72 | | |
79 | 73 | | |
80 | | - | |
81 | | - | |
| 74 | + | |
| 75 | + | |
82 | 76 | | |
83 | 77 | | |
84 | 78 | | |
85 | 79 | | |
86 | | - | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
87 | 83 | | |
88 | 84 | | |
89 | 85 | | |
| |||
117 | 113 | | |
118 | 114 | | |
119 | 115 | | |
120 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
121 | 119 | | |
122 | 120 | | |
123 | 121 | | |
| |||
147 | 145 | | |
148 | 146 | | |
149 | 147 | | |
150 | | - | |
| 148 | + | |
151 | 149 | | |
152 | | - | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
153 | 153 | | |
154 | | - | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
155 | 157 | | |
156 | 158 | | |
157 | 159 | | |
Lines changed: 16 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | | - | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
36 | | - | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
73 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
74 | 82 | | |
75 | 83 | | |
76 | 84 | | |
| |||
83 | 91 | | |
84 | 92 | | |
85 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
86 | 99 | | |
0 commit comments