From 67d80bcecb540f8515cfbb9745a3434520cbd78b Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 28 Jan 2017 14:23:53 -0500 Subject: [PATCH] SecurityGroupRule: Avoid spurious warnings when SourceGroup not found We were warning on a Find operation, which just isn't right - we can just skip the find. --- upup/pkg/fi/cloudup/awstasks/securitygroup.go | 6 ++++++ upup/pkg/fi/cloudup/awstasks/securitygrouprule.go | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/upup/pkg/fi/cloudup/awstasks/securitygroup.go b/upup/pkg/fi/cloudup/awstasks/securitygroup.go index c528b7b2b5..aa2fb2a6ea 100644 --- a/upup/pkg/fi/cloudup/awstasks/securitygroup.go +++ b/upup/pkg/fi/cloudup/awstasks/securitygroup.go @@ -336,6 +336,12 @@ func (e *SecurityGroup) FindDeletions(c *fi.Context) ([]fi.Deletion, error) { if !ok { continue } + + if er.SourceGroup != nil && er.SourceGroup.ID == nil { + glog.V(4).Infof("Deletion skipping find of SecurityGroupRule %s, because SourceGroup was not found", fi.StringValue(er.Name)) + return nil, nil + } + if er.matches(permission) { found = true } diff --git a/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go b/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go index b9f25fff0e..2e36a15d91 100644 --- a/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go +++ b/upup/pkg/fi/cloudup/awstasks/securitygrouprule.go @@ -53,6 +53,11 @@ func (e *SecurityGroupRule) Find(c *fi.Context) (*SecurityGroupRule, error) { return nil, nil } + if e.SourceGroup != nil && e.SourceGroup.ID == nil { + glog.V(4).Infof("Skipping find of SecurityGroupRule %s, because SourceGroup was not found", fi.StringValue(e.Name)) + return nil, nil + } + request := &ec2.DescribeSecurityGroupsInput{ Filters: []*ec2.Filter{ awsup.NewEC2Filter("group-id", *e.SecurityGroup.ID),