mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2025-12-23 22:29:59 -05:00
replace .Value.String() with .GetString(...)
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
committed by
Florian Schade
parent
8564fa4536
commit
032c218789
@@ -34,7 +34,7 @@ func ConsistencyCommand(cfg *config.Config) *cobra.Command {
|
||||
Use: "consistency",
|
||||
Short: "check backup consistency",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
basePath := cmd.Flag("basepath").Value.String()
|
||||
basePath, _ := cmd.Flags().GetString("basepath")
|
||||
if basePath == "" {
|
||||
fmt.Println("basepath is required")
|
||||
_ = cmd.Help()
|
||||
|
||||
@@ -69,7 +69,7 @@ func BenchmarkClientCommand(cfg *config.Config) *cobra.Command {
|
||||
opt.headers[parts[0]] = strings.TrimSpace(parts[1])
|
||||
}
|
||||
|
||||
rate := cmd.Flag("rate").Value.String()
|
||||
rate, _ := cmd.Flags().GetString("rate")
|
||||
if rate != "" {
|
||||
parts := strings.SplitN(rate, "/", 2)
|
||||
num, err := strconv.Atoi(parts[0])
|
||||
@@ -92,12 +92,12 @@ func BenchmarkClientCommand(cfg *config.Config) *cobra.Command {
|
||||
opt.rateDelay = unit / time.Duration(num)
|
||||
}
|
||||
|
||||
user := cmd.Flag("user").Value.String()
|
||||
user, _ := cmd.Flags().GetString("user")
|
||||
opt.auth = func() string {
|
||||
return "Basic " + base64.StdEncoding.EncodeToString([]byte(user))
|
||||
}
|
||||
|
||||
btc := cmd.Flag("bearer-token-command").Value.String()
|
||||
btc, _ := cmd.Flags().GetString("bearer-token-command")
|
||||
if btc != "" {
|
||||
parts := strings.SplitN(btc, " ", 2)
|
||||
var cmd *exec.Cmd
|
||||
@@ -247,7 +247,7 @@ func BenchmarkSyscallsCommand(cfg *config.Config) *cobra.Command {
|
||||
Short: "test the performance of syscalls",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
|
||||
path := cmd.Flag("path").Value.String()
|
||||
path, _ := cmd.Flags().GetString("path")
|
||||
if path == "" {
|
||||
f, err := os.CreateTemp("", "opencloud-bench-temp-")
|
||||
if err != nil {
|
||||
|
||||
@@ -68,7 +68,7 @@ func checkCmd(cfg *config.Config) *cobra.Command {
|
||||
}
|
||||
|
||||
func check(cmd *cobra.Command, args []string) error {
|
||||
rootFlag := cmd.Flag("root").Value.String()
|
||||
rootFlag, _ := cmd.Flags().GetString("root")
|
||||
repairFlag, _ := cmd.Flags().GetBool("repair")
|
||||
forceFlag, _ := cmd.Flags().GetBool("force")
|
||||
|
||||
@@ -92,7 +92,7 @@ func check(cmd *cobra.Command, args []string) error {
|
||||
|
||||
tree := tree.New(lu, bs, o, permissions.Permissions{}, store.Create(), &zerolog.Logger{})
|
||||
|
||||
nId := cmd.Flag("node").Value.String()
|
||||
nId, _ := cmd.Flags().GetString("node")
|
||||
n, err := lu.NodeFromSpaceID(context.Background(), nId)
|
||||
if err != nil || !n.Exists {
|
||||
fmt.Println("Can not find node '" + nId + "'")
|
||||
@@ -253,7 +253,7 @@ func setCmd(cfg *config.Config) *cobra.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
v := cmd.Flag("value").Value.String()
|
||||
v, _ := cmd.Flags().GetString("value")
|
||||
if strings.HasPrefix(v, "0s") {
|
||||
b64, err := base64.StdEncoding.DecodeString(v[2:])
|
||||
if err == nil {
|
||||
@@ -304,7 +304,7 @@ func backend(root, backend string) metadata.Backend {
|
||||
}
|
||||
|
||||
func getBackend(cmd *cobra.Command) (*lookup.Lookup, metadata.Backend) {
|
||||
rootFlag := cmd.Flag("root").Value.String()
|
||||
rootFlag, _ := cmd.Flags().GetString("root")
|
||||
|
||||
bod := lookup.DetectBackendOnDisk(rootFlag)
|
||||
backend := backend(rootFlag, bod)
|
||||
@@ -316,7 +316,7 @@ func getBackend(cmd *cobra.Command) (*lookup.Lookup, metadata.Backend) {
|
||||
}
|
||||
|
||||
func getNode(cmd *cobra.Command, lu *lookup.Lookup) (*node.Node, error) {
|
||||
nodeFlag := cmd.Flag("node").Value.String()
|
||||
nodeFlag, _ := cmd.Flags().GetString("node")
|
||||
|
||||
id, err := storagespace.ParseID(nodeFlag)
|
||||
if err != nil {
|
||||
|
||||
@@ -23,7 +23,7 @@ func InitCommand(_ *config.Config) *cobra.Command {
|
||||
Short: "initialise an OpenCloud config",
|
||||
GroupID: CommandGroupServer,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
insecureFlag := cmd.Flag("insecure").Value.String()
|
||||
insecureFlag, _ := cmd.Flags().GetString("insecure")
|
||||
insecure := false
|
||||
if insecureFlag == "ask" {
|
||||
answer := strings.ToLower(stringPrompt("Do you want to configure OpenCloud with certificate checking disabled?\n This is not recommended for public instances! [yes | no = default]"))
|
||||
|
||||
@@ -71,7 +71,7 @@ func consistencyCmd(cfg *config.Config) *cobra.Command {
|
||||
|
||||
// checkPosixfsConsistency checks the consistency of the posixfs storage.
|
||||
func checkPosixfsConsistency(cmd *cobra.Command, cfg *config.Config) error {
|
||||
rootPath := cmd.Flag("root").Value.String()
|
||||
rootPath, _ := cmd.Flags().GetString("root")
|
||||
indexesPath := filepath.Join(rootPath, "indexes")
|
||||
|
||||
_, err := os.Stat(indexesPath)
|
||||
|
||||
@@ -45,7 +45,7 @@ func PurgeRevisionsCommand(cfg *config.Config) *cobra.Command {
|
||||
Use: "purge",
|
||||
Short: "purge revisions",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
basePath := cmd.Flag("basepath").Value.String()
|
||||
basePath, _ := cmd.Flags().GetString("basepath")
|
||||
if basePath == "" {
|
||||
fmt.Println("basepath is required")
|
||||
_ = cmd.Help()
|
||||
@@ -84,7 +84,7 @@ func PurgeRevisionsCommand(cfg *config.Config) *cobra.Command {
|
||||
rid = &resid
|
||||
}
|
||||
|
||||
mechanism := cmd.Flag("glob-mechanism").Value.String()
|
||||
mechanism, _ := cmd.Flags().GetString("glob-mechanism")
|
||||
if rid.GetOpaqueId() != "" {
|
||||
mechanism = "glob"
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ func TrashPurgeEmptyDirsCommand(cfg *config.Config) *cobra.Command {
|
||||
Use: "purge-empty-dirs",
|
||||
Short: "purge empty directories",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
basePath := cmd.Flag("basepath").Value.String()
|
||||
basePath, _ := cmd.Flags().GetString("basepath")
|
||||
if basePath == "" {
|
||||
fmt.Println("basepath is required")
|
||||
_ = cmd.Help()
|
||||
|
||||
@@ -56,7 +56,7 @@ func Create(cfg *config.Config) *cobra.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
userName := cmd.Flag("user-name").Value.String()
|
||||
userName, _ := cmd.Flags().GetString("user-name")
|
||||
if userName == "" {
|
||||
fmt.Printf("Username to create app token for: ")
|
||||
if _, err := fmt.Scanln(&userName); err != nil {
|
||||
|
||||
@@ -39,7 +39,7 @@ func RestartPostprocessing(cfg *config.Config) *cobra.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
uid, step := cmd.Flag("upload-id").Value.String(), ""
|
||||
uid, step, _ := cmd.Flags().GetString("upload-id"), ""
|
||||
if uid == "" {
|
||||
step = cmd.Flag("step").Value.String()
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@ func restoreAllTrashBinItems(cfg *config.Config) *cobra.Command {
|
||||
_ = cmd.Help()
|
||||
return fmt.Errorf("spaceID is requiered")
|
||||
}
|
||||
option := cmd.Flag("option").Value.String()
|
||||
option, _ := cmd.Flags().GetString("option")
|
||||
switch option {
|
||||
case "skip":
|
||||
overwriteOption = SKIP
|
||||
@@ -273,7 +273,7 @@ func restoreTrashBinItem(cfg *config.Config) *cobra.Command {
|
||||
_ = cmd.Help()
|
||||
return fmt.Errorf("itemID is requered")
|
||||
}
|
||||
option := cmd.Flag("option").Value.String()
|
||||
option, _ := cmd.Flags().GetString("option")
|
||||
switch option {
|
||||
case "skip":
|
||||
overwriteOption = SKIP
|
||||
|
||||
@@ -231,7 +231,7 @@ func buildFilter(cmd *cobra.Command) storage.UploadSessionFilter {
|
||||
filter.HasVirus = &infectedValue
|
||||
}
|
||||
if cmd.Flag("id").Changed {
|
||||
idValue := cmd.Flag("id").Value.String()
|
||||
idValue, _ := cmd.Flags().GetString("id")
|
||||
if idValue != "" {
|
||||
filter.ID = &idValue
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user