Make proxy_config non-optional

Signed-off-by: Stephen Cheng <stephen.cheng@citrix.com>

Author: Stephen Cheng

ocaml/tests/test_repository_helpers.ml

@@ -346,8 +346,8 @@ module WriteYumConfig = Generic.MakeStateless (struct
     let gpgkey_path' = Option.value ~default:"" name in
     try
       (* The path of file which will be written by write_yum_config *)
-      write_yum_config ~source_url ~binary_url ~repo_gpgcheck:true
-        ~gpgkey_path:gpgkey_path' ~repo_name () ;
+      write_yum_config ~proxy_config:[] ~source_url ~binary_url
+        ~repo_gpgcheck:true ~gpgkey_path:gpgkey_path' ~repo_name ;
       let in_ch = open_in repo_file_path in
       let content = read_from_in_channel "" in_ch in
       close_in in_ch ; finally () ; Ok content

ocaml/xapi/repository.ml

@@ -227,9 +227,9 @@ let sync ~__context ~self ~token ~token_id ~username ~password =
     let proxy_config =
       match use_proxy with true -> get_proxy_params ~__context | false -> []
     in
-    let write_initial_yum_config ?(proxy_config = proxy_config) ~binary_url () =
+    let write_initial_yum_config ~proxy_config ~binary_url =
       write_yum_config ~proxy_config ~source_url ~binary_url ~repo_gpgcheck:true
-        ~gpgkey_path ~repo_name ()
+        ~gpgkey_path ~repo_name
     in
     Xapi_stdext_pervasives.Pervasiveext.finally
       (fun () ->
@@ -258,9 +258,8 @@ let sync ~__context ~self ~token ~token_id ~username ~password =
 
         with_sync_client_auth client_auth @@ fun client_auth ->
         with_sync_server_auth server_auth @@ fun binary_url' ->
-        write_initial_yum_config
-          ~binary_url:(Option.value binary_url' ~default:binary_url)
-          () ;
+        write_initial_yum_config ~proxy_config
+          ~binary_url:(Option.value binary_url' ~default:binary_url) ;
         clean_yum_cache repo_name ;
         (* Remove imported YUM repository GPG key *)
         if Pkgs.manager = Yum then
@@ -294,7 +293,7 @@ let sync ~__context ~self ~token ~token_id ~username ~password =
         match Pkgs.manager with
         | Yum ->
             (* Write clean config without proxy credentials *)
-            write_initial_yum_config ~proxy_config:[] ~binary_url ()
+            write_initial_yum_config ~proxy_config:[] ~binary_url
         | Dnf ->
             Unixext.unlink_safe !Xapi_globs.dnf_repo_config_file
       ) ;

ocaml/xapi/repository_helpers.ml

@@ -310,8 +310,8 @@ let remove_repo_conf_file repo_name =
   in
   Unixext.unlink_safe path
 
-let write_yum_config ?(proxy_config = []) ~source_url ~binary_url ~repo_gpgcheck
-    ~gpgkey_path ~repo_name () =
+let write_yum_config ~proxy_config ~source_url ~binary_url ~repo_gpgcheck
+    ~gpgkey_path ~repo_name =
   let file_path =
     Filename.concat !Xapi_globs.yum_repos_config_dir (repo_name ^ ".repo")
   in
@@ -446,8 +446,8 @@ let with_local_repositories ~__context f =
                   s
             in
             remove_repo_conf_file repo_name ;
-            write_yum_config ~source_url:None ~binary_url ~repo_gpgcheck:false
-              ~gpgkey_path ~repo_name () ;
+            write_yum_config ~proxy_config:[] ~source_url:None ~binary_url
+              ~repo_gpgcheck:false ~gpgkey_path ~repo_name ;
             clean_yum_cache repo_name ;
             let Pkg_mgr.{cmd; params} =
               [