File tree Expand file tree Collapse file tree 1 file changed +10
-4
lines changed
rust/operator-binary/src/connect Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -221,14 +221,20 @@ impl ConnectConfig {
221221 }
222222}
223223
224+ // This is the equivalent to merged_config() in other ops
225+ // only here we only need to merge operator defaults with
226+ // user configuration.
224227impl v1alpha1:: SparkConnectServer {
225- // This is the equivalent og merged_config() in other ops
226- // only here we have nothing to merge.
227228 pub fn conect_config ( & self ) -> Result < ConnectConfig , Error > {
229+ let defaults = ConnectConfig :: default_config ( ) ;
228230 fragment:: validate (
229231 match self . spec . server . as_ref ( ) . map ( |cc| cc. config . clone ( ) ) {
230- Some ( fragment) => fragment. clone ( ) ,
231- _ => ConnectConfig :: default_config ( ) ,
232+ Some ( fragment) => {
233+ let mut fc = fragment. clone ( ) ;
234+ fc. merge ( & defaults) ;
235+ fc
236+ }
237+ _ => defaults,
232238 } ,
233239 )
234240 . context ( FragmentValidationFailureSnafu )
You can’t perform that action at this time.
0 commit comments