Allow custom tags for instance lane and name

README.md

@@ -102,6 +102,10 @@ behavior:
   ``$LANES_CONFIG_DIR/lanes.yml``
 * ``LANES_REGION``: the AWS region to use when listing EC2 instances. Default:
   ``us-west-2``
+* ``LANES_LANE_TAG``: the EC2 instance tag to use for determining which lane an
+  instance belongs to. Default: ``Lane``
+* ``LANES_NAME_TAG``: the EC2 instance tag to use for determining an instance's
+  name. Default: ``Name``
 
 ## Usage
 

config.go

@@ -18,6 +18,12 @@ var (
 
 	// REGION is the default region to use for any profile that doesn't have a region explicitly set.
 	REGION = EnvDefault("LANES_REGION", "us-west-2")
+
+	// LANE_TAG is the name of the EC2 tag to use when determining which lane a server belongs in.
+	LANE_TAG = EnvDefault("LANES_LANE_TAG", "Lane")
+
+	// NAME_TAG is the name of the EC2 tag to use when determining a server's name.
+	NAME_TAG = EnvDefault("LANES_NAME_TAG", "Name")
 )
 
 type Config struct {

server.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"sort"
-	"strings"
 	"time"
 
 	"github.com/apcera/termtables"
@@ -92,7 +91,7 @@ func FetchServersInLane(svc *ec2.EC2, lane string) ([]*Server, error) {
 		input = &ec2.DescribeInstancesInput{
 			Filters: []*ec2.Filter{{
 				Name:   aws.String("tag-key"),
-				Values: []*string{aws.String("Lane")},
+				Values: []*string{aws.String(LANE_TAG)},
 			}, {
 				Name:   aws.String("tag-value"),
 				Values: []*string{aws.String(lane)},
@@ -132,10 +131,10 @@ func FetchServersBy(svc *ec2.EC2, input *ec2.DescribeInstancesInput) (servers []
 					continue
 				}
 
-				switch strings.ToLower(*tag.Key) {
-				case "name":
+				switch *tag.Key {
+				case NAME_TAG:
 					svr.Name = *tag.Value
-				case "lane":
+				case LANE_TAG:
 					svr.Lane = *tag.Value
 				}
 			}