projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17830-reqid-header-propagation-fix' into main. Closes #17830
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index a8d601d5f6591d2f224cd9a7d0f941be8894b541..6e59828a3cbf5656fef1e6c7fc790ca9d3b6268f 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-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
@@
-129,6
+140,10
@@
type Cluster struct {
BalanceTimeout Duration
WebDAVCache WebDAVCacheConfig
BalanceTimeout Duration
WebDAVCache WebDAVCacheConfig
+
+ KeepproxyPermission UploadDownloadRolePermissions
+ WebDAVPermission UploadDownloadRolePermissions
+ WebDAVLogEvents bool
}
Git struct {
GitCommand string
}
Git struct {
GitCommand string
@@
-152,30
+167,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
@@
-184,6
+198,7
@@
type Cluster struct {
RemoteTokenRefresh Duration
TokenLifetime Duration
TrustedClients map[string]struct{}
RemoteTokenRefresh Duration
TokenLifetime Duration
TrustedClients map[string]struct{}
+ IssueTrustedTokens bool
}
Mail struct {
MailchimpAPIKey string
}
Mail struct {
MailchimpAPIKey string
@@
-263,8
+278,6
@@
type Cluster struct {
SSHHelpHostSuffix string
IdleTimeout Duration
}
SSHHelpHostSuffix string
IdleTimeout Duration
}
-
- ForceLegacyAPI14 bool
}
type Volume struct {
}
type Volume struct {
@@
-278,8
+291,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
@@
-323,7
+336,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
@@
-413,6
+425,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
@@
-430,6
+443,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