Skip to content

Commit 8ae3e3c

Browse files
fixed the filter error
1 parent 69a5d42 commit 8ae3e3c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

pkg/aws/cloud.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud,
118118
return nil, errors.Wrap(err, "failed to get VPC ID")
119119
}
120120
cfg.VpcID = vpcID
121-
122121
return &defaultCloud{
123122
cfg: cfg,
124123
ec2: ec2Service,
@@ -137,7 +136,7 @@ func getVpcID(cfg CloudConfig, ec2Service services.EC2, metadata services.EC2Met
137136
}
138137

139138
if cfg.VpcTags != nil {
140-
return inferVPCIDFromTags(ec2Service, cfg.VpcTags[cfg.VpcNameTagKey])
139+
return inferVPCIDFromTags(ec2Service, cfg.VpcNameTagKey, cfg.VpcTags[cfg.VpcNameTagKey])
141140
}
142141

143142
return inferVPCID(metadata, ec2Service)
@@ -179,14 +178,12 @@ func inferVPCID(metadata services.EC2Metadata, ec2Service services.EC2) (string,
179178
return "", amerrors.NewAggregate(errList)
180179
}
181180

182-
func inferVPCIDFromTags(ec2Service services.EC2, vpcNameTagKey string) (string, error) {
181+
func inferVPCIDFromTags(ec2Service services.EC2, VpcNameTagKey string, VpcNameTagValue string) (string, error) {
183182
vpcs, err := ec2Service.DescribeVPCsAsList(context.Background(), &ec2.DescribeVpcsInput{
184183
Filters: []*ec2.Filter{
185184
{
186-
Name: &vpcNameTagKey,
187-
//Values: []*string{
188-
// aws.String("owned"),
189-
//},
185+
Name: aws.String("tag:" + VpcNameTagKey),
186+
Values: []*string{aws.String(VpcNameTagValue)},
190187
},
191188
},
192189
})

0 commit comments

Comments
 (0)