[arvados] updated: 2.1.0-2784-g46aadf6a6

[git repository hosting]

Summary of changes:
 .../src/main/java/org/arvados/client/logic/keep/KeepClient.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

       via  46aadf6a64881e932adb4c54cb1a8c4b22e84d67 (commit)
       via  ef833210fd7400727e01c97551ab0e645773d3fb (commit)
      from  61d3aed1cd0286c7928167a84267c225938a37ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 46aadf6a64881e932adb4c54cb1a8c4b22e84d67
Merge: 61d3aed1c ef833210f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jul 22 15:45:24 2022 -0400

    Merge branch 'MajewskiKrzysztof/use_api_token_from_config_object'
    
    refs #19282
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit ef833210fd7400727e01c97551ab0e645773d3fb
Author: Krzysztof Majewski <krzysztof.majewski.km1 at contractors.roche.com>
Date:   Fri Jul 8 09:32:26 2022 +0200

    Use config parameter to fetch api token in KeepClient
    
    Arvados-DCO-1.1-Signed-off-by: Krzysztof Majewski majewski.kielce at gmail.com

diff --git a/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/KeepClient.java b/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/KeepClient.java
index 9cc732d46..cc409983b 100644
--- a/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/KeepClient.java
+++ b/sdk/java-v2/src/main/java/org/arvados/client/logic/keep/KeepClient.java
@@ -39,14 +39,12 @@ public class KeepClient {
     private List<KeepService> keepServices;
     private List<KeepService> writableServices;
     private Map<String, KeepService> gatewayServices;
-    private final String apiToken;
     private Integer maxReplicasPerService;
     private final ConfigProvider config;
 
     public KeepClient(ConfigProvider config) {
         this.config = config;
         keepServicesApiClient = new KeepServicesApiClient(config);
-        apiToken = config.getApiToken();
     }
 
     public byte[] getDataChunk(KeepLocator keepLocator) {
@@ -122,7 +120,7 @@ public class KeepClient {
     private List<String> mapNewServices(Map<String, FileTransferHandler> rootsMap, KeepLocator locator,
                                         boolean forceRebuild, boolean needWritable, Map<String, String> headers) {
 
-        headers.putIfAbsent("Authorization", String.format("OAuth2 %s", apiToken));
+        headers.putIfAbsent("Authorization", String.format("OAuth2 %s", config.getApiToken()));
         List<String> localRoots = weightedServiceRoots(locator, forceRebuild, needWritable);
         for (String root : localRoots) {
             FileTransferHandler keepServiceLocal = new FileTransferHandler(root, headers, config);

-----------------------------------------------------------------------


hooks/post-receive
--