-
-
Notifications
You must be signed in to change notification settings - Fork 18
Expand file tree
/
Copy pathconfig_overrides.rs
More file actions
453 lines (402 loc) · 14.9 KB
/
Copy pathconfig_overrides.rs
File metadata and controls
453 lines (402 loc) · 14.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
use std::collections::BTreeMap;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use serde_json::json;
use tracing::warn;
use crate::{
config::merge::Merge, k8s_openapi::DeepMerge, schemars, utils::crds::raw_object_schema,
};
// Variant of [`stackable_operator::config_overrides::KeyValueConfigOverrides`] that implements
// Merge
/// Flat key-value overrides for `*.properties`, Hadoop XML, etc.
///
/// This is backwards-compatible with the existing flat key-value YAML format
/// used by `HashMap<String, String>`.
#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, Merge, PartialEq, Serialize)]
#[merge(path_overrides(merge = "crate::config::merge"))]
pub struct KeyValueConfigOverrides {
#[serde(flatten)]
pub overrides: BTreeMap<String, Option<String>>,
}
// Variant of [`stackable_operator::config_overrides::JsonConfigOverrides`] with the following
// changes:
// - Implements Default
// - Implements Merge by using a Sequence variant which is not exposed in the CRD
// - `JsonPatches` was renamed to `JsonPatch` because it is one patch consisting of multiple
// operations.
// - `JsonPatch` contains a `json_patch::Patch` instead of a vector of strings
/// ConfigOverrides that can be applied to a JSON file.
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub enum JsonConfigOverrides {
/// Can be set to arbitrary YAML content, which is converted to JSON and used as
/// [RFC 7396](https://datatracker.ietf.org/doc/html/rfc7396) JSON merge patch.
JsonMergePatch(serde_json::Value),
/// An [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902) JSON patch.
///
/// Can be used when more flexibility is needed, e.g. to only modify elements
/// in a list based on a condition.
///
/// A patch looks something like
///
/// `- {"op": "test", "path": "/0/name", "value": "Andrew"}`
///
/// or
///
/// `- {"op": "add", "path": "/0/happy", "value": true}`
JsonPatch(json_patch::Patch),
/// Override the entire config file with the specified JSON value.
UserProvided(serde_json::Value),
/// Sequence of [`JsonConfigOverrides`] starting with the latest patch
///
/// This variant is used internally to combine the role and role group configOverrides. They
/// cannot be merged right away because the order of JsonPatch application affects the result.
#[serde(skip)]
Sequence(Vec<Self>),
}
impl JsonConfigOverrides {
// Infallible variant of [`stackable_operator::config_overrides::JsonConfigOverrides::apply`]
pub fn apply(&self, base: &serde_json::Value) -> serde_json::Value {
match self {
Self::JsonMergePatch(patch) => {
let mut doc = base.clone();
doc.merge_from(patch.clone());
doc
}
Self::JsonPatch(patch) => {
let mut doc = base.clone();
if let Err(error) = json_patch::patch(&mut doc, patch) {
warn!("The JSON patch could not be applied: {error}");
}
doc
}
Self::UserProvided(content) => content.clone(),
Self::Sequence(sequence) => {
let mut doc = base.clone();
// `sequence` starts with the latest patch. Iterate in reverse order, to apply the
// patches from the first to the last one.
for patch in sequence.iter().rev() {
doc = patch.apply(&doc);
}
doc
}
}
}
}
impl Default for JsonConfigOverrides {
fn default() -> Self {
// There are several options to represent an empty patch, e.g.
// `JsonConfigOverrides::Sequence(vec![])`. As this is exposed as the default in the CRD,
// an empty JSON merge patch is returned, because JSON merge patches are the preferred way
// to override the configuration.
Self::JsonMergePatch(json!({}))
}
}
impl Merge for JsonConfigOverrides {
fn merge(&mut self, defaults: &Self) {
let mut sequence = if let Self::Sequence(sequence) = self {
sequence.clone()
} else {
vec![self.clone()]
};
if let Self::Sequence(base) = defaults {
sequence.extend(base.clone());
} else {
sequence.push(defaults.clone());
}
*self = Self::Sequence(sequence);
}
}
impl From<KeyValueConfigOverrides> for JsonConfigOverrides {
fn from(value: KeyValueConfigOverrides) -> Self {
Self::JsonMergePatch(value.overrides.into_iter().collect())
}
}
/// ConfigOverrides as key-value pairs, JSON merge patch, JSON patch or JSON object.
///
/// The key-value pairs, JSON merge patch and JSON patch are merged with/applied to the
/// configuration provided by the operator. The user-provided JSON object replaces the
/// configuration of the operator.
///
/// Example for key-value pairs:
///
/// ```yaml
/// stringProperty: new value
/// booleanProperty: "true"
/// ```
///
/// Example for a JSON merge patch:
///
/// ```yaml
/// jsonMergePatch:
/// stringProperty: new value
/// booleanProperty: true
/// nestedProperty:
/// key: value
/// ```
///
/// Example for a JSON patch:
///
/// ```yaml
/// jsonPatch:
/// - op: replace
/// path: /stringProperty
/// value: new value
/// ```
///
/// Example for a JSON object:
///
/// ```yaml
/// userProvided:
/// stringProperty: new value
/// booleanProperty: true
/// nestedProperty:
/// key: value
/// ```
#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
#[serde(untagged)]
#[schemars(schema_with = "raw_object_schema")]
pub enum JsonOrKeyValueConfigOverrides {
Json(JsonConfigOverrides),
KeyValue(KeyValueConfigOverrides),
}
impl Default for JsonOrKeyValueConfigOverrides {
fn default() -> Self {
Self::Json(JsonConfigOverrides::default())
}
}
impl From<JsonOrKeyValueConfigOverrides> for JsonConfigOverrides {
fn from(value: JsonOrKeyValueConfigOverrides) -> Self {
match value {
JsonOrKeyValueConfigOverrides::KeyValue(key_value_config_overrides) => {
key_value_config_overrides.into()
}
JsonOrKeyValueConfigOverrides::Json(json_config_overrides) => json_config_overrides,
}
}
}
impl Merge for JsonOrKeyValueConfigOverrides {
fn merge(&mut self, defaults: &Self) {
let mut self_json_config_overrides: JsonConfigOverrides = self.clone().into();
let defaults_json_config_overrides = defaults.clone().into();
self_json_config_overrides.merge(&defaults_json_config_overrides);
*self = Self::Json(self_json_config_overrides);
}
}
#[cfg(test)]
mod tests {
use serde_json::json;
use super::*;
use crate::config::merge;
#[test]
fn test_json_config_overrides_apply() {
let base = json!({
"keyA": "base A",
"keyB": "base B"
});
let json_merge_patch = JsonConfigOverrides::JsonMergePatch(json!({
"keyB": "patch B",
"keyC": "patch C"
}));
assert_eq!(
json!({
"keyA": "base A",
"keyB": "patch B",
"keyC": "patch C"
}),
json_merge_patch.apply(&base)
);
let json_patch = JsonConfigOverrides::JsonPatch(
serde_json::from_value(json!([
{ "op": "replace", "path": "/keyB", "value": "patch B" },
{ "op": "add", "path": "/keyC", "value": "patch C" },
]))
.expect("should contain valid JSON patch operations"),
);
assert_eq!(
json!({
"keyA": "base A",
"keyB": "patch B",
"keyC": "patch C",
}),
json_patch.apply(&base)
);
let invalid_json_patch = JsonConfigOverrides::JsonPatch(
serde_json::from_value(json!([
{ "op": "replace", "path": "/keyB", "value": "patch B" },
{ "op": "remove", "path": "/keyD" }
]))
.expect("should contain valid JSON patch operations"),
);
// invalid_json_patch cannot be applied because the path "/keyD" does not exist in base.
// A warning should be logged and the changes should be rolled back, i.e. "keyB" should be
// "base B" instead of "patch B".
assert_eq!(
json!({
"keyA": "base A",
"keyB": "base B",
}),
invalid_json_patch.apply(&base)
);
let user_provided = JsonConfigOverrides::UserProvided(json!({
"keyB": "patch B",
"keyC": "patch C"
}));
assert_eq!(
json!({
"keyB": "patch B",
"keyC": "patch C"
}),
user_provided.apply(&base)
);
let sequence = JsonConfigOverrides::Sequence(vec![
// There should be no nested sequences, but as it is not technically prevented, it is
// tested nevertheless.
JsonConfigOverrides::Sequence(vec![JsonConfigOverrides::JsonMergePatch(json!({
"keyC": "patch C.2",
"keyD": "patch D.2"
}))]),
JsonConfigOverrides::JsonMergePatch(json!({
"keyB": "patch B.1",
"keyC": "patch C.1"
})),
]);
assert_eq!(
json!({
"keyA": "base A",
"keyB": "patch B.1",
"keyC": "patch C.2",
"keyD": "patch D.2"
}),
sequence.apply(&base)
);
}
#[test]
fn test_json_config_overrides_merge() {
let sequence1 = JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.1",
})),
]);
let sequence2 = JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.1",
})),
]);
// It does not matter for the test case if the JsonMergePatch, JsonPatch or UserProvided
// variant is chosen.
let json_merge_patch1 = JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 1",
}));
let json_merge_patch2 = JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 2",
}));
assert_eq!(
JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.1",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.1",
})),
]),
merge::merge(sequence2.clone(), &sequence1)
);
assert_eq!(
JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 1.1",
})),
]),
merge::merge(json_merge_patch2.clone(), &sequence1)
);
assert_eq!(
JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "sequence 2.1",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 1",
})),
]),
merge::merge(sequence2.clone(), &json_merge_patch1)
);
assert_eq!(
JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 2",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch 1",
})),
]),
merge::merge(json_merge_patch2.clone(), &json_merge_patch1)
);
}
#[test]
fn test_json_config_overrides_from_key_value_config_overrides() {
let key_value_config_overrides = KeyValueConfigOverrides {
overrides: [("key".to_owned(), Some("value".to_owned()))].into(),
};
let actual_json_config_overrides: JsonConfigOverrides = key_value_config_overrides.into();
let expected_json_config_overrides =
JsonConfigOverrides::JsonMergePatch(json!({"key": "value"}));
assert_eq!(expected_json_config_overrides, actual_json_config_overrides);
}
#[test]
fn test_json_config_overrides_from_json_or_key_value_config_overrides() {
let key_value_config_overrides =
JsonOrKeyValueConfigOverrides::KeyValue(KeyValueConfigOverrides {
overrides: [("key".to_owned(), Some("value".to_owned()))].into(),
});
let actual_json_config_overrides: JsonConfigOverrides = key_value_config_overrides.into();
let expected_json_config_overrides =
JsonConfigOverrides::JsonMergePatch(json!({"key": "value"}));
assert_eq!(expected_json_config_overrides, actual_json_config_overrides);
}
#[test]
fn test_json_or_key_value_config_overrides_merge() {
let base = JsonOrKeyValueConfigOverrides::KeyValue(KeyValueConfigOverrides {
overrides: [("key".to_owned(), Some("base".to_owned()))].into(),
});
let patch = JsonOrKeyValueConfigOverrides::KeyValue(KeyValueConfigOverrides {
overrides: [("key".to_owned(), Some("patch".to_owned()))].into(),
});
// The merge implementation internally converts KeyValueConfigOverrides to
// JsonConfigOverrides. It is already tested in [`test_json_config_overrides_merge`] that
// merging JsonConfigOverrides works. Therefore, one test case with KeyValueConfigOverrides
// is sufficient.
assert_eq!(
JsonOrKeyValueConfigOverrides::Json(JsonConfigOverrides::Sequence(vec![
JsonConfigOverrides::JsonMergePatch(json!({
"key": "patch",
})),
JsonConfigOverrides::JsonMergePatch(json!({
"key": "base",
}))
])),
merge::merge(patch, &base)
);
}
}