Skip to content

Commit 95d5375

Browse files
Charel Baum (external expert on behalf of DB Netz AG)Parry Kai, SUB-SDC-NL-DOS-TDE
authored andcommitted
fix(route53): hostedzone tags related api calls
Signed-off-by: Charel Baum (external expert on behalf of DB Netz AG) <charel.baum-extern@deutschebahn.com>
1 parent 3d08fef commit 95d5375

1 file changed

Lines changed: 16 additions & 7 deletions

File tree

‎pkg/controller/route53/hostedzone/controller.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (e *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
133133
}
134134

135135
resTags, err := e.client.ListTagsForResource(ctx, &route53.ListTagsForResourceInput{
136-
ResourceId: hostedZoneID,
136+
ResourceId: aws.String(meta.GetExternalName(cr)), // id w/o prefix
137137
ResourceType: route53types.TagResourceTypeHostedzone,
138138
})
139139
if err != nil {
@@ -192,12 +192,21 @@ func (e *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
192192

193193
// Update tags if necessary
194194
if len(e.tagsToAdd) > 0 || len(e.tagsToRemove) > 0 {
195-
_, err := e.client.ChangeTagsForResource(ctx, &route53.ChangeTagsForResourceInput{
196-
ResourceId: &hostedZoneID,
197-
ResourceType: route53types.TagResourceTypeHostedzone,
198-
AddTags: e.tagsToAdd,
199-
RemoveTagKeys: e.tagsToRemove,
200-
})
195+
196+
changeTagsInput := &route53.ChangeTagsForResourceInput{
197+
ResourceId: aws.String(meta.GetExternalName(cr)), // id w/o prefix
198+
ResourceType: route53types.TagResourceTypeHostedzone,
199+
}
200+
201+
// AWS throws error when provided AddTags or RemoveTagKeys are empty lists
202+
if len(e.tagsToAdd) > 0 {
203+
changeTagsInput.AddTags = e.tagsToAdd
204+
}
205+
if len(e.tagsToRemove) > 0 {
206+
changeTagsInput.RemoveTagKeys = e.tagsToRemove
207+
}
208+
209+
_, err := e.client.ChangeTagsForResource(ctx, changeTagsInput)
201210
if err != nil {
202211
return managed.ExternalUpdate{}, awsclient.Wrap(err, errUpdateTags)
203212
}

0 commit comments

Comments
 (0)