X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4659c363b048dec4b8893ed45ea817b18e0bcd1a..f03578e82ee77ded83387b27b275fa442933203b:/sdk/go/arvados/config.go?ds=sidebyside diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 79e47ba5d1..69de3f05e2 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -23,7 +23,8 @@ var DefaultConfigFile = func() string { }() type Config struct { - Clusters map[string]Cluster + Clusters map[string]Cluster + AutoReloadConfig bool } // GetConfig returns the current system config, loading it from @@ -66,6 +67,7 @@ type WebDAVCacheConfig struct { MaxPermissionEntries int MaxUUIDEntries int } + type Cluster struct { ClusterID string `json:"-"` ManagementToken string @@ -136,6 +138,9 @@ type Cluster struct { GoogleClientID string GoogleClientSecret string GoogleAlternateEmailAddresses bool + PAM bool + PAMService string + PAMDefaultEmailDomain string ProviderAppID string ProviderAppSecret string LoginCluster string @@ -298,6 +303,10 @@ func (su *URL) UnmarshalText(text []byte) error { u, err := url.Parse(string(text)) if err == nil { *su = URL(*u) + if su.Path == "" && su.Host != "" { + // http://example really means http://example/ + su.Path = "/" + } } return err }