X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a7a482db3954fa6470be74f0e00f6e1e105e0b6c..4b4431eb7fbf575789be9c5798b6a3bf43a07396:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 0689efa440..0552b66adb 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -23,6 +23,13 @@ type deprRequestLimits struct {
 type deprCluster struct {
 	RequestLimits deprRequestLimits
 	NodeProfiles  map[string]nodeProfile
+	Login         struct {
+		GoogleClientID                *string
+		GoogleClientSecret            *string
+		GoogleAlternateEmailAddresses *bool
+		ProviderAppID                 *string
+		ProviderAppSecret             *string
+	}
 }
 
 type deprecatedConfig struct {
@@ -36,7 +43,6 @@ type nodeProfile struct {
 	Keepproxy     systemServiceInstance `json:"keepproxy"`
 	Keepstore     systemServiceInstance `json:"keepstore"`
 	Keepweb       systemServiceInstance `json:"keep-web"`
-	Nodemanager   systemServiceInstance `json:"arvados-node-manager"`
 	DispatchCloud systemServiceInstance `json:"arvados-dispatch-cloud"`
 	RailsAPI      systemServiceInstance `json:"arvados-api-server"`
 	Websocket     systemServiceInstance `json:"arvados-ws"`
@@ -80,6 +86,34 @@ func (ldr *Loader) applyDeprecatedConfig(cfg *arvados.Config) error {
 		if dst, n := &cluster.API.MaxRequestAmplification, dcluster.RequestLimits.MultiClusterRequestConcurrency; n != nil && *n != *dst {
 			*dst = *n
 		}
+
+		// Google* moved to Google.*
+		if dst, n := &cluster.Login.Google.ClientID, dcluster.Login.GoogleClientID; n != nil && *n != *dst {
+			*dst = *n
+			if *n != "" {
+				// In old config, non-empty ClientID meant enable
+				cluster.Login.Google.Enable = true
+			}
+		}
+		if dst, n := &cluster.Login.Google.ClientSecret, dcluster.Login.GoogleClientSecret; n != nil && *n != *dst {
+			*dst = *n
+		}
+		if dst, n := &cluster.Login.Google.AlternateEmailAddresses, dcluster.Login.GoogleAlternateEmailAddresses; n != nil && *n != *dst {
+			*dst = *n
+		}
+
+		// Provider* moved to SSO.Provider*
+		if dst, n := &cluster.Login.SSO.ProviderAppID, dcluster.Login.ProviderAppID; n != nil && *n != *dst {
+			*dst = *n
+			if *n != "" {
+				// In old config, non-empty ID meant enable
+				cluster.Login.SSO.Enable = true
+			}
+		}
+		if dst, n := &cluster.Login.SSO.ProviderAppSecret, dcluster.Login.ProviderAppSecret; n != nil && *n != *dst {
+			*dst = *n
+		}
+
 		cfg.Clusters[id] = cluster
 	}
 	return nil
@@ -100,7 +134,7 @@ func applyDeprecatedNodeProfile(hostname string, ssi systemServiceInstance, svc
 	if strings.HasPrefix(host, ":") {
 		host = hostname + host
 	}
-	svc.InternalURLs[arvados.URL{Scheme: scheme, Host: host}] = arvados.ServiceInstance{}
+	svc.InternalURLs[arvados.URL{Scheme: scheme, Host: host, Path: "/"}] = arvados.ServiceInstance{}
 }
 
 func (ldr *Loader) loadOldConfigHelper(component, path string, target interface{}) error {
@@ -153,6 +187,7 @@ func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) {
 	}
 	if client.APIHost != "" {
 		cluster.Services.Controller.ExternalURL.Host = client.APIHost
+		cluster.Services.Controller.ExternalURL.Path = "/"
 	}
 	if client.Scheme != "" {
 		cluster.Services.Controller.ExternalURL.Scheme = client.Scheme
@@ -268,7 +303,7 @@ func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error {
 		cluster.PostgreSQL.ConnectionPool = *oc.PostgresPool
 	}
 	if oc.Listen != nil {
-		cluster.Services.Websocket.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
+		cluster.Services.Websocket.InternalURLs[arvados.URL{Host: *oc.Listen, Path: "/"}] = arvados.ServiceInstance{}
 	}
 	if oc.LogLevel != nil {
 		cluster.SystemLogs.LogLevel = *oc.LogLevel
@@ -327,7 +362,7 @@ func (ldr *Loader) loadOldKeepproxyConfig(cfg *arvados.Config) error {
 	loadOldClientConfig(cluster, oc.Client)
 
 	if oc.Listen != nil {
-		cluster.Services.Keepproxy.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
+		cluster.Services.Keepproxy.InternalURLs[arvados.URL{Host: *oc.Listen, Path: "/"}] = arvados.ServiceInstance{}
 	}
 	if oc.DefaultReplicas != nil {
 		cluster.Collections.DefaultReplication = *oc.DefaultReplicas
@@ -413,11 +448,11 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	loadOldClientConfig(cluster, oc.Client)
 
 	if oc.Listen != nil {
-		cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
-		cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
+		cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: *oc.Listen, Path: "/"}] = arvados.ServiceInstance{}
+		cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: *oc.Listen, Path: "/"}] = arvados.ServiceInstance{}
 	}
 	if oc.AttachmentOnlyHost != nil {
-		cluster.Services.WebDAVDownload.ExternalURL = arvados.URL{Host: *oc.AttachmentOnlyHost}
+		cluster.Services.WebDAVDownload.ExternalURL = arvados.URL{Host: *oc.AttachmentOnlyHost, Path: "/"}
 	}
 	if oc.ManagementToken != nil {
 		cluster.ManagementToken = *oc.ManagementToken