X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/590c491796ece16caa4251dd443412f323492fea..9c656c55fe63a22b075223fe7f295e7e21e18b8c:/lib/config/deprecated.go diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index 7ae69708eb..9eb8c40c18 100644 --- a/lib/config/deprecated.go +++ b/lib/config/deprecated.go @@ -7,7 +7,6 @@ package config import ( "fmt" "io/ioutil" - "net/url" "os" "strings" @@ -198,18 +197,14 @@ func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) { cluster.SystemRootToken = client.AuthToken } cluster.TLS.Insecure = client.Insecure - for _, r := range client.KeepServiceURIs { - if cluster.Containers.SLURM.KeepServices == nil { - cluster.Containers.SLURM.KeepServices = make(map[string]arvados.Service) - } - if cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"].InternalURLs == nil { - cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"] = arvados.Service{InternalURLs: make(map[arvados.URL]arvados.ServiceInstance)} - } - p, err := url.Parse(r) - if err == nil { - cluster.Containers.SLURM.KeepServices["00000-bi6l4-000000000000000"].InternalURLs[arvados.URL(*p)] = struct{}{} + ks := "" + for i, u := range client.KeepServiceURIs { + if i > 0 { + ks += " " } + ks += u } + cluster.Containers.SLURM.SbatchEnvironmentVariables = map[string]string{"ARVADOS_KEEP_SERVICES": ks} } // update config using values from an crunch-dispatch-slurm config file. @@ -331,3 +326,186 @@ func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error { cfg.Clusters[cluster.ClusterID] = *cluster return nil } + +type oldKeepProxyConfig struct { + Client *arvados.Client + Listen *string + DisableGet *bool + DisablePut *bool + DefaultReplicas *int + Timeout *arvados.Duration + PIDFile *string + Debug *bool + ManagementToken *string +} + +const defaultKeepproxyConfigPath = "/etc/arvados/keepproxy/keepproxy.yml" + +func (ldr *Loader) loadOldKeepproxyConfig(cfg *arvados.Config) error { + if ldr.KeepproxyPath == "" { + return nil + } + var oc oldKeepProxyConfig + err := ldr.loadOldConfigHelper("keepproxy", ldr.KeepproxyPath, &oc) + if os.IsNotExist(err) && ldr.KeepproxyPath == defaultKeepproxyConfigPath { + return nil + } else if err != nil { + return err + } + + cluster, err := cfg.GetCluster("") + if err != nil { + return err + } + + loadOldClientConfig(cluster, oc.Client) + + if oc.Listen != nil { + cluster.Services.Keepproxy.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{} + } + if oc.DefaultReplicas != nil { + cluster.Collections.DefaultReplication = *oc.DefaultReplicas + } + if oc.Timeout != nil { + cluster.API.KeepServiceRequestTimeout = *oc.Timeout + } + if oc.Debug != nil { + if *oc.Debug && cluster.SystemLogs.LogLevel != "debug" { + cluster.SystemLogs.LogLevel = "debug" + } else if !*oc.Debug && cluster.SystemLogs.LogLevel != "info" { + cluster.SystemLogs.LogLevel = "info" + } + } + if oc.ManagementToken != nil { + cluster.ManagementToken = *oc.ManagementToken + } + + // The following legacy options are no longer supported. If they are set to + // true or PIDFile has a value, error out and notify the user + unsupportedEntry := func(cfgEntry string) error { + return fmt.Errorf("the keepproxy %s configuration option is no longer supported, please remove it from your configuration file", cfgEntry) + } + if oc.DisableGet != nil && *oc.DisableGet { + return unsupportedEntry("DisableGet") + } + if oc.DisablePut != nil && *oc.DisablePut { + return unsupportedEntry("DisablePut") + } + if oc.PIDFile != nil && *oc.PIDFile != "" { + return unsupportedEntry("PIDFile") + } + + cfg.Clusters[cluster.ClusterID] = *cluster + return nil +} + +const defaultKeepWebConfigPath = "/etc/arvados/keep-web/keep-web.yml" + +type oldKeepWebConfig struct { + Client *arvados.Client + + Listen string + + AnonymousTokens []string + AttachmentOnlyHost string + TrustAllContent bool + + Cache struct { + TTL arvados.Duration + UUIDTTL arvados.Duration + MaxCollectionEntries int + MaxCollectionBytes int64 + MaxPermissionEntries int + MaxUUIDEntries int + } + + // Hack to support old command line flag, which is a bool + // meaning "get actual token from environment". + deprecatedAllowAnonymous bool + + // Authorization token to be included in all health check requests. + ManagementToken string +} + +func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error { + if ldr.KeepWebPath == "" { + return nil + } + var oc oldKeepWebConfig + err := ldr.loadOldConfigHelper("keep-web", ldr.KeepWebPath, &oc) + if os.IsNotExist(err) && ldr.KeepWebPath == defaultKeepWebConfigPath { + return nil + } else if err != nil { + return err + } + + cluster, err := cfg.GetCluster("") + if err != nil { + return err + } + + loadOldClientConfig(cluster, oc.Client) + + cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{} + cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{} + cluster.Services.WebDAVDownload.ExternalURL = arvados.URL{Host: oc.AttachmentOnlyHost} + cluster.TLS.Insecure = oc.Client.Insecure + cluster.ManagementToken = oc.ManagementToken + cluster.Collections.TrustAllContent = oc.TrustAllContent + cluster.Collections.WebDAVCache.TTL = oc.Cache.TTL + cluster.Collections.WebDAVCache.UUIDTTL = oc.Cache.UUIDTTL + cluster.Collections.WebDAVCache.MaxCollectionEntries = oc.Cache.MaxCollectionEntries + cluster.Collections.WebDAVCache.MaxCollectionBytes = oc.Cache.MaxCollectionBytes + cluster.Collections.WebDAVCache.MaxPermissionEntries = oc.Cache.MaxPermissionEntries + cluster.Collections.WebDAVCache.MaxUUIDEntries = oc.Cache.MaxUUIDEntries + if len(oc.AnonymousTokens) > 0 { + cluster.Users.AnonymousUserToken = oc.AnonymousTokens[0] + if len(oc.AnonymousTokens) > 1 { + ldr.Logger.Warn("More than 1 anonymous tokens configured, using only the first and discarding the rest.") + } + } + + cfg.Clusters[cluster.ClusterID] = *cluster + return nil +} + +const defaultGitHttpdConfigPath = "/etc/arvados/git-httpd/git-httpd.yml" + +type oldGitHttpdConfig struct { + Client *arvados.Client + Listen string + GitCommand string + GitoliteHome string + RepoRoot string + ManagementToken string +} + +func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error { + if ldr.GitHttpdPath == "" { + return nil + } + var oc oldGitHttpdConfig + err := ldr.loadOldConfigHelper("arv-git-httpd", ldr.GitHttpdPath, &oc) + if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath { + return nil + } else if err != nil { + return err + } + + cluster, err := cfg.GetCluster("") + if err != nil { + return err + } + + loadOldClientConfig(cluster, oc.Client) + + cluster.Services.GitHTTP.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{} + cluster.TLS.Insecure = oc.Client.Insecure + cluster.ManagementToken = oc.ManagementToken + cluster.Git.GitCommand = oc.GitCommand + cluster.Git.GitoliteHome = oc.GitoliteHome + cluster.Git.Repositories = oc.RepoRoot + + cfg.Clusters[cluster.ClusterID] = *cluster + return nil +}