14717: Remove LegacyComponentConfig behavior

[arvados.git] / lib / config / deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 8f3f3d7edd4d8219230cd1f348370190d07a0b07..3e1ec7278bcf4662dafbddb0314a8f56432682ac 100644 (file)
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -130,7 +130,7 @@ func (ldr *Loader) loadOldConfigHelper(component, path string, target interface{
 func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
        var oc oldKeepstoreConfig
        err := ldr.loadOldConfigHelper("keepstore", ldr.KeepstorePath, &oc)
-       if os.IsNotExist(err) && ldr.KeepstorePath == defaultKeepstoreConfigPath {
+       if os.IsNotExist(err) && (ldr.KeepstorePath == defaultKeepstoreConfigPath) {
                return nil
        } else if err != nil {
                return err
@@ -178,11 +178,29 @@ type oldCrunchDispatchSlurmConfig struct {
 
 const defaultCrunchDispatchSlurmConfigPath = "/etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml"
 
+func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) {
+       if client == nil {
+               return
+       }
+       if client.APIHost != "" {
+               cluster.Services.Controller.ExternalURL.Host = client.APIHost
+       }
+       if client.Scheme != "" {
+               cluster.Services.Controller.ExternalURL.Scheme = client.Scheme
+       } else {
+               cluster.Services.Controller.ExternalURL.Scheme = "https"
+       }
+       if client.AuthToken != "" {
+               cluster.SystemRootToken = client.AuthToken
+       }
+       cluster.TLS.Insecure = client.Insecure
+}
+
 // update config using values from an crunch-dispatch-slurm config file.
 func (ldr *Loader) loadOldCrunchDispatchSlurmConfig(cfg *arvados.Config) error {
        var oc oldCrunchDispatchSlurmConfig
        err := ldr.loadOldConfigHelper("crunch-dispatch-slurm", ldr.CrunchDispatchSlurmPath, &oc)
-       if os.IsNotExist(err) && ldr.CrunchDispatchSlurmPath == defaultCrunchDispatchSlurmConfigPath {
+       if os.IsNotExist(err) && (ldr.CrunchDispatchSlurmPath == defaultCrunchDispatchSlurmConfigPath) {
                return nil
        } else if err != nil {
                return err
@@ -193,18 +211,7 @@ func (ldr *Loader) loadOldCrunchDispatchSlurmConfig(cfg *arvados.Config) error {
                return err
        }
 
-       if oc.Client != nil {
-               u := arvados.URL{}
-               u.Host = oc.Client.APIHost
-               if oc.Client.Scheme != "" {
-                       u.Scheme = oc.Client.Scheme
-               } else {
-                       u.Scheme = "https"
-               }
-               cluster.Services.Controller.ExternalURL = u
-               cluster.SystemRootToken = oc.Client.AuthToken
-               cluster.TLS.Insecure = oc.Client.Insecure
-       }
+       loadOldClientConfig(cluster, oc.Client)
 
        if oc.SbatchArguments != nil {
                cluster.Containers.SLURM.SbatchArgumentsList = *oc.SbatchArguments
@@ -236,3 +243,69 @@ func (ldr *Loader) loadOldCrunchDispatchSlurmConfig(cfg *arvados.Config) error {
        cfg.Clusters[cluster.ClusterID] = *cluster
        return nil
 }
+
+type oldWsConfig struct {
+       Client       *arvados.Client
+       Postgres     *arvados.PostgreSQLConnection
+       PostgresPool *int
+       Listen       *string
+       LogLevel     *string
+       LogFormat    *string
+
+       PingTimeout      *arvados.Duration
+       ClientEventQueue *int
+       ServerEventQueue *int
+
+       ManagementToken *string
+}
+
+const defaultWebsocketConfigPath = "/etc/arvados/ws/ws.yml"
+
+// update config using values from an crunch-dispatch-slurm config file.
+func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error {
+       var oc oldWsConfig
+       err := ldr.loadOldConfigHelper("arvados-ws", ldr.WebsocketPath, &oc)
+       if os.IsNotExist(err) && ldr.WebsocketPath == defaultWebsocketConfigPath {
+               return nil
+       } else if err != nil {
+               return err
+       }
+
+       cluster, err := cfg.GetCluster("")
+       if err != nil {
+               return err
+       }
+
+       loadOldClientConfig(cluster, oc.Client)
+
+       if oc.Postgres != nil {
+               cluster.PostgreSQL.Connection = *oc.Postgres
+       }
+       if oc.PostgresPool != nil {
+               cluster.PostgreSQL.ConnectionPool = *oc.PostgresPool
+       }
+       if oc.Listen != nil {
+               cluster.Services.Websocket.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
+       }
+       if oc.LogLevel != nil {
+               cluster.SystemLogs.LogLevel = *oc.LogLevel
+       }
+       if oc.LogFormat != nil {
+               cluster.SystemLogs.Format = *oc.LogFormat
+       }
+       if oc.PingTimeout != nil {
+               cluster.API.SendTimeout = *oc.PingTimeout
+       }
+       if oc.ClientEventQueue != nil {
+               cluster.API.WebsocketClientEventQueue = *oc.ClientEventQueue
+       }
+       if oc.ServerEventQueue != nil {
+               cluster.API.WebsocketServerEventQueue = *oc.ServerEventQueue
+       }
+       if oc.ManagementToken != nil {
+               cluster.ManagementToken = *oc.ManagementToken
+       }
+
+       cfg.Clusters[cluster.ClusterID] = *cluster
+       return nil
+}