projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17530: Added check if API host is missing
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 363d09dafb5452b350077d6933ed2698689fb513..c0170d1d7f53e61460e2e32155a250fe9ed62cc6 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 {
@@
-65,6
+65,7
@@
type WebDAVCacheConfig struct {
MaxCollectionBytes int64
MaxPermissionEntries int
MaxUUIDEntries int
MaxCollectionBytes int64
MaxPermissionEntries int
MaxUUIDEntries int
+ MaxSessions int
}
type Cluster struct {
}
type Cluster struct {
@@
-86,7
+87,7
@@
type Cluster struct {
MaxKeepBlobBuffers int
MaxRequestAmplification int
MaxRequestSize int
MaxKeepBlobBuffers int
MaxRequestAmplification int
MaxRequestSize int
- RailsSessionSecretToken string
+ MaxTokenLifetime Duration
RequestTimeout Duration
SendTimeout Duration
WebsocketClientEventQueue int
RequestTimeout Duration
SendTimeout Duration
WebsocketClientEventQueue int
@@
-152,19
+153,21
@@
type Cluster struct {
UsernameAttribute string
}
Google struct {
UsernameAttribute string
}
Google struct {
- Enable bool
- ClientID string
- ClientSecret string
- AlternateEmailAddresses bool
+ Enable bool
+ ClientID string
+ ClientSecret string
+ AlternateEmailAddresses bool
+ AuthenticationRequestParameters map[string]string
}
OpenIDConnect struct {
}
OpenIDConnect struct {
- Enable bool
- Issuer string
- ClientID string
- ClientSecret string
- EmailClaim string
- EmailVerifiedClaim string
- UsernameClaim string
+ Enable bool
+ Issuer string
+ ClientID string
+ ClientSecret string
+ EmailClaim string
+ EmailVerifiedClaim string
+ UsernameClaim string
+ AuthenticationRequestParameters map[string]string
}
PAM struct {
Enable bool
}
PAM struct {
Enable bool
@@
-183,6
+186,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
+223,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 {
@@
-261,8
+266,6
@@
type Cluster struct {
SSHHelpHostSuffix string
IdleTimeout Duration
}
SSHHelpHostSuffix string
IdleTimeout Duration
}
-
- ForceLegacyAPI14 bool
}
type Volume struct {
}
type Volume struct {
@@
-428,6
+431,10
@@
type ContainersConfig struct {
LogUpdatePeriod Duration
LogUpdateSize ByteSize
}
LogUpdatePeriod Duration
LogUpdateSize ByteSize
}
+ ShellAccess struct {
+ Admin bool
+ User bool
+ }
SLURM struct {
PrioritySpread int64
SbatchArgumentsList []string
SLURM struct {
PrioritySpread int64
SbatchArgumentsList []string
@@
-462,6
+469,7
@@
type CloudVMsConfig struct {
TimeoutProbe Duration
TimeoutShutdown Duration
TimeoutSignal Duration
TimeoutProbe Duration
TimeoutShutdown Duration
TimeoutSignal Duration
+ TimeoutStaleRunLock Duration
TimeoutTERM Duration
ResourceTags map[string]string
TagKeyPrefix string
TimeoutTERM Duration
ResourceTags map[string]string
TagKeyPrefix string