Skip to content

Commit 8ffb0f6

Browse files
committed
Tweak topic delete
1 parent fa23f14 commit 8ffb0f6

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

cmd/kafka/topic.go

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func topicCmd() *cobra.Command {
2222

2323
cmd.AddCommand(topicListCmd())
2424
cmd.AddCommand(topicCreateCmd())
25-
cmd.AddCommand(topicDeleteCmd)
25+
cmd.AddCommand(topicDeleteCmd())
2626

2727
return cmd
2828
}
@@ -109,27 +109,31 @@ func topicCreateCmd() *cobra.Command {
109109
return cmd
110110
}
111111

112-
var topicDeleteCmd = &cobra.Command{
113-
Use: "delete",
114-
Args: cobra.ExactArgs(1),
115-
RunE: func(cmd *cobra.Command, args []string) error {
116-
topic := args[0]
112+
func topicDeleteCmd() *cobra.Command {
113+
cmd := &cobra.Command{
114+
Use: "delete",
115+
Args: cobra.ExactArgs(1),
116+
RunE: func(cmd *cobra.Command, args []string) error {
117+
topic := args[0]
118+
119+
clusterAdmin, err := newClusterAdmin()
120+
if err != nil {
121+
return fmt.Errorf("newClusterAdmin error: %w", err)
122+
}
117123

118-
clusterAdmin, err := newClusterAdmin()
119-
if err != nil {
120-
return fmt.Errorf("newClusterAdmin error: %w", err)
121-
}
124+
defer func() {
125+
if err := clusterAdmin.Close(); err != nil {
126+
slog.Error("clusterAdmin.Close failed", slog.Any("error", err))
127+
}
128+
}()
122129

123-
defer func() {
124-
if err := clusterAdmin.Close(); err != nil {
125-
slog.Error("clusterAdmin.Close failed", slog.Any("error", err))
130+
if err := clusterAdmin.DeleteTopic(topic); err != nil {
131+
return fmt.Errorf("clusterAdmin.DeleteTopic error: %w", err)
126132
}
127-
}()
128133

129-
if err := clusterAdmin.DeleteTopic(topic); err != nil {
130-
return fmt.Errorf("clusterAdmin.DeleteTopic error: %w", err)
131-
}
134+
return nil
135+
},
136+
}
132137

133-
return nil
134-
},
138+
return cmd
135139
}

0 commit comments

Comments
 (0)