projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16669: Accept OIDC access token in lieu of arvados api token.
[arvados.git]
/
lib
/
controller
/
fed_collections.go
diff --git
a/lib/controller/fed_collections.go
b/lib/controller/fed_collections.go
index 07daf2f90ef28b3199e856c93134aa5b6975fab3..c33f5b28946ab430e8532195c50c8ff8ac478506 100644
(file)
--- a/
lib/controller/fed_collections.go
+++ b/
lib/controller/fed_collections.go
@@
-17,9
+17,9
@@
import (
"strings"
"sync"
"strings"
"sync"
- "git.
curoverse.com
/arvados.git/sdk/go/arvados"
- "git.
curoverse.com
/arvados.git/sdk/go/httpserver"
- "git.
curoverse.com
/arvados.git/sdk/go/keepclient"
+ "git.
arvados.org
/arvados.git/sdk/go/arvados"
+ "git.
arvados.org
/arvados.git/sdk/go/httpserver"
+ "git.
arvados.org
/arvados.git/sdk/go/keepclient"
)
func rewriteSignatures(clusterID string, expectHash string,
)
func rewriteSignatures(clusterID string, expectHash string,
@@
-232,6
+232,10
@@
func fetchRemoteCollectionByPDH(
// No need to query local cluster again
continue
}
// No need to query local cluster again
continue
}
+ if remoteID == "*" {
+ // This isn't a real remote cluster: it just sets defaults for unlisted remotes.
+ continue
+ }
wg.Add(1)
go func(remote string) {
wg.Add(1)
go func(remote string) {
@@
-293,10
+297,8
@@
func fetchRemoteCollectionByPDH(
var errors []string
for len(errorChan) > 0 {
err := <-errorChan
var errors []string
for len(errorChan) > 0 {
err := <-errorChan
- if httperr, ok := err.(HTTPError); ok {
- if httperr.Code != http.StatusNotFound {
- errorCode = http.StatusBadGateway
- }
+ if httperr, ok := err.(HTTPError); !ok || httperr.Code != http.StatusNotFound {
+ errorCode = http.StatusBadGateway
}
errors = append(errors, err.Error())
}
}
errors = append(errors, err.Error())
}