Skip to content

Commit f529917

Browse files
comchangsclaude
andcommitted
feat: #39 bidirectional interactive selection (-m picks server, -s picks module)
resolveTargetsInteractive() handles all cases: - -m only → pick server from list - -s only → pick module from server's module list - neither → pick module first, then server - both → direct access Applied to: login, download, threaddump. Example: $ tow login -e prod -s grafana-1 Multiple modules on grafana-1: [1] noriter-grafana [2] noriter-kafka-lag-exporter [3] noriter-kminion [4] noriter-cmak [5] noriter-node-exporter Select module [1-5]: Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f8259cf commit f529917

1 file changed

Lines changed: 133 additions & 44 deletions

File tree

‎cmd/tow/main.go‎

Lines changed: 133 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,136 @@ func pickServer(servers []config.Server) (config.Server, error) {
182182
return servers[idx-1], nil
183183
}
184184

185+
// pickModule prompts the user to select a module from a list
186+
func pickModule(modules []string) (string, error) {
187+
if len(modules) == 1 {
188+
return modules[0], nil
189+
}
190+
191+
fmt.Fprintf(os.Stderr, "\nMultiple modules available:\n")
192+
for i, mod := range modules {
193+
fmt.Fprintf(os.Stderr, " [%d] %s\n", i+1, mod)
194+
}
195+
fmt.Fprintf(os.Stderr, "\nSelect module [1-%d]: ", len(modules))
196+
197+
reader := bufio.NewReader(os.Stdin)
198+
input, _ := reader.ReadString('\n')
199+
input = strings.TrimSpace(input)
200+
201+
var idx int
202+
if _, err := fmt.Sscanf(input, "%d", &idx); err != nil || idx < 1 || idx > len(modules) {
203+
return "", fmt.Errorf("invalid selection: %s", input)
204+
}
205+
206+
return modules[idx-1], nil
207+
}
208+
209+
// resolveTargetsInteractive resolves environment, module, and server with interactive selection.
210+
// - env required
211+
// - if -m given but not -s: pick server (if multiple)
212+
// - if -s given but not -m: pick module (from server's module list)
213+
// - if neither -m nor -s: pick module first, then server
214+
func resolveTargetsInteractive(cmd *cobra.Command, cfg *config.Config) (envName, modName string, serverNum int, err error) {
215+
envName, _ = cmd.Flags().GetString("environment")
216+
modName, _ = cmd.Flags().GetString("module")
217+
serverFlag, _ := cmd.Flags().GetString("server")
218+
219+
if envName == "" {
220+
return "", "", 0, fmt.Errorf("environment (-e) is required")
221+
}
222+
223+
envCfg, ok := cfg.Environments[envName]
224+
if !ok {
225+
return "", "", 0, fmt.Errorf("environment %q not found in config", envName)
226+
}
227+
228+
// Case 1: server given but not module → pick module from server's list
229+
if modName == "" && serverFlag != "" {
230+
// Find the server
231+
var targetSrv *config.Server
232+
for i := range envCfg.Servers {
233+
if envCfg.Servers[i].ID() == serverFlag {
234+
targetSrv = &envCfg.Servers[i]
235+
break
236+
}
237+
}
238+
if targetSrv == nil {
239+
return "", "", 0, fmt.Errorf("server %q not found in environment %q", serverFlag, envName)
240+
}
241+
242+
if len(targetSrv.Modules) == 0 {
243+
return "", "", 0, fmt.Errorf("server %q has no modules assigned", serverFlag)
244+
}
245+
246+
modName, err = pickModule(targetSrv.Modules)
247+
if err != nil {
248+
return "", "", 0, err
249+
}
250+
serverNum = targetSrv.Number
251+
return envName, modName, serverNum, nil
252+
}
253+
254+
// Case 2: module given but not server → pick server (if multiple)
255+
if modName != "" && serverFlag == "" {
256+
servers, _, err := cfg.GetServersForModule(envName, modName, 0)
257+
if err != nil {
258+
return "", "", 0, err
259+
}
260+
if len(servers) > 1 {
261+
srv, err := pickServer(servers)
262+
if err != nil {
263+
return "", "", 0, err
264+
}
265+
serverNum = srv.Number
266+
}
267+
268+
// Parse serverFlag if present
269+
if serverFlag != "" {
270+
fmt.Sscanf(serverFlag, "%d", &serverNum)
271+
}
272+
return envName, modName, serverNum, nil
273+
}
274+
275+
// Case 3: neither module nor server → pick module first
276+
if modName == "" && serverFlag == "" {
277+
var moduleNames []string
278+
for name := range cfg.Modules {
279+
moduleNames = append(moduleNames, name)
280+
}
281+
if len(moduleNames) == 0 {
282+
return "", "", 0, fmt.Errorf("no modules configured")
283+
}
284+
285+
modName, err = pickModule(moduleNames)
286+
if err != nil {
287+
return "", "", 0, err
288+
}
289+
290+
// Then pick server
291+
servers, _, err := cfg.GetServersForModule(envName, modName, 0)
292+
if err != nil {
293+
return "", "", 0, err
294+
}
295+
if len(servers) > 1 {
296+
srv, err := pickServer(servers)
297+
if err != nil {
298+
return "", "", 0, err
299+
}
300+
serverNum = srv.Number
301+
}
302+
return envName, modName, serverNum, nil
303+
}
304+
305+
// Case 4: both given → parse server flag
306+
if serverFlag != "" {
307+
if n, e := fmt.Sscanf(serverFlag, "%d", &serverNum); n == 0 || e != nil {
308+
serverNum = -1
309+
}
310+
}
311+
312+
return envName, modName, serverNum, nil
313+
}
314+
185315
// confirmProdDeploy asks for user confirmation when deploying to production-like environments
186316
func confirmProdDeploy(cmd *cobra.Command, envName, moduleName, command string) bool {
187317
// Skip confirmation in dry-run mode
@@ -1050,27 +1180,11 @@ func newLoginCmd() *cobra.Command {
10501180
}
10511181
insecure, _ := cmd.Flags().GetBool("insecure")
10521182

1053-
envName, modName, serverNum, err := resolveTargets(cmd, cfg)
1183+
envName, modName, serverNum, err := resolveTargetsInteractive(cmd, cfg)
10541184
if err != nil {
10551185
return err
10561186
}
10571187

1058-
// If no server specified and multiple exist, let user pick
1059-
serverFlag, _ := cmd.Flags().GetString("server")
1060-
if serverFlag == "" {
1061-
servers, _, err := cfg.GetServersForModule(envName, modName, 0)
1062-
if err != nil {
1063-
return err
1064-
}
1065-
if len(servers) > 1 {
1066-
srv, err := pickServer(servers)
1067-
if err != nil {
1068-
return err
1069-
}
1070-
serverNum = srv.Number
1071-
}
1072-
}
1073-
10741188
sshMgr := ssh.NewManager(insecure)
10751189
return sshMgr.InteractiveLogin(cfg, envName, modName, serverNum)
10761190
},
@@ -1150,24 +1264,11 @@ Examples:
11501264
}
11511265
defer sshMgr.Close()
11521266

