Strip single-quotes around regex for AWS

It looks like GCE ignores them; we can't
duda · Mar 4, 2015 · 3012724 · 3012724
1 parent ce90836
commit 3012724
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go
@@ -21,13 +21,16 @@ import (
 	"io"
 	"net"
 	"regexp"
+	"strings"
 
 	"code.google.com/p/gcfg"
 	"github.com/mitchellh/goamz/aws"
 	"github.com/mitchellh/goamz/ec2"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
+
+	"github.com/golang/glog"
 )
 
 type EC2 interface {
@@ -177,6 +180,11 @@ func (aws *AWSCloud) getInstancesByRegex(regex string) ([]string, error) {
 		return []string{}, fmt.Errorf("no InstanceResp returned")
 	}
 
+	if strings.HasPrefix(regex, "'") && strings.HasSuffix(regex, "'") {
+		glog.Infof("Stripping quotes around regex (%s)", regex)
+		regex = regex[1 : len(regex)-1]
+	}
+
 	re, err := regexp.Compile(regex)
 	if err != nil {
 		return []string{}, err