The goal of this PR is to normalize the cli packages in a way that 1/ showcases clear ownership of data, 2/ minimizes package bloat, and 3/ helps avoid circular import issues. To achieve this, two primary changes were made. First, the cli/options package was folded into cli/utils, so that all "shared functionality" is owned by a single package. Second, all flag values, globals, declarations, and mutator funcs (in the cli layer, logging package was not changed) were extracted from cli/utils and placed into cli/flags. This divides ownership between the declaration and population of the flags (cli/flags) from the utilization of values derived from flags in command processing (cli/utils). This PR contains zero logical changes. Only code movement and renaming. --- #### Does this PR need a docs update or release note? - [x] ⛔ No #### Type of change - [x] 🧹 Tech Debt/Cleanup #### Issue(s) * #3664 #### Test Plan - [x] ⚡ Unit test - [x] 💚 E2E
43 lines
732 B
Go
43 lines
732 B
Go
package flags
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var CategoryDataFV []string
|
|
|
|
const CategoryDataFN = "data"
|
|
|
|
func AddDataFlag(cmd *cobra.Command, allowed []string, hide bool) {
|
|
var (
|
|
allowedMsg string
|
|
fs = cmd.Flags()
|
|
)
|
|
|
|
switch len(allowed) {
|
|
case 0:
|
|
return
|
|
case 1:
|
|
allowedMsg = allowed[0]
|
|
case 2:
|
|
allowedMsg = fmt.Sprintf("%s or %s", allowed[0], allowed[1])
|
|
default:
|
|
allowedMsg = fmt.Sprintf(
|
|
"%s or %s",
|
|
strings.Join(allowed[:len(allowed)-1], ", "),
|
|
allowed[len(allowed)-1])
|
|
}
|
|
|
|
fs.StringSliceVar(
|
|
&CategoryDataFV,
|
|
CategoryDataFN, nil,
|
|
"Select one or more types of data to backup: "+allowedMsg+".")
|
|
|
|
if hide {
|
|
cobra.CheckErr(fs.MarkHidden(CategoryDataFN))
|
|
}
|
|
}
|