Skip to content

Commit e141ab7

Browse files
author
Nicholas Thomson
committed
Fixed API error handling
1 parent 2d3dd28 commit e141ab7

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

pkg/resource/subnet/hooks.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ func (rm *resourceManager) customUpdateSubnet(
3737
ko := desired.ko.DeepCopy()
3838
rm.setStatusDefaults(ko)
3939

40-
if err = rm.updateRouteTableAssociations(ctx, desired, latest, delta); err != nil {
41-
return nil, err
40+
if delta.DifferentAt("Spec.RouteTables") {
41+
if err = rm.updateRouteTableAssociations(ctx, desired, latest, delta); err != nil {
42+
return nil, err
43+
}
4244
}
4345

4446
return &resource{ko}, nil
@@ -79,10 +81,6 @@ func (rm *resourceManager) updateRouteTableAssociations(
7981
exit(err)
8082
}(err)
8183

82-
if !delta.DifferentAt("Spec.RouteTables") {
83-
return nil
84-
}
85-
8684
existingRTs, err := rm.getRouteTableAssocations(ctx, latest)
8785
if err != nil {
8886
return err
@@ -196,11 +194,11 @@ func (rm *resourceManager) getRouteTableAssocations(
196194
}
197195

198196
for {
199-
rm.metrics.RecordAPICall("GET", "DescribeRouteTables", err)
200197
resp, err := rm.sdkapi.DescribeRouteTablesWithContext(ctx, input)
201198
if err != nil || resp == nil {
202199
break
203200
}
201+
rm.metrics.RecordAPICall("GET", "DescribeRouteTables", err)
204202
for _, rt := range resp.RouteTables {
205203
var assoc *svcsdk.RouteTableAssociation
206204
// Find the association for the current subnet

0 commit comments

Comments
 (0)