[buildstream] branch abderrahim/storage-service created (now 09b98ee06)

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

akitouni pushed a change to branch abderrahim/storage-service
in repository https://gitbox.apache.org/repos/asf/buildstream.git


      at 09b98ee06 _cas/casdprocessmanager.py: pass cert and key filenames buildbox-casd

This branch includes the following new commits:

     new 09b98ee06 _cas/casdprocessmanager.py: pass cert and key filenames buildbox-casd

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[buildstream] 01/01: _cas/casdprocessmanager.py: pass cert and key filenames buildbox-casd

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

akitouni pushed a commit to branch abderrahim/storage-service
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 09b98ee0657129f68a329f4a8d2a973d529fd018
Author: Abderrahim Kitouni <ak...@gnome.org>
AuthorDate: Wed Sep 7 20:55:52 2022 +0100

    _cas/casdprocessmanager.py: pass cert and key filenames buildbox-casd
    
    It used to pass the contents of the files as command line arguments which
    buildbox-casd would choke on.
---
 src/buildstream/_cas/casdprocessmanager.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/buildstream/_cas/casdprocessmanager.py b/src/buildstream/_cas/casdprocessmanager.py
index 0cf25b86b..5ecdcad9a 100644
--- a/src/buildstream/_cas/casdprocessmanager.py
+++ b/src/buildstream/_cas/casdprocessmanager.py
@@ -89,11 +89,11 @@ class CASDProcessManager:
             casd_args.append("--cas-remote={}".format(remote_cache_spec.url))
             if remote_cache_spec.instance_name:
                 casd_args.append("--cas-instance={}".format(remote_cache_spec.instance_name))
-            if remote_cache_spec.server_cert:
-                casd_args.append("--cas-server-cert={}".format(remote_cache_spec.server_cert))
-            if remote_cache_spec.client_key:
-                casd_args.append("--cas-client-key={}".format(remote_cache_spec.client_key))
-                casd_args.append("--cas-client-cert={}".format(remote_cache_spec.client_cert))
+            if remote_cache_spec.server_cert_file:
+                casd_args.append("--cas-server-cert={}".format(remote_cache_spec.server_cert_file))
+            if remote_cache_spec.client_key_file:
+                casd_args.append("--cas-client-key={}".format(remote_cache_spec.client_key_file))
+                casd_args.append("--cas-client-cert={}".format(remote_cache_spec.client_cert_file))
 
         casd_args.append(path)