refactor: add tag and relation methods to node to enforce integrity
This commit is contained in:
70
cmd/root.go
70
cmd/root.go
@@ -27,35 +27,15 @@ func Execute() {
|
||||
}
|
||||
}
|
||||
|
||||
func expandAlias(alias *service.Alias, args []string, currentUser string) []string {
|
||||
cmd := alias.Command
|
||||
cmd = strings.ReplaceAll(cmd, "$me", currentUser)
|
||||
func init() {
|
||||
rootCmd.PersistentFlags().BoolVar(&jsonFlag, "json", false, "")
|
||||
}
|
||||
|
||||
parts := strings.Fields(cmd)
|
||||
var result []string
|
||||
|
||||
for _, part := range parts {
|
||||
if part == "$@" {
|
||||
result = append(result, args...)
|
||||
continue
|
||||
}
|
||||
|
||||
hasCatchAll := strings.Contains(part, "$@")
|
||||
replaced := part
|
||||
|
||||
if hasCatchAll {
|
||||
replaced = strings.ReplaceAll(replaced, "$@", strings.Join(args, " "))
|
||||
}
|
||||
|
||||
for i := len(args) - 1; i >= 0; i-- {
|
||||
placeholder := fmt.Sprintf("$%d", i+1)
|
||||
replaced = strings.ReplaceAll(replaced, placeholder, args[i])
|
||||
}
|
||||
|
||||
result = append(result, replaced)
|
||||
}
|
||||
|
||||
return result
|
||||
func addPropertyFlags(cmd *cobra.Command) {
|
||||
cmd.Flags().String("type", "", "node type")
|
||||
cmd.Flags().String("status", "", "node status")
|
||||
cmd.Flags().String("prio", "", "node priority")
|
||||
cmd.Flags().String("namespace", "", "node namespace")
|
||||
}
|
||||
|
||||
func registerAliasCommands() {
|
||||
@@ -67,8 +47,27 @@ func registerAliasCommands() {
|
||||
Short: a.Description,
|
||||
GroupID: "aliases",
|
||||
DisableFlagParsing: true,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
expanded := expandAlias(a, args, cfg.GetUser())
|
||||
Run: func(ccmd *cobra.Command, args []string) {
|
||||
acmd := a.Command
|
||||
acmd = strings.ReplaceAll(acmd, "$me", cfg.GetUser())
|
||||
parts := strings.Fields(acmd)
|
||||
var expanded []string
|
||||
for _, part := range parts {
|
||||
if part == "$@" {
|
||||
expanded = append(expanded, args...)
|
||||
continue
|
||||
}
|
||||
hasCatchAll := strings.Contains(part, "$@")
|
||||
replaced := part
|
||||
if hasCatchAll {
|
||||
replaced = strings.ReplaceAll(replaced, "$@", strings.Join(args, " "))
|
||||
}
|
||||
for i := len(args) - 1; i >= 0; i-- {
|
||||
placeholder := fmt.Sprintf("$%d", i+1)
|
||||
replaced = strings.ReplaceAll(replaced, placeholder, args[i])
|
||||
}
|
||||
expanded = append(expanded, replaced)
|
||||
}
|
||||
rootCmd.SetArgs(transformArgs(expanded))
|
||||
if err := rootCmd.Execute(); err != nil {
|
||||
os.Exit(1)
|
||||
@@ -102,14 +101,3 @@ func transformArgs(args []string) []string {
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.PersistentFlags().BoolVar(&jsonFlag, "json", false, "")
|
||||
}
|
||||
|
||||
func addPropertyFlags(cmd *cobra.Command) {
|
||||
cmd.Flags().String("type", "", "node type")
|
||||
cmd.Flags().String("status", "", "node status")
|
||||
cmd.Flags().String("prio", "", "node priority")
|
||||
cmd.Flags().String("namespace", "", "node namespace")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user