From c9382c2b358de9b5fe0db59a587205ff2920e90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= <12514511+RincewindsHat@users.noreply.github.com> Date: Sat, 22 Mar 2025 10:20:16 +0100 Subject: [PATCH 1/2] Do not generate config for fake commands and useless arguments --- internal/common/config/icinga2Config.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/common/config/icinga2Config.go b/internal/common/config/icinga2Config.go index b49bc98..0f008fa 100644 --- a/internal/common/config/icinga2Config.go +++ b/internal/common/config/icinga2Config.go @@ -30,7 +30,9 @@ func GenerateIcinga2Config(cmd *cobra.Command, commandName, executableName strin ccaFlags = make([]icingadsl.CheckCommandArgument, 0) flags.VisitAll(func(foo *pflag.Flag) { - _ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags) + if foo.Name != "help" && foo.Name != "debug" { + _ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags) + } }) parentArgs := make([]icingadsl.CheckCommandArgument, len(ccaFlags)) @@ -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 @@ -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{} From a93670cc8763d598a024654ba8d7851650fda1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= Date: Mon, 24 Mar 2025 09:14:48 +0100 Subject: [PATCH 2/2] Replace variable name foo --- internal/common/config/icinga2Config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/common/config/icinga2Config.go b/internal/common/config/icinga2Config.go index 0f008fa..edae309 100644 --- a/internal/common/config/icinga2Config.go +++ b/internal/common/config/icinga2Config.go @@ -29,9 +29,9 @@ func GenerateIcinga2Config(cmd *cobra.Command, commandName, executableName strin ccaFlags = make([]icingadsl.CheckCommandArgument, 0) - flags.VisitAll(func(foo *pflag.Flag) { - if foo.Name != "help" && foo.Name != "debug" { - _ = GenerateIcinga2CheckCommandArgument(foo, &ccaFlags) + flags.VisitAll(func(flag *pflag.Flag) { + if flag.Name != "help" && flag.Name != "debug" { + _ = GenerateIcinga2CheckCommandArgument(flag, &ccaFlags) } })