Fix Sql->SQL

2026-03-07 05:19:19 -06:00 · 2021-06-29 14:13:51 +02:00
parent 0392dfd18c
commit f7fdda3ee1
8 changed files with 49 additions and 49 deletions
--- a/storage/pkg/command/drivers.go
+++ b/storage/pkg/command/drivers.go
@@ -86,16 +86,16 @@ func drivers(cfg *config.Config) map[string]interface{} {
 			"userprovidersvc": cfg.Reva.Users.Endpoint,
 		},
 		"owncloudsql": map[string]interface{}{
-			"datadirectory":   cfg.Reva.Storages.OwnCloudSql.Root,
-			"upload_info_dir": cfg.Reva.Storages.OwnCloudSql.UploadInfoDir,
-			"sharedirectory":  cfg.Reva.Storages.OwnCloudSql.ShareFolder,
-			"user_layout":     cfg.Reva.Storages.OwnCloudSql.UserLayout,
-			"enable_home":     cfg.Reva.Storages.OwnCloudSql.EnableHome,
-			"dbusername":      cfg.Reva.Storages.OwnCloudSql.DBUsername,
-			"dbpassword":      cfg.Reva.Storages.OwnCloudSql.DBPassword,
-			"dbhost":          cfg.Reva.Storages.OwnCloudSql.DBHost,
-			"dbport":          cfg.Reva.Storages.OwnCloudSql.DBPort,
-			"dbname":          cfg.Reva.Storages.OwnCloudSql.DBName,
+			"datadirectory":   cfg.Reva.Storages.OwnCloudSQL.Root,
+			"upload_info_dir": cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir,
+			"sharedirectory":  cfg.Reva.Storages.OwnCloudSQL.ShareFolder,
+			"user_layout":     cfg.Reva.Storages.OwnCloudSQL.UserLayout,
+			"enable_home":     cfg.Reva.Storages.OwnCloudSQL.EnableHome,
+			"dbusername":      cfg.Reva.Storages.OwnCloudSQL.DBUsername,
+			"dbpassword":      cfg.Reva.Storages.OwnCloudSQL.DBPassword,
+			"dbhost":          cfg.Reva.Storages.OwnCloudSQL.DBHost,
+			"dbport":          cfg.Reva.Storages.OwnCloudSQL.DBPort,
+			"dbname":          cfg.Reva.Storages.OwnCloudSQL.DBName,
 			"userprovidersvc": cfg.Reva.Users.Endpoint,
 		},
 		"ocis": map[string]interface{}{
--- a/storage/pkg/command/storagehome.go
+++ b/storage/pkg/command/storagehome.go
@@ -49,7 +49,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 				cfg.Reva.Storages.EOS.EnableHome = true
 				cfg.Reva.Storages.Local.EnableHome = true
 				cfg.Reva.Storages.OwnCloud.EnableHome = true
-				cfg.Reva.Storages.OwnCloudSql.EnableHome = true
+				cfg.Reva.Storages.OwnCloudSQL.EnableHome = true
 				cfg.Reva.Storages.S3.EnableHome = true
 				cfg.Reva.Storages.S3NG.EnableHome = true
 			}
--- a/storage/pkg/command/storageusers.go
+++ b/storage/pkg/command/storageusers.go
@@ -49,7 +49,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 				cfg.Reva.Storages.EOS.EnableHome = true
 				cfg.Reva.Storages.Local.EnableHome = true
 				cfg.Reva.Storages.OwnCloud.EnableHome = true
-				cfg.Reva.Storages.OwnCloudSql.EnableHome = true
+				cfg.Reva.Storages.OwnCloudSQL.EnableHome = true
 				cfg.Reva.Storages.S3.EnableHome = true
 				cfg.Reva.Storages.S3NG.EnableHome = true
 			}
