From 7b3fe03b19c30b15636761ef7075991868aea0e6 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Mon, 20 May 2024 22:22:19 +0200
Subject: [PATCH] fix -f flag for etcd alarm list / disarm commands

---
 pkg/commands/imported_etcd.go | 63 ++++++++++++++++++++---------------
 tools/import_commands.go      |  9 +++++
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/pkg/commands/imported_etcd.go b/pkg/commands/imported_etcd.go
index fa379b6..fa5b010 100644
--- a/pkg/commands/imported_etcd.go
+++ b/pkg/commands/imported_etcd.go
@@ -1,3 +1,6 @@
+// Code generated by go run tools/import_commands.go --talos-version v1.7.1 etcd
+// DO NOT EDIT.
+
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -407,13 +410,12 @@ func init() {
 		}
 		return nil
 	}
-	etcdAlarmCmd.
-		Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
+	etcdAlarmCmd.Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
 		"file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
 	)
-	etcdAlarmCmd.
-		PreRunE = etcdCmd.PreRunE
-	etcdDefragCmd.Flags().StringSliceVarP(&etcdCmdFlags.configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)")
+	etcdAlarmCmd.PreRunE = etcdCmd.PreRunE
+	etcdDefragCmd.Flags().
+		StringSliceVarP(&etcdCmdFlags.configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)")
 	etcdDefragCmd.
 		PreRunE = etcdCmd.
 		PreRunE
@@ -421,39 +423,48 @@ func init() {
 		Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
 		"file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
 	)
+
 	etcdForfeitLeadershipCmd.PreRunE = etcdCmd.PreRunE
 	etcdLeaveCmd.
-		Flags().StringSliceVarP(&etcdCmdFlags.
-		configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
+		Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
+
+		"file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
 	)
 	etcdLeaveCmd.
 		PreRunE = etcdCmd.PreRunE
-	etcdMemberListCmd.
-		Flags().StringSliceVarP(&etcdCmdFlags.
-		configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
+	etcdMemberListCmd.Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
+		"file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
+	)
+	etcdMemberListCmd.PreRunE = etcdCmd.
+		PreRunE
+	etcdMemberRemoveCmd.Flags().StringSliceVarP(&etcdCmdFlags.configFiles,
+		"file",
+		"f", nil, "specify config files or patches in a YAML file (can specify multiple)",
 	)
-	etcdMemberListCmd.PreRunE = etcdCmd.PreRunE
-	etcdMemberRemoveCmd.Flags().
-		StringSliceVarP(&etcdCmdFlags.
-			configFiles, "file",
-			"f", nil, "specify config files or patches in a YAML file (can specify multiple)",
-		)
 	etcdMemberRemoveCmd.
 		PreRunE = etcdCmd.PreRunE
 	etcdSnapshotCmd.Flags().StringSliceVarP(&etcdCmdFlags.
-		configFiles, "file",
-		"f",
-		nil, "specify config files or patches in a YAML file (can specify multiple)",
+		configFiles, "file", "f", nil,
+		"specify config files or patches in a YAML file (can specify multiple)",
 	)
-	etcdSnapshotCmd.PreRunE = etcdCmd.
-		PreRunE
 
-	etcdStatusCmd.
-		Flags().StringSliceVarP(&etcdCmdFlags.configFiles, "file",
-		"f", nil, "specify config files or patches in a YAML file (can specify multiple)",
+	etcdSnapshotCmd.PreRunE = etcdCmd.PreRunE
+
+	etcdStatusCmd.Flags().StringSliceVarP(&etcdCmdFlags.configFiles, "file", "f",
+		nil, "specify config files or patches in a YAML file (can specify multiple)",
 	)
-	etcdStatusCmd.
-		PreRunE = etcdCmd.
+	etcdStatusCmd.PreRunE = etcdCmd.PreRunE
+	etcdAlarmListCmd.Flags().StringSliceVarP(&etcdCmdFlags.
+		configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)",
+	)
+	etcdAlarmListCmd.
+		PreRunE = etcdCmd.PreRunE
+	etcdAlarmDisarmCmd.Flags().StringSliceVarP(&etcdCmdFlags.
+		configFiles, "file", "f",
+		nil,
+
+		"specify config files or patches in a YAML file (can specify multiple)")
+	etcdAlarmDisarmCmd.PreRunE = etcdCmd.
 		PreRunE
 
 	etcdAlarmCmd.AddCommand(
diff --git a/tools/import_commands.go b/tools/import_commands.go
index 4e9530d..7b2c9c7 100644
--- a/tools/import_commands.go
+++ b/tools/import_commands.go
@@ -214,6 +214,15 @@ func processFile(filename, cmdName string) {
 		}
 	}
 
+	if cmdName == "etcd" {
+		for _, subCmdName := range []string{"etcdAlarmListCmd", "etcdAlarmDisarmCmd"} {
+			initCode = fmt.Sprintf("%s\n%s", initCode, fmt.Sprintf(`
+	%s.Flags().StringSliceVarP(&etcdCmdFlags.configFiles, "file", "f", nil, "specify config files or patches in a YAML file (can specify multiple)")
+	%s.PreRunE = etcdCmd.PreRunE
+		`, subCmdName, subCmdName))
+		}
+	}
+
 	insertInitCode(node, cmdName, initCode)
 
 	var buf bytes.Buffer