projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17829-remove-omniauth' refs #17829
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 2c6db42d133652d535594b6e13d46c035cf5e5ea..7fdea2c74059224c0718fe60fcd099df7acb3843 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-167,6
+167,8
@@
type Cluster struct {
EmailClaim string
EmailVerifiedClaim string
UsernameClaim string
EmailClaim string
EmailVerifiedClaim string
UsernameClaim string
+ AcceptAccessToken bool
+ AcceptAccessTokenScope string
AuthenticationRequestParameters map[string]string
}
PAM struct {
AuthenticationRequestParameters map[string]string
}
PAM struct {
@@
-174,11
+176,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
@@
-187,6
+184,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
@@
-324,7
+322,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
@@
-414,6
+411,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