Merge pull request #581 from cbosdo/duplicate-ssl-group

Duplicate SSL flag group shows them twice

Author: mbussolotto

mgradm/cmd/install/shared/flags.go

@@ -27,7 +27,6 @@ func AddInstallFlags(cmd *cobra.Command) {
 	cmd.Flags().String("ssl-server-cert", "", L("Server certificate path"))
 	cmd.Flags().String("ssl-server-key", "", L("Server key path"))
 
-	_ = utils.AddFlagHelpGroup(cmd, &utils.Group{ID: "ssl3rd", Title: L("3rd Party SSL Certificate Flags")})
 	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-ca-intermediate", "ssl3rd")
 	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-ca-root", "ssl3rd")
 	_ = utils.AddFlagToHelpGroupID(cmd, "ssl-server-cert", "ssl3rd")

shared/utils/flaggroups.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -70,9 +70,22 @@ func usageFunc(cmd *cobra.Command) error {
 	return origUsageFunc(cmd)
 }
 
+// ContainsGroup checks if the command alrady has a group with the same ID.
+func ContainsGroup(cmd *cobra.Command, groupID string) bool {
+	for _, grp := range commandGroups[cmd] {
+		if grp.ID == groupID {
+			return true
+		}
+	}
+	return false
+}
+
 // AddFlagHelpGroup adds a new flags group.
 func AddFlagHelpGroup(cmd *cobra.Command, groups ...*Group) error {
 	for _, group := range groups {
+		if ContainsGroup(cmd, group.ID) {
+			continue
+		}
 		commandGroups[cmd] = append(commandGroups[cmd], *group)
 	}
 

uyuni-tools.changes.cbosdo.duplicate-ssl-group

@@ -0,0 +1 @@
+- Remove duplicate parameters in mgradm install podman --help