From db11e113d9e1edc6323afcc6876ffa1e2e5aca03 Mon Sep 17 00:00:00 2001 From: Kris Childress Date: Tue, 6 Dec 2016 23:49:08 -0700 Subject: [PATCH] Adding sanity check for natgateways --- upup/pkg/fi/cloudup/awstasks/natgateway.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upup/pkg/fi/cloudup/awstasks/natgateway.go b/upup/pkg/fi/cloudup/awstasks/natgateway.go index d1e0809870..fa809b74d2 100644 --- a/upup/pkg/fi/cloudup/awstasks/natgateway.go +++ b/upup/pkg/fi/cloudup/awstasks/natgateway.go @@ -48,6 +48,9 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) { if id == nil && e.Subnet != nil { var filters []*ec2.Filter filters = append(filters, awsup.NewEC2Filter("key", "AssociatedNatgateway")) + if e.Subnet.ID == nil { + return nil, nil + } filters = append(filters, awsup.NewEC2Filter("resource-id", *e.Subnet.ID)) request := &ec2.DescribeTagsInput{