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 42388abfdd6a803c5c948281e497ba7c058bb9f4..d7a67e772181bee0562446792f7e9417e40bbd5a 100644 (file)
--- 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 8306f814f0cc0d61d8858c776377e9507dd49845..aac981da44fa2c9ec0fef75a8348dd0a3e21da8c 100644 (file)
--- 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 50cc16b7d38ed917cec6dd101e0523fbb03492aa..383f03d05f7132796f84c947aa353a3b5de614b6 100644 (file)
--- 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 d413a8006b185c113b078a6f61507ec287a8a080..89c1d5e1ef1b5bf88781dfcf363d0f4eed213942 100644 (file)
--- 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