projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17225-ruby-sdk' refs #17225
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 394e30a737e2aff13128df90d96decfc12428863..9dc9e17dd815b1818bc17bb20c074d69982e146d 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-49,12
+49,12
@@
func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
}
}
}
}
}
}
- if cc, ok := sc.Clusters[clusterID]; !ok {
+ cc, ok := sc.Clusters[clusterID]
+ if !ok {
return nil, fmt.Errorf("cluster %q is not configured", clusterID)
return nil, fmt.Errorf("cluster %q is not configured", clusterID)
- } else {
- cc.ClusterID = clusterID
- return &cc, nil
}
}
+ cc.ClusterID = clusterID
+ return &cc, nil
}
type WebDAVCacheConfig struct {
}
type WebDAVCacheConfig struct {
@@
-86,7
+86,6
@@
type Cluster struct {
MaxKeepBlobBuffers int
MaxRequestAmplification int
MaxRequestSize int
MaxKeepBlobBuffers int
MaxRequestAmplification int
MaxRequestSize int
- RailsSessionSecretToken string
RequestTimeout Duration
SendTimeout Duration
WebsocketClientEventQueue int
RequestTimeout Duration
SendTimeout Duration
WebsocketClientEventQueue int
@@
-183,6
+182,7
@@
type Cluster struct {
LoginCluster string
RemoteTokenRefresh Duration
TokenLifetime Duration
LoginCluster string
RemoteTokenRefresh Duration
TokenLifetime Duration
+ TrustedClients map[string]struct{}
}
Mail struct {
MailchimpAPIKey string
}
Mail struct {
MailchimpAPIKey string
@@
-219,6
+219,7
@@
type Cluster struct {
UserNotifierEmailFrom string
UserProfileNotificationAddress string
PreferDomainForUsername string
UserNotifierEmailFrom string
UserProfileNotificationAddress string
PreferDomainForUsername string
+ UserSetupMailText string
}
Volumes map[string]Volume
Workbench struct {
}
Volumes map[string]Volume
Workbench struct {