X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7407f41105f8000bb3908d41a31daaf3a30d9440..6de69ae50be42cd1f68d51247b09b995079c0ef4:/lib/config/deprecated.go

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 1be7208ee3..0db3de7fc9 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -5,6 +5,7 @@
 package config
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/url"
@@ -43,7 +44,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"`
@@ -103,19 +103,50 @@ func (ldr *Loader) applyDeprecatedConfig(cfg *arvados.Config) error {
 			*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
+		cfg.Clusters[id] = cluster
+	}
+	return nil
+}
+
+func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) error {
+	for clusterID, cluster := range cfg.Clusters {
+		for volID, vol := range cluster.Volumes {
+			if vol.Driver == "S3" {
+				var params struct {
+					AccessKey       string `json:",omitempty"`
+					SecretKey       string `json:",omitempty"`
+					AccessKeyID     string
+					SecretAccessKey string
+				}
+				err := json.Unmarshal(vol.DriverParameters, &params)
+				if err != nil {
+					return fmt.Errorf("error loading %s.Volumes.%s.DriverParameters: %w", clusterID, volID, err)
+				}
+				if params.AccessKey != "" || params.SecretKey != "" {
+					if params.AccessKeyID != "" || params.SecretAccessKey != "" {
+						return fmt.Errorf("cannot use old keys (AccessKey/SecretKey) and new keys (AccessKeyID/SecretAccessKey) at the same time in %s.Volumes.%s.DriverParameters -- you must remove the old config keys", clusterID, volID)
+					}
+					var allparams map[string]interface{}
+					err = json.Unmarshal(vol.DriverParameters, &allparams)
+					if err != nil {
+						return fmt.Errorf("error loading %s.Volumes.%s.DriverParameters: %w", clusterID, volID, err)
+					}
+					for k := range allparams {
+						if lk := strings.ToLower(k); lk == "accesskey" || lk == "secretkey" {
+							delete(allparams, k)
+						}
+					}
+					ldr.Logger.Warnf("using your old config keys %s.Volumes.%s.DriverParameters.AccessKey/SecretKey -- but you should rename them to AccessKeyID/SecretAccessKey", clusterID, volID)
+					allparams["AccessKeyID"] = params.AccessKey
+					allparams["SecretAccessKey"] = params.SecretKey
+					vol.DriverParameters, err = json.Marshal(allparams)
+					if err != nil {
+						return err
+					}
+					cluster.Volumes[volID] = vol
+				}
 			}
 		}
-		if dst, n := &cluster.Login.SSO.ProviderAppSecret, dcluster.Login.ProviderAppSecret; n != nil && *n != *dst {
-			*dst = *n
-		}
-
-		cfg.Clusters[id] = cluster
 	}
 	return nil
 }
@@ -417,7 +448,6 @@ type oldKeepWebConfig struct {
 		UUIDTTL              *arvados.Duration
 		MaxCollectionEntries *int
 		MaxCollectionBytes   *int64
-		MaxPermissionEntries *int
 		MaxUUIDEntries       *int
 	}
 
@@ -464,20 +494,8 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	if oc.Cache.TTL != nil {
 		cluster.Collections.WebDAVCache.TTL = *oc.Cache.TTL
 	}
-	if oc.Cache.UUIDTTL != nil {
-		cluster.Collections.WebDAVCache.UUIDTTL = *oc.Cache.UUIDTTL
-	}
-	if oc.Cache.MaxCollectionEntries != nil {
-		cluster.Collections.WebDAVCache.MaxCollectionEntries = *oc.Cache.MaxCollectionEntries
-	}
 	if oc.Cache.MaxCollectionBytes != nil {
-		cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
-	}
-	if oc.Cache.MaxPermissionEntries != nil {
-		cluster.Collections.WebDAVCache.MaxPermissionEntries = *oc.Cache.MaxPermissionEntries
-	}
-	if oc.Cache.MaxUUIDEntries != nil {
-		cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
+		cluster.Collections.WebDAVCache.MaxCollectionBytes = arvados.ByteSize(*oc.Cache.MaxCollectionBytes)
 	}
 	if oc.AnonymousTokens != nil {
 		if len(*oc.AnonymousTokens) > 0 {
@@ -492,56 +510,6 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	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)
-
-	if oc.Listen != nil {
-		cluster.Services.GitHTTP.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
-	}
-	if oc.ManagementToken != nil {
-		cluster.ManagementToken = *oc.ManagementToken
-	}
-	if oc.GitCommand != nil {
-		cluster.Git.GitCommand = *oc.GitCommand
-	}
-	if oc.GitoliteHome != nil {
-		cluster.Git.GitoliteHome = *oc.GitoliteHome
-	}
-	if oc.RepoRoot != nil {
-		cluster.Git.Repositories = *oc.RepoRoot
-	}
-
-	cfg.Clusters[cluster.ClusterID] = *cluster
-	return nil
-}
-
 const defaultKeepBalanceConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
 
 type oldKeepBalanceConfig struct {