From: Tom Clegg <tom@curii.com>
Date: Fri, 7 May 2021 14:18:59 +0000 (-0400)
Subject: 17590: Fix spelling of S3 driver name.
X-Git-Tag: 2.2.0~37^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1acd7bc736df6bc2b3030f1553bb4492a749d10a

17590: Fix spelling of S3 driver name.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 42388abfdd..d7a67e7721 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1189,7 +1189,7 @@ Clusters:
         StorageClasses:
           default: true
           SAMPLE: true
-        Driver: s3
+        Driver: S3
         DriverParameters:
           # for s3 driver -- see
           # https://doc.arvados.org/install/configure-s3-object-storage.html
diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 8306f814f0..aac981da44 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -123,7 +123,7 @@ func (ldr *Loader) applyDeprecatedConfig(cfg *arvados.Config) error {
 func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) error {
 	for clusterID, cluster := range cfg.Clusters {
 		for volID, vol := range cluster.Volumes {
-			if vol.Driver == "s3" {
+			if vol.Driver == "S3" {
 				var params struct {
 					AccessKey       string `json:",omitempty"`
 					SecretKey       string `json:",omitempty"`
diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 50cc16b7d3..383f03d05f 100644
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -53,7 +53,7 @@ Clusters:
  z1111:
   Volumes:
    z1111-nyw5e-aaaaaaaaaaaaaaa:
-    Driver: s3
+    Driver: S3
     DriverParameters:
      AccessKey: exampleaccesskey
      SecretKey: examplesecretkey
@@ -64,7 +64,7 @@ Clusters:
  z1111:
   Volumes:
    z1111-nyw5e-aaaaaaaaaaaaaaa:
-    Driver: s3
+    Driver: S3
     DriverParameters:
      AccessKeyID: exampleaccesskey
      SecretAccessKey: examplesecretkey
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index d413a8006b..89c1d5e1ef 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1195,7 +1195,7 @@ Clusters:
         StorageClasses:
           default: true
           SAMPLE: true
-        Driver: s3
+        Driver: S3
         DriverParameters:
           # for s3 driver -- see
           # https://doc.arvados.org/install/configure-s3-object-storage.html