Skip to content

Commit f394d45

Browse files
committed
fetch resourcegroups via armclient
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 2ea1b29 commit f394d45

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

auditor/auditor.resourcegroups.go

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package auditor
33
import (
44
"context"
55

6-
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
76
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
87

98
"github.com/webdevops/azure-auditor/auditor/validator"
@@ -36,31 +35,23 @@ func (auditor *AzureAuditor) auditResourceGroups(ctx context.Context, logger *lo
3635
}
3736

3837
func (auditor *AzureAuditor) fetchResourceGroups(ctx context.Context, logger *log.Entry, subscription *armsubscriptions.Subscription) (list []*validator.AzureObject) {
39-
client, err := armresources.NewResourceGroupsClient(*subscription.SubscriptionID, auditor.azure.client.GetCred(), nil)
38+
resourceGroupList, err := auditor.azure.client.ListResourceGroups(ctx, *subscription.SubscriptionID)
4039
if err != nil {
4140
logger.Panic(err)
4241
}
4342

44-
pager := client.NewListPager(nil)
45-
for pager.More() {
46-
result, err := pager.NextPage(ctx)
47-
if err != nil {
48-
logger.Panic(err)
49-
}
50-
51-
for _, resourceGroup := range result.ResourceGroupListResult.Value {
52-
obj := map[string]interface{}{
53-
"resource.id": stringPtrToStringLower(resourceGroup.ID),
54-
"subscription.id": to.String(subscription.SubscriptionID),
55-
"subscription.name": to.String(subscription.DisplayName),
43+
for _, resourceGroup := range resourceGroupList {
44+
obj := map[string]interface{}{
45+
"resource.id": stringPtrToStringLower(resourceGroup.ID),
46+
"subscription.id": to.String(subscription.SubscriptionID),
47+
"subscription.name": to.String(subscription.DisplayName),
5648

57-
"resourcegroup.name": stringPtrToStringLower(resourceGroup.Name),
58-
"resourcegroup.location": stringPtrToStringLower(resourceGroup.Location),
59-
"resourcegroup.tag": azureTagsToAzureObjectField(resourceGroup.Tags),
60-
}
61-
62-
list = append(list, validator.NewAzureObject(obj))
49+
"resourcegroup.name": stringPtrToStringLower(resourceGroup.Name),
50+
"resourcegroup.location": stringPtrToStringLower(resourceGroup.Location),
51+
"resourcegroup.tag": azureTagsToAzureObjectField(resourceGroup.Tags),
6352
}
53+
54+
list = append(list, validator.NewAzureObject(obj))
6455
}
6556

6657
auditor.enrichAzureObjects(ctx, subscription, &list)

0 commit comments

Comments
 (0)