Add support for default username

Author: buger

.gitignore

@@ -0,0 +1,4 @@
+
+cloud-ssh.yaml
+
+Dockerfile

config.go

@@ -42,6 +42,8 @@ func readConfig() (config Config) {
 			if err != nil {
 				log.Fatal("Error while reading config: ", err)
 			}
+
+			break
 		}
 	}
 

main.go

@@ -26,7 +26,6 @@ func getInstances(config Config) (clouds CloudInstances) {
 
 	for name, cfg := range config {
 		for k, v := range cfg {
-
 			if k == "provider" {
 				switch v {
 				case "aws":
@@ -58,7 +57,6 @@ func getInstances(config Config) (clouds CloudInstances) {
 }
 
 func getMatchedInstances(clouds CloudInstances, filter string) (matched []StrMap) {
-
 	// Fuzzy matching, like SublimeText
 	filter = strings.Join(strings.Split(filter, ""), ".*?")
 
@@ -70,7 +68,7 @@ func getMatchedInstances(clouds CloudInstances, filter string) (matched []StrMap
 				if rHost.MatchString(cloud + tag.Value) {
 					matched = append(matched, StrMap{
 						"cloud":     cloud,
-						"addr":      addr,
+						"addr":      addr,						
 						"tag_name":  tag.Name,
 						"tag_value": tag.Value,
 					})
@@ -98,14 +96,13 @@ func main() {
 
 	match := getMatchedInstances(instances, hostname)
 
+	var matched_instance map[string]string	
+
 	if len(match) == 0 {
 		fmt.Println("Can't find cloud instance, trying to connect anyway")
 	} else if len(match) == 1 {
-		hostname = match[0]["addr"]
-		fmt.Println("Found clound instance:")
-		fmt.Println(formatMatchedInstance(match[0]))
+		matched_instance = match[0]
 	} else {
-		fmt.Println("Found multiple instances:")
 		for i, host := range match {
 			fmt.Println(strconv.Itoa(i+1)+") ", formatMatchedInstance(host))
 		}
@@ -118,10 +115,26 @@ func main() {
 			log.Fatal("Wrong index")
 		}
 
-		hostname = match[i-1]["addr"]
+		matched_instance = match[i-1]
 	}
 
-	args[arg_idx] = joinHostname(user, hostname)
+	if matched_instance != nil {
+		hostname = matched_instance["addr"]
+		default_user := config[matched_instance["cloud"]]["default_user"]
+
+		if len(user) == 0 && len(default_user) > 0 {
+			user = default_user
+		}
+
+		fmt.Println("Connecting to instance:")
+		fmt.Println(formatMatchedInstance(matched_instance))
+	}
+	
+	if len(args) == 0 {
+		args = append(args, joinHostname(user, hostname))
+	} else {
+		args[arg_idx] = joinHostname(user, hostname)
+	}
 
 	cmd := exec.Command("ssh", args...)
 	cmd.Stdin = os.Stdin