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 8a1b025a043c99d340d3eadf1e489a9a5f85c1fc..6e59828a3cbf5656fef1e6c7fc790ca9d3b6268f 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-68,6
+68,16
@@
type WebDAVCacheConfig struct {
MaxSessions int
}
MaxSessions int
}
+type UploadDownloadPermission struct {
+ Upload bool
+ Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+ User UploadDownloadPermission
+ Admin UploadDownloadPermission
+}
+
type Cluster struct {
ClusterID string `json:"-"`
ManagementToken string
type Cluster struct {
ClusterID string `json:"-"`
ManagementToken string
@@
-130,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
@@
-167,6
+181,7
@@
type Cluster struct {
EmailClaim string
EmailVerifiedClaim string
UsernameClaim string
EmailClaim string
EmailVerifiedClaim string
UsernameClaim string
+ AcceptAccessToken bool
AcceptAccessTokenScope string
AuthenticationRequestParameters map[string]string
}
AcceptAccessTokenScope string
AuthenticationRequestParameters map[string]string
}
@@
-175,11
+190,6
@@
type Cluster struct {
Service string
DefaultEmailDomain string
}
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
@@
-188,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
@@
-325,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
@@
-415,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