From 1da7d66fd147328815b96a401f9ccae767ca3af0 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 15 Jul 2017 13:49:17 -0700 Subject: [PATCH] fixed swallowed errors under pkg subdirectory. --- pkg/instancegroups/instancegroups.go | 3 +++ pkg/resources/aws.go | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go index f091758f33..803be40137 100644 --- a/pkg/instancegroups/instancegroups.go +++ b/pkg/instancegroups/instancegroups.go @@ -103,6 +103,9 @@ type DeleteInstanceGroup struct { func (c *DeleteInstanceGroup) DeleteInstanceGroup(group *api.InstanceGroup) error { groups, err := FindCloudInstanceGroups(c.Cloud, c.Cluster, []*api.InstanceGroup{group}, false, nil) + if err != nil { + return fmt.Errorf("error finding CloudInstanceGroups: %v", err) + } cig := groups[group.ObjectMeta.Name] if cig == nil { glog.Warningf("AutoScalingGroup %q not found in cloud - skipping delete", group.ObjectMeta.Name) diff --git a/pkg/resources/aws.go b/pkg/resources/aws.go index 2da5fa787d..94bc9f4442 100644 --- a/pkg/resources/aws.go +++ b/pkg/resources/aws.go @@ -891,7 +891,9 @@ func ListSubnets(cloud fi.Cloud, clusterName string) ([]*ResourceTracker, error) rtRequest := &ec2.DescribeRouteTablesInput{} rtResponse, err := c.EC2().DescribeRouteTables(rtRequest) - + if err != nil { + return nil, fmt.Errorf("error describing RouteTables: %v", err) + } // sharedNgwIds is the set of IDs for shared NGWs, that we should not delete sharedNgwIds := sets.NewString() {