kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudmock: update to support tag-key query on securitygroup

This commit is contained in:
Justin Santa Barbara 2018-03-25 01:11:31 -04:00
parent 32ec8d8253
commit 8250cf0571
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudmock/aws/mockec2/securitygroups.go
View File

@ -18,7 +18,6 @@ package mockec2
import ( import (
"fmt" "fmt"
"strings"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/request"
@ -146,11 +145,7 @@ func (m *MockEC2) DescribeSecurityGroups(request *ec2.DescribeSecurityGroupsInpu
} }
default: default:
if strings.HasPrefix(*filter.Name, "tag:") {
match = m.hasTag(ec2.ResourceTypeSecurityGroup, *sg.GroupId, filter) match = m.hasTag(ec2.ResourceTypeSecurityGroup, *sg.GroupId, filter)
} else {
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
}
} }
if !match { if !match {

2
pkg/resources/aws/securitygroup.go
View File

@ -133,7 +133,7 @@ func DescribeSecurityGroups(cloud fi.Cloud, clusterName string) (map[string]*ec2
} }
response, err := c.EC2().DescribeSecurityGroups(request) response, err := c.EC2().DescribeSecurityGroups(request)
if err != nil { if err != nil {
return nil, fmt.Errorf("error listing VPCs: %v", err) return nil, fmt.Errorf("error listing SecurityGroups: %v", err)
} }
for _, group := range response.SecurityGroups { for _, group := range response.SecurityGroups {