X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1b6b38c5d2e181f357cab883b63917cb5eaa778c..bda9093be4d24d45a6fff29148fbb5438e283897:/lib/config/deprecated_keepstore.go

diff --git a/lib/config/deprecated_keepstore.go b/lib/config/deprecated_keepstore.go
index 04e937cc5c..d9f4815fcf 100644
--- a/lib/config/deprecated_keepstore.go
+++ b/lib/config/deprecated_keepstore.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"github.com/sirupsen/logrus"
 )
 
@@ -118,7 +118,7 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
 		return err
 	}
 
-	myURL := arvados.URL{Scheme: "http"}
+	myURL := arvados.URL{Scheme: "http", Path: "/"}
 	if oc.TLSCertificateFile != nil && oc.TLSKeyFile != nil {
 		myURL.Scheme = "https"
 	}
@@ -137,7 +137,7 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
 		cluster.TLS.Key = "file://" + *v
 	}
 	if v := oc.Listen; v != nil {
-		if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v}]; ok {
+		if _, ok := cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: myURL.Scheme, Host: *v, Path: "/"}]; ok {
 			// already listed
 			myURL.Host = *v
 		} else if len(*v) > 1 && (*v)[0] == ':' {
@@ -227,6 +227,10 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
 		}
 	}
 
+	if err := ldr.checkPendingKeepstoreMigrations(cluster); err != nil {
+		return err
+	}
+
 	cfg.Clusters[cluster.ClusterID] = *cluster
 	return nil
 }
@@ -320,8 +324,8 @@ func (ldr *Loader) translateOldKeepstoreVolume(oldvol oldKeepstoreVolume) (arvad
 			StorageClasses: array2boolmap(oldvol.StorageClasses),
 		}
 		params = arvados.S3VolumeDriverParameters{
-			AccessKey:          string(bytes.TrimSpace(accesskeydata)),
-			SecretKey:          string(bytes.TrimSpace(secretkeydata)),
+			AccessKeyID:        string(bytes.TrimSpace(accesskeydata)),
+			SecretAccessKey:    string(bytes.TrimSpace(secretkeydata)),
 			Endpoint:           oldvol.Endpoint,
 			Region:             oldvol.Region,
 			Bucket:             oldvol.Bucket,
@@ -533,6 +537,7 @@ func keepServiceURL(ks arvados.KeepService) arvados.URL {
 	url := arvados.URL{
 		Scheme: "http",
 		Host:   net.JoinHostPort(ks.ServiceHost, strconv.Itoa(ks.ServicePort)),
+		Path:   "/",
 	}
 	if ks.ServiceSSLFlag {
 		url.Scheme = "https"
@@ -580,7 +585,7 @@ func keepServiceIsMe(ks arvados.KeepService, hostname string, listen string) boo
 // been warned about in loadOldKeepstoreConfig() -- i.e., unmigrated
 // keepstore hosts other than the present host, and obsolete content
 // in the keep_services table.
-func (ldr *Loader) checkPendingKeepstoreMigrations(cluster arvados.Cluster) error {
+func (ldr *Loader) checkPendingKeepstoreMigrations(cluster *arvados.Cluster) error {
 	if cluster.Services.Controller.ExternalURL.String() == "" {
 		ldr.Logger.Debug("Services.Controller.ExternalURL not configured -- skipping check for pending keepstore config migrations")
 		return nil
@@ -589,7 +594,7 @@ func (ldr *Loader) checkPendingKeepstoreMigrations(cluster arvados.Cluster) erro
 		ldr.Logger.Debug("(Loader).SkipAPICalls == true -- skipping check for pending keepstore config migrations")
 		return nil
 	}
-	client, err := arvados.NewClientFromConfig(&cluster)
+	client, err := arvados.NewClientFromConfig(cluster)
 	if err != nil {
 		return err
 	}