X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2031e72047634a3f5944f36d175c1ae351a3bd3e..2f9bf6a10794b03b6cb7556c562ef9f08cb9bec4:/sdk/go/arvados/config.go

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 2fda7febe5..6e59828a3c 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -68,6 +68,16 @@ type WebDAVCacheConfig struct {
 	MaxSessions          int
 }
 
+type UploadDownloadPermission struct {
+	Upload   bool
+	Download bool
+}
+
+type UploadDownloadRolePermissions struct {
+	User  UploadDownloadPermission
+	Admin UploadDownloadPermission
+}
+
 type Cluster struct {
 	ClusterID       string `json:"-"`
 	ManagementToken string
@@ -130,6 +140,10 @@ type Cluster struct {
 		BalanceTimeout           Duration
 
 		WebDAVCache WebDAVCacheConfig
+
+		KeepproxyPermission UploadDownloadRolePermissions
+		WebDAVPermission    UploadDownloadRolePermissions
+		WebDAVLogEvents     bool
 	}
 	Git struct {
 		GitCommand   string
@@ -167,6 +181,8 @@ type Cluster struct {
 			EmailClaim                      string
 			EmailVerifiedClaim              string
 			UsernameClaim                   string
+			AcceptAccessToken               bool
+			AcceptAccessTokenScope          string
 			AuthenticationRequestParameters map[string]string
 		}
 		PAM struct {
@@ -174,11 +190,6 @@ type Cluster struct {
 			Service            string
 			DefaultEmailDomain string
 		}
-		SSO struct {
-			Enable            bool
-			ProviderAppID     string
-			ProviderAppSecret string
-		}
 		Test struct {
 			Enable bool
 			Users  map[string]TestUser
@@ -187,6 +198,7 @@ type Cluster struct {
 		RemoteTokenRefresh Duration
 		TokenLifetime      Duration
 		TrustedClients     map[string]struct{}
+		IssueTrustedTokens bool
 	}
 	Mail struct {
 		MailchimpAPIKey                string
@@ -266,8 +278,6 @@ type Cluster struct {
 		SSHHelpHostSuffix      string
 		IdleTimeout            Duration
 	}
-
-	ForceLegacyAPI14 bool
 }
 
 type Volume struct {
@@ -281,8 +291,8 @@ type Volume struct {
 
 type S3VolumeDriverParameters struct {
 	IAMRole            string
-	AccessKey          string
-	SecretKey          string
+	AccessKeyID        string
+	SecretAccessKey    string
 	Endpoint           string
 	Region             string
 	Bucket             string
@@ -326,7 +336,6 @@ type Services struct {
 	Keepproxy      Service
 	Keepstore      Service
 	RailsAPI       Service
-	SSO            Service
 	WebDAVDownload Service
 	WebDAV         Service
 	WebShell       Service
@@ -416,6 +425,7 @@ type ContainersConfig struct {
 	StaleLockTimeout            Duration
 	SupportedDockerImageFormats StringSet
 	UsePreemptibleInstances     bool
+	RuntimeEngine               string
 
 	JobsAPI struct {
 		Enable         string