Skip to content

Do not generate config for fake commands and useless arguments #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2025
Merged

Do not generate config for fake commands and useless arguments #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9382c2
Do not generate config for fake commands and useless arguments
RincewindsHat Mar 22, 2025
a93670c
Replace variable name foo
Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions internal/common/config/icinga2Config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ func GenerateIcinga2Config(cmd *cobra.Command, commandName, executableName strin

ccaFlags = make([]icingadsl.CheckCommandArgument, 0)

flags.VisitAll(func(foo *pflag.Flag) {
_ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags)
flags.VisitAll(func(flag *pflag.Flag) {
if flag.Name != "help" && flag.Name != "debug" {
_ = GenerateIcinga2CheckCommandArgument(flag, &ccaFlags)
}
})

parentArgs := make([]icingadsl.CheckCommandArgument, len(ccaFlags))
Expand All @@ -41,6 +43,11 @@ func GenerateIcinga2Config(cmd *cobra.Command, commandName, executableName strin
checkCommands = append(checkCommands, parentDefinition)

for _, command := range cmd.Commands() {
// Ignore the magical cobra command "no-help"
if command.Name() == "no-help" {
continue
}

ccaFlags = make([]icingadsl.CheckCommandArgument, 0)

// This triggers a side effect to get inherited flags
Expand All @@ -49,7 +56,9 @@ func GenerateIcinga2Config(cmd *cobra.Command, commandName, executableName strin

scFlags := command.Flags()
scFlags.VisitAll(func(foo *pflag.Flag) {
_ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags)
if foo.Name != "help" && foo.Name != "debug" {
_ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags)
}
})

cc := icingadsl.CheckCommand{}
Expand Down
Loading