1153-
env, mod, server, err := resolveTargets(cmd, cfg)
1267+
env, mod, server, err := resolveTargetsInteractive(cmd, cfg)
11541268
if err != nil {
11551269
return err
11561270
}
11571271

1158-
// Interactive server selection if multiple match
1159-
serverFlag, _ := cmd.Flags().GetString("server")
1160-
if serverFlag == "" {
1161-
servers, _, err := cfg.GetServersForModule(env, mod, 0)
1162-
if err == nil && len(servers) > 1 {
1163-
srv, err := pickServer(servers)
1164-
if err != nil {
1165-
return err
1166-
}
1167-
server = srv.Number
1168-
}
1169-
}
1170-
11711272
localDir, _ := cmd.Flags().GetString("dir")
11721273
deployer := deploy.New(cfg, sshMgr)
11731274
return deployer.Download(env, mod, server, args[0], localDir)
@@ -1693,23 +1794,11 @@ func newThreadDumpCmd() *cobra.Command {
16931794
}
16941795
defer sshMgr.Close()
16951796

1696-
env, mod, server, err := resolveTargets(cmd, cfg)
1797+
env, mod, server, err := resolveTargetsInteractive(cmd, cfg)
16971798
if err != nil {
16981799
return err
16991800
}
17001801

1701-
serverFlag, _ := cmd.Flags().GetString("server")
1702-
if serverFlag == "" {
1703-
servers, _, err := cfg.GetServersForModule(env, mod, 0)
1704-
if err == nil && len(servers) > 1 {
1705-
srv, err := pickServer(servers)
1706-
if err != nil {
1707-
return err
1708-
}
1709-
server = srv.Number
1710-
}
1711-
}
1712-
17131802
deployer := deploy.New(cfg, sshMgr)
17141803
return deployer.ThreadDump(env, mod, server)
17151804
},

0 commit comments

Comments
 (0)