fix: address review feedback

Author: dervoeti

docs/modules/opa/pages/usage-guide/configuration-environment-overrides.adoc

@@ -8,7 +8,8 @@ This will lead to faulty installations.
 
 == Configuration properties
 
-OPA's `config.json` can be overridden using `configOverrides`, the supported override strategies are `jsonMergePatch` (RFC 7396) and `jsonPatches` (RFC 6902).
+OPA's `config.json` can be overridden using `configOverrides`.
+For details on the supported override strategies, see the xref:concepts:overrides.adoc#config-overrides[config overrides documentation].
 
 For example per role group:
 

rust/operator-binary/src/controller.rs

@@ -1237,22 +1237,26 @@ fn build_config_file(
 
     let config = OpaClusterConfigFile::new(decision_logging);
 
-    let mut config_value = serde_json::to_value(&config).context(SerializeConfigFileSnafu {
-        file: CONFIG_FILE.to_string(),
-    })?;
+    let mut config_value =
+        serde_json::to_value(&config).with_context(|_| SerializeConfigFileSnafu {
+            file: CONFIG_FILE.to_string(),
+        })?;
 
     // Apply role-level overrides first, then rolegroup-level on top.
     // This way rolegroup settings take precedence over role settings.
     for overrides in [role_config_override, rolegroup_config_override]
         .into_iter()
         .flatten()
     {
-        config_value = overrides.apply(&config_value).context(ApplyConfigOverridesSnafu {
-            file: CONFIG_FILE.to_string(),
-        })?;
+        config_value =
+            overrides
+                .apply(&config_value)
+                .with_context(|_| ApplyConfigOverridesSnafu {
+                    file: CONFIG_FILE.to_string(),
+                })?;
     }
 
-    serde_json::to_string_pretty(&config_value).context(SerializeConfigFileSnafu {
+    serde_json::to_string_pretty(&config_value).with_context(|_| SerializeConfigFileSnafu {
         file: CONFIG_FILE.to_string(),
     })
 }