Skip to content

Commit 147e2e5

Browse files
committed
fix missing tag setting when resource cannot be fetched in tag manager
Signed-off-by: Markus Blaschke <[email protected]>
1 parent ca64c89 commit 147e2e5

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

azuresdk/armclient/client.tags.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,21 @@ func (tagmgr *ArmClientTagManager) GetResourceTag(ctx context.Context, resourceI
7373

7474
ret := make([]ResourceTagResult, len(config.Tags))
7575

76-
resourceID = strings.ToLower(resourceID)
76+
// prefill tag config, this should not be empty in case of error
77+
i := -1
78+
for _, tagConfig := range config.Tags {
79+
i++
7780

81+
// default
82+
ret[i] = ResourceTagResult{
83+
TagName: tagConfig.Name,
84+
TagValue: "",
85+
TargetName: tagConfig.TargetName,
86+
}
87+
}
88+
89+
// parse resource id
90+
resourceID = strings.ToLower(resourceID)
7891
resourceInfo, err := ParseResourceId(resourceID)
7992
if err != nil {
8093
return ret, err
@@ -150,7 +163,7 @@ func (tagmgr *ArmClientTagManager) GetResourceTag(ctx context.Context, resourceI
150163
return tagValue, nil
151164
}
152165

153-
i := -1
166+
i = -1
154167
for _, tagConfig := range config.Tags {
155168
i++
156169

@@ -383,7 +396,6 @@ func (c *ResourceTagManager) AddResourceTagsToPrometheusLabels(ctx context.Conte
383396
resourceTags, err := c.client.TagManager.GetResourceTag(ctx, resourceID, c)
384397
if err != nil {
385398
c.client.TagManager.logger.Warnf(`unable to fetch resource tags for resource "%s": %v`, resourceID, err.Error())
386-
return labels
387399
}
388400

389401
for _, tag := range resourceTags {

0 commit comments

Comments
 (0)