Merge 0a5ba61 into 42cdcf5

internal/kubectl/cli.go

@@ -48,8 +48,10 @@ func PodsList(namespace string) []*Pod {
 		portsStr := strings.Split(tokens[2], ",")
 		ports := make([]int, 0, len(portsStr))
 		for _, portStr := range portsStr {
-			port, _ := strconv.Atoi(portStr)
-			ports = append(ports, port)
+			port, err := strconv.Atoi(portStr)
+			if (err == nil) {
+				ports = append(ports, port)
+			}
 		}
 		pods = append(pods, &Pod{Name: tokens[0], Containers: containers, ContainerPorts: ports, AppLabel: tokens[3]})
 	}

internal/kubectl/cli_test.go

@@ -50,8 +50,7 @@ func TestPodsList(t *testing.T) {
 	expectedItems := []*Pod{
 		{
 			Name: "acme-rockets-v0.3.0-74bf544f8b-lzc5b",
-			// TODO Is it OK to have [0] for <none>? Because it does that now.
-			ContainerPorts: []int{0},
+			ContainerPorts: []int{},
 			Containers: []string{
 				"event-exporter",
 				"prometheus-to-sd-exporter",

main.go

@@ -227,18 +227,36 @@ func readLocalPort(defaultPort int) int {
 }
 
 func readRemotePort(containerPorts []int) (port int) {
-	port, _ = promptSelection(selectField{
-		titleLoading: "Remote ports",
-		titleChoose:  "Remote port",
-		getOptions: func() (options []selectFieldOption) {
-			for _, port := range containerPorts {
-				options = append(options, selectFieldOption{title: strconv.Itoa(port), value: port})
-			}
-			return
-		},
-		valueTitle: *flags.remotePort,
-	}).(int)
-	return
+	if (len(containerPorts) > 0) {
+		port, _ = promptSelection(selectField{
+			titleLoading: "Remote ports",
+			titleChoose:  "Remote port",
+			getOptions: func() (options []selectFieldOption) {
+				for _, port := range containerPorts {
+					options = append(options, selectFieldOption{title: strconv.Itoa(port), value: port})
+				}
+				return
+			},
+			valueTitle: *flags.remotePort,
+		}).(int)
+		return
+	}
+	pickedPort := "3000"
+	if *flags.remotePort != "" {
+		pickedPort = *flags.remotePort
+		fmt.Printf("Choose remote port: %v\n", pickedPort)
+	} else {
+		prompt := &survey.Input{
+			Message: "Choose remote port:",
+			Default: pickedPort,
+		}
+		survey.AskOne(prompt, &pickedPort)
+	}
+	n, err := strconv.Atoi(pickedPort)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return n
 }
 
 func readArguments() {