--- a/storage/pkg/config/config.go
+++ b/storage/pkg/config/config.go
@@ -159,15 +159,15 @@ type PublicStorage struct {

 // StorageConfig combines all available storage driver configuration parts.
 type StorageConfig struct {
-	Home     DriverCommon
-	EOS      DriverEOS
-	Local    DriverCommon
-	OwnCloud DriverOwnCloud
-	OwnCloudSql DriverOwnCloudSql
-	S3       DriverS3
-	S3NG     DriverS3NG
-	Common   DriverCommon
-	OCIS     DriverOCIS
+	Home        DriverCommon
+	EOS         DriverEOS
+	Local       DriverCommon
+	OwnCloud    DriverOwnCloud
+	OwnCloudSQL DriverOwnCloudSQL
+	S3          DriverS3
+	S3NG        DriverS3NG
+	Common      DriverCommon
+	OCIS        DriverOCIS
 	// TODO checksums ... figure out what that is supposed to do
 }

@@ -259,8 +259,8 @@ type DriverOwnCloud struct {
 	Scan          bool
 }

-// DriverOwnCloudSql defines the available ownCloudSql storage driver configuration.
-type DriverOwnCloudSql struct {
+// DriverOwnCloudSQL defines the available ownCloudSQL storage driver configuration.
+type DriverOwnCloudSQL struct {
 	DriverCommon

 	UploadInfoDir string
--- a/storage/pkg/flagset/driverowncloudsql.go
+++ b/storage/pkg/flagset/driverowncloudsql.go
@@ -6,78 +6,78 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/config"
 )

-// DriverOwnCloudSqlWithConfig applies cfg to the root flagset
-func DriverOwnCloudSqlWithConfig(cfg *config.Config) []cli.Flag {
+// DriverOwnCloudSQLWithConfig applies cfg to the root flagset
+func DriverOwnCloudSQLWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-datadir",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.Root, "/var/tmp/ocis/storage/owncloud"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.Root, "/var/tmp/ocis/storage/owncloud"),
 			Usage:       "the path to the owncloudsql data directory",
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DATADIR"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.Root,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.Root,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-uploadinfo-dir",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.UploadInfoDir, "/var/tmp/ocis/storage/uploadinfo"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir, "/var/tmp/ocis/storage/uploadinfo"),
 			Usage:       "the path to the tus upload info directory",
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.UploadInfoDir,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.UploadInfoDir,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-share-folder",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.ShareFolder, "/Shares"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.ShareFolder, "/Shares"),
 			Usage:       "name of the shares folder",
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.ShareFolder,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.ShareFolder,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-owncloudsql-enable-home",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSql.EnableHome, false),
+			Value:       flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSQL.EnableHome, false),
 			Usage:       "enable the creation of home storages",
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_ENABLE_HOME"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.EnableHome,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.EnableHome,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-layout",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.UserLayout, "{{.Username}}"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.UserLayout, "{{.Username}}"),
 			Usage:       `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.Mail}}, {{.Id.OpaqueId}}, {{.Id.Idp}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "Ei/Einstein" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_LAYOUT"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.UserLayout,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.UserLayout,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-dbusername",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBUsername, "owncloud"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBUsername, "owncloud"),
 			Usage:       `"username for accessing the database" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBUSERNAME"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.DBUsername,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.DBUsername,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-dbpassword",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBPassword, "owncloud"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBPassword, "owncloud"),
 			Usage:       `"password for accessing the database" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPASSWORD"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.DBPassword,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.DBPassword,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-dbhost",
-			Value:       cfg.Reva.Storages.OwnCloudSql.DBHost,
+			Value:       cfg.Reva.Storages.OwnCloudSQL.DBHost,
 			Usage:       `"the database hostname or IP address" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBHOST"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.DBHost,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.DBHost,
 		},
 		&cli.IntFlag{
 			Name:        "storage-owncloudsql-dbport",
-			Value:       flags.OverrideDefaultInt(cfg.Reva.Storages.OwnCloudSql.DBPort, 3306),
+			Value:       flags.OverrideDefaultInt(cfg.Reva.Storages.OwnCloudSQL.DBPort, 3306),
 			Usage:       `"port the database listens on" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBPORT"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.DBPort,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.DBPort,
 		},
 		&cli.StringFlag{
 			Name:        "storage-owncloudsql-dbname",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.DBName, "owncloud"),
+			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSQL.DBName, "owncloud"),
 			Usage:       `"the database name" `,
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUDSQL_DBNAME"},
-			Destination: &cfg.Reva.Storages.OwnCloudSql.DBName,
+			Destination: &cfg.Reva.Storages.OwnCloudSQL.DBName,
 		},
 	}
 }
--- a/storage/pkg/flagset/storagehome.go
+++ b/storage/pkg/flagset/storagehome.go
@@ -155,7 +155,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverEOSWithConfig(cfg)...)
 	flags = append(flags, DriverLocalWithConfig(cfg)...)
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
-	flags = append(flags, DriverOwnCloudSqlWithConfig(cfg)...)
+	flags = append(flags, DriverOwnCloudSQLWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
 	flags = append(flags, DriverS3NGWithConfig(cfg)...)

--- a/storage/pkg/flagset/storageusers.go
+++ b/storage/pkg/flagset/storageusers.go
@@ -145,7 +145,7 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverEOSWithConfig(cfg)...)
 	flags = append(flags, DriverLocalWithConfig(cfg)...)
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
-	flags = append(flags, DriverOwnCloudSqlWithConfig(cfg)...)
+	flags = append(flags, DriverOwnCloudSQLWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
 	flags = append(flags, DriverS3NGWithConfig(cfg)...)

--- a/storage/templates/CONFIGURATION.tmpl
+++ b/storage/templates/CONFIGURATION.tmpl
@@ -110,9 +110,9 @@ Example: Set the home and users Storage Provider to `ocis`

 {{ template "option" (list .Options "DriverOwnCloudWithConfig") -}}

-### ownCloudSql Driver
+### ownCloudSQL Driver

-{{ template "option" (list .Options "DriverOwnCloudSqlWithConfig") -}}
+{{ template "option" (list .Options "DriverOwnCloudSQLWithConfig") -}}

 ### Ocis Driver