projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17960-arv-copy-projects-doc' into main refs #17960
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 394e30a737e2aff13128df90d96decfc12428863..4a7c18b3e06324ab0f37a2a8db54270aedcdc2c9 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,17
@@
type WebDAVCacheConfig struct {
MaxCollectionBytes int64
MaxPermissionEntries int
MaxUUIDEntries int
MaxCollectionBytes int64
MaxPermissionEntries int
MaxUUIDEntries int
+ MaxSessions int
+}
+
+type UploadDownloadPermission struct {
+ Upload bool
+ Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+ User UploadDownloadPermission
+ Admin UploadDownloadPermission
}
type Cluster struct {
}
type Cluster struct {
@@
-86,7
+97,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
@@
-127,8
+138,13
@@
type Cluster struct {
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
BalanceTimeout Duration
+ BalanceUpdateLimit int
WebDAVCache WebDAVCacheConfig
WebDAVCache WebDAVCacheConfig
+
+ KeepproxyPermission UploadDownloadRolePermissions
+ WebDAVPermission UploadDownloadRolePermissions
+ WebDAVLogEvents bool
}
Git struct {
GitCommand string
}
Git struct {
GitCommand string
@@
-152,30
+168,29
@@
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
+ AcceptAccessToken bool
+ AcceptAccessTokenScope string
+ AuthenticationRequestParameters map[string]string
}
PAM struct {
Enable bool
Service string
DefaultEmailDomain string
}
}
PAM struct {
Enable bool
Service string
DefaultEmailDomain string
}
- SSO struct {
- Enable bool
- ProviderAppID string
- ProviderAppSecret string
- }
Test struct {
Enable bool
Users map[string]TestUser
Test struct {
Enable bool
Users map[string]TestUser
@@
-183,6
+198,8
@@
type Cluster struct {
LoginCluster string
RemoteTokenRefresh Duration
TokenLifetime Duration
LoginCluster string
RemoteTokenRefresh Duration
TokenLifetime Duration
+ TrustedClients map[string]struct{}
+ IssueTrustedTokens bool
}
Mail struct {
MailchimpAPIKey string
}
Mail struct {
MailchimpAPIKey string
@@
-217,11
+234,14
@@
type Cluster struct {
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
NewUserNotificationRecipients StringSet
NewUsersAreActive bool
UserNotifierEmailFrom string
+ UserNotifierEmailBcc StringSet
UserProfileNotificationAddress string
PreferDomainForUsername string
UserProfileNotificationAddress string
PreferDomainForUsername string
+ UserSetupMailText string
}
}
- Volumes map[string]Volume
- Workbench struct {
+ StorageClasses map[string]StorageClassConfig
+ Volumes map[string]Volume
+ Workbench struct {
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
ActivationContactLink string
APIClientConnectTimeout Duration
APIClientReceiveTimeout Duration
@@
-261,8
+281,11
@@
type Cluster struct {
SSHHelpHostSuffix string
IdleTimeout Duration
}
SSHHelpHostSuffix string
IdleTimeout Duration
}
+}
- ForceLegacyAPI14 bool
+type StorageClassConfig struct {
+ Default bool
+ Priority int
}
type Volume struct {
}
type Volume struct {
@@
-276,8
+299,8
@@
type Volume struct {
type S3VolumeDriverParameters struct {
IAMRole string
type S3VolumeDriverParameters struct {
IAMRole string
- AccessKey
string
- Secret
Key
string
+ AccessKey
ID
string
+ Secret
AccessKey
string
Endpoint string
Region string
Bucket string
Endpoint string
Region string
Bucket string
@@
-314,6
+337,7
@@
type Services struct {
Composer Service
Controller Service
DispatchCloud Service
Composer Service
Controller Service
DispatchCloud Service
+ DispatchLSF Service
GitHTTP Service
GitSSH Service
Health Service
GitHTTP Service
GitSSH Service
Health Service
@@
-321,7
+345,6
@@
type Services struct {
Keepproxy Service
Keepstore Service
RailsAPI Service
Keepproxy Service
Keepstore Service
RailsAPI Service
- SSO Service
WebDAVDownload Service
WebDAV Service
WebShell Service
WebDAVDownload Service
WebDAV Service
WebShell Service
@@
-411,6
+434,7
@@
type ContainersConfig struct {
StaleLockTimeout Duration
SupportedDockerImageFormats StringSet
UsePreemptibleInstances bool
StaleLockTimeout Duration
SupportedDockerImageFormats StringSet
UsePreemptibleInstances bool
+ RuntimeEngine string
JobsAPI struct {
Enable string
JobsAPI struct {
Enable string
@@
-428,6
+452,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
@@
-442,6
+470,10
@@
type ContainersConfig struct {
AssignNodeHostname string
}
}
AssignNodeHostname string
}
}
+ LSF struct {
+ BsubSudoUser string
+ BsubArgumentsList []string
+ }
}
type CloudVMsConfig struct {
}
type CloudVMsConfig struct {
@@
-578,6
+610,7
@@
const (
ServiceNameRailsAPI ServiceName = "arvados-api-server"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameRailsAPI ServiceName = "arvados-api-server"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
+ ServiceNameDispatchLSF ServiceName = "arvados-dispatch-lsf"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
@@
-595,6
+628,7
@@
func (svcs Services) Map() map[ServiceName]Service {
ServiceNameRailsAPI: svcs.RailsAPI,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameRailsAPI: svcs.RailsAPI,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
+ ServiceNameDispatchLSF: svcs.DispatchLSF,
ServiceNameHealth: svcs.Health,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameHealth: svcs.Health,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,