@@ -121,12 +121,18 @@ func NewCurrentTargetGroup(o *NewCurrentTargetGroupOptions) (*TargetGroup, error
121121 return nil , fmt .Errorf ("The Target Group %s does not have the proper tags, can't import: %s" , * o .TargetGroup .TargetGroupArn , err .Error ())
122122 }
123123
124+ attrs , err := albelbv2 .ELBV2svc .DescribeTargetGroupAttributesFiltered (o .TargetGroup .TargetGroupArn )
125+ if err != nil {
126+ return nil , fmt .Errorf ("Failed to retrieve attributes for Target Group. Error: %s" , err .Error ())
127+ }
128+
124129 return & TargetGroup {
125- ID : id ,
126- SvcName : svcName ,
127- logger : o .Logger ,
128- tags : tags {current : tgTags },
129- tg : tg {current : o .TargetGroup },
130+ ID : id ,
131+ SvcName : svcName ,
132+ logger : o .Logger ,
133+ attributes : attributes {current : attrs },
134+ tags : tags {current : tgTags },
135+ tg : tg {current : o .TargetGroup },
130136 }, nil
131137}
132138
@@ -234,7 +240,8 @@ func (t *TargetGroup) create(rOpts *ReconcileOptions) error {
234240func (t * TargetGroup ) modify (mods tgChange , rOpts * ReconcileOptions ) error {
235241 desired := t .tg .desired
236242 if mods & paramsModified != 0 {
237- in := & elbv2.ModifyTargetGroupInput {
243+ t .logger .Infof ("Modifying target group parameters." )
244+ o , err := albelbv2 .ELBV2svc .ModifyTargetGroup (& elbv2.ModifyTargetGroupInput {
238245 HealthCheckIntervalSeconds : desired .HealthCheckIntervalSeconds ,
239246 HealthCheckPath : desired .HealthCheckPath ,
240247 HealthCheckPort : desired .HealthCheckPort ,
@@ -244,13 +251,11 @@ func (t *TargetGroup) modify(mods tgChange, rOpts *ReconcileOptions) error {
244251 Matcher : desired .Matcher ,
245252 TargetGroupArn : t .CurrentARN (),
246253 UnhealthyThresholdCount : desired .UnhealthyThresholdCount ,
247- }
248- o , err := albelbv2 .ELBV2svc .ModifyTargetGroup (in )
254+ })
249255 if err != nil {
250256 rOpts .Eventf (api .EventTypeWarning , "ERROR" , "Error modifying target group %s: %s" , t .ID , err .Error ())
251- t . logger . Errorf ("Failed TargetGroup modification. ARN: %s | Error: %s. " ,
257+ return fmt . Errorf ("Failed TargetGroup modification. ARN: %s | Error: %s" ,
252258 * t .CurrentARN (), err .Error ())
253- return err
254259 }
255260 t .tg .current = o .TargetGroups [0 ]
256261 // AmazonAPI doesn't return an empty HealthCheckPath.
@@ -259,46 +264,45 @@ func (t *TargetGroup) modify(mods tgChange, rOpts *ReconcileOptions) error {
259264
260265 // check/change tags
261266 if mods & tagsModified != 0 {
267+ t .logger .Infof ("Modifying target group tags." )
262268 if err := albelbv2 .ELBV2svc .UpdateTags (t .CurrentARN (), t .tags .current , t .tags .desired ); err != nil {
263269 rOpts .Eventf (api .EventTypeWarning , "ERROR" , "Error changing tags on target group %s: %s" , t .ID , err .Error ())
264- t . logger . Errorf ("Failed TargetGroup modification. Unable to modify tags. ARN: %s | Error: %s. " ,
270+ return fmt . Errorf ("Failed TargetGroup modification. Unable to modify tags. ARN: %s | Error: %s" ,
265271 * t .CurrentARN (), err .Error ())
266- return err
267272 }
268273 t .tags .current = t .tags .desired
269274 }
270275
271276 if mods & targetsModified != 0 {
277+ t .logger .Infof ("Modifying target group targets." )
272278 additions := util .Difference (t .targets .desired , t .targets .current )
273279 removals := util .Difference (t .targets .current , t .targets .desired )
274280
275281 // check/change targets
276282 if len (additions ) > 0 {
277283 if err := t .registerTargets (additions , rOpts ); err != nil {
278284 rOpts .Eventf (api .EventTypeWarning , "ERROR" , "Error adding targets to target group %s: %s" , t .ID , err .Error ())
279- t .logger .Infof ("Failed TargetGroup modification. Unable to add targets: %s." , err .Error ())
280- return err
285+ return fmt .Errorf ("Failed TargetGroup modification. Unable to add targets: %s" , err .Error ())
281286 }
282287 }
283288 if len (removals ) > 0 {
284289 if err := t .deregisterTargets (removals , rOpts ); err != nil {
285290 rOpts .Eventf (api .EventTypeWarning , "ERROR" , "Error removing targets from target group %s: %s" , t .ID , err .Error ())
286- t .logger .Infof ("Failed TargetGroup modification. Unable to remove targets: %s." , err .Error ())
287- return err
291+ return fmt .Errorf ("Failed TargetGroup modification. Unable to remove targets: %s" , err .Error ())
288292 }
289293 }
290294 t .targets .current = t .targets .desired
291295 }
292296
293297 if mods & attributesModified != 0 {
298+ t .logger .Infof ("Modifying target group attributes." )
294299 aOpts := & elbv2.ModifyTargetGroupAttributesInput {
295300 Attributes : t .attributes .desired ,
296301 TargetGroupArn : t .CurrentARN (),
297302 }
298303 if _ , err := albelbv2 .ELBV2svc .ModifyTargetGroupAttributes (aOpts ); err != nil {
299304 rOpts .Eventf (api .EventTypeWarning , "ERROR" , "Error modifying attributes in target group %s: %s" , t .ID , err .Error ())
300- t .logger .Infof ("Failed TargetGroup modification. Unable to change attributes: %s." , err .Error ())
301- return err
305+ return fmt .Errorf ("Failed TargetGroup modification. Unable to change attributes: %s" , err .Error ())
302306 }
303307 t .attributes .current = t .attributes .desired
304308 }
@@ -367,15 +371,12 @@ func (t *TargetGroup) needsModification() tgChange {
367371 changes |= tagsModified
368372 }
369373
370- if ! reflect .DeepEqual (t .attributes .current .Sorted (), t .attributes .desired .Sorted ()) {
374+ if ! reflect .DeepEqual (t .attributes .current .Filtered (). Sorted (), t .attributes .desired . Filtered () .Sorted ()) {
371375 t .logger .Debugf ("Attributes need to be changed" )
372376 changes |= attributesModified
373377 }
374378
375379 return changes
376- // These fields require a rebuild and are enforced via TG name hash
377- // Port *int64 `min:"1" type:"integer"`
378- // Protocol *string `type:"string" enum:"ProtocolEnum"`
379380}
380381
381382// Registers Targets (ec2 instances) to TargetGroup, must be called when Current != Desired
0 commit comments