From 3d6e2860fecfe6041c4d2dea83e8cf2bc3463801 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 18 Oct 2016 01:36:35 -0400 Subject: [PATCH] Tolerate empty LaunchConfigurationName Ass seen in issue #589, sometimes an AutoScalingGroup will not have a LaunchConfigurationName. This should not be possible, AFAICT, but we can still recover from it - we will simply try to set the correct LaunchConfiguration. Issue #589 --- upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go index 8be69e6f3d..9ee8fff53f 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go @@ -59,7 +59,7 @@ func findAutoscalingGroup(cloud awsup.AWSCloud, name string) (*autoscaling.Group if aws.StringValue(g.AutoScalingGroupName) == name { found = append(found, g) } else { - glog.Warningf("Got ASG with unexpected name") + glog.Warningf("Got ASG with unexpected name %q", aws.StringValue(g.AutoScalingGroupName)) } } @@ -111,10 +111,11 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) { } } - if g.LaunchConfigurationName == nil { - return nil, fmt.Errorf("autoscaling Group %q had no LaunchConfiguration", *actual.Name) + if fi.StringValue(g.LaunchConfigurationName) == "" { + glog.Warningf("autoscaling Group %q had no LaunchConfiguration", fi.StringValue(g.AutoScalingGroupName)) + } else { + actual.LaunchConfiguration = &LaunchConfiguration{ID: g.LaunchConfigurationName} } - actual.LaunchConfiguration = &LaunchConfiguration{ID: g.LaunchConfigurationName} if subnetSlicesEqualIgnoreOrder(actual.Subnets, e.Subnets) { actual.Subnets = e.Subnets