Allow setting port via instance tags

README.md

@@ -9,6 +9,7 @@ There are the following EC2 instance tags that change behaviour:
 1. (Deprecated) If a bastion instance has tag "Global" with value "yes", "true" or "1", then aws-ssh will use it for all VPCs. If there are multiple bastion instances, it chooses the instance that has the most common match in name.
 2. "x-aws-ssh-global" - same as the above
 3. "x-aws-ssh-user" - sets the ssh username in the config.
+3. "x-aws-ssh-port" - sets the ssh port in the config.
 
 Any comments and especially pull requests are highly appreciated.
 

lib/reconf.go

@@ -20,6 +20,7 @@ type SSHEntry struct {
 	InstanceID,
 	Name,
 	ProxyJump,
+	Port,
 	User,
 	Profile string
 }
@@ -35,6 +36,9 @@ func (e SSHEntry) ConfigFormat() string {
 	if e.ProxyJump != "" {
 		output = append(output, fmt.Sprintf("    ProxyJump %s", e.ProxyJump))
 	}
+	if e.Port != "" {
+		output = append(output, fmt.Sprintf("    Port %s", e.Port))
+	}
 	output = append(output, fmt.Sprintf("    Hostname %s", e.Address), "\n")
 
 	return strings.Join(output, "\n")
@@ -137,6 +141,7 @@ func Reconf(profiles []string, filename string) {
 						}
 					}
 					entry.User = getTagValue("x-aws-ssh-user", instance.Tags)
+					entry.Port = getTagValue("x-aws-ssh-port", instance.Tags)
 					sshEntries = append(sshEntries, entry)
 				}
 			}