@@ -3,7 +3,6 @@ package auditor
3
3
import (
4
4
"context"
5
5
6
- "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
7
6
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
8
7
9
8
"github.com/webdevops/azure-auditor/auditor/validator"
@@ -36,31 +35,23 @@ func (auditor *AzureAuditor) auditResourceGroups(ctx context.Context, logger *lo
36
35
}
37
36
38
37
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 )
40
39
if err != nil {
41
40
logger .Panic (err )
42
41
}
43
42
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 ),
56
48
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 ),
63
52
}
53
+
54
+ list = append (list , validator .NewAzureObject (obj ))
64
55
}
65
56
66
57
auditor .enrichAzureObjects (ctx , subscription , & list )
0 commit comments