update go-common

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

auditor/auditor.azure.go

@@ -14,38 +14,15 @@ func (auditor *AzureAuditor) getSubscriptionList(ctx context.Context) (list map[
 	auditor.locks.subscriptions.Lock()
 	defer auditor.locks.subscriptions.Unlock()
 
-	list = map[string]subscriptions.Subscription{}
-
 	if val, ok := auditor.cache.Get("subscriptions"); ok {
 		// fetched from cache
 		list = val.(map[string]subscriptions.Subscription)
 		return
 	}
 
-	client := subscriptions.NewClientWithBaseURI(auditor.azure.client.Environment.ResourceManagerEndpoint)
-	auditor.decorateAzureClient(&client.Client, auditor.azure.client.GetAuthorizer())
-
-	if len(auditor.Opts.Azure.Subscription) == 0 {
-		result, err := client.ListComplete(ctx)
-		if err != nil {
-			auditor.logger.Panic(err)
-		}
-
-		for result.NotDone() {
-			subscription := result.Value()
-			list[to.String(subscription.SubscriptionID)] = subscription
-			if result.NextWithContext(ctx) != nil {
-				break
-			}
-		}
-	} else {
-		for _, subId := range auditor.Opts.Azure.Subscription {
-			result, err := client.Get(ctx, subId)
-			if err != nil {
-				auditor.logger.Panic(err)
-			}
-			list[to.String(result.SubscriptionID)] = result
-		}
+	list, err := auditor.azure.client.ListSubscriptions(ctx)
+	if err != nil {
+		auditor.logger.Panic(err)
 	}
 
 	auditor.logger.Infof("found %v Azure Subscriptions (cache update)", len(list))

auditor/auditor.go

@@ -354,6 +354,7 @@ func (auditor *AzureAuditor) initAzure() {
 		auditor.logger.Panic(err)
 	}
 	auditor.azure.client.SetUserAgent(auditor.UserAgent)
+	auditor.azure.client.SetSubscriptionFilter(auditor.Opts.Azure.Subscription...)
 }
 
 func (auditor *AzureAuditor) initMsGraph() {

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
-	github.com/webdevops/go-common v0.0.0-20220601204543-8cd933661a41
+	github.com/webdevops/go-common v0.0.0-20220616112601-a22e7e1a99bb
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -312,6 +312,8 @@ github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/webdevops/go-common v0.0.0-20220601204543-8cd933661a41 h1:FmyeqHcY/zhPSF9eEW3HpD3Ls/BKfCTs6cPFZcYWeYw=
 github.com/webdevops/go-common v0.0.0-20220601204543-8cd933661a41/go.mod h1:8dTX+tlTqPcn+7WQpytFK1HSkSEq6+YfVwjbHiJlNBI=
+github.com/webdevops/go-common v0.0.0-20220616112601-a22e7e1a99bb h1:hGh+sXh0zSojcPB2dtS98jPOpUOzrt/NtPmOEL3NEyQ=
+github.com/webdevops/go-common v0.0.0-20220616112601-a22e7e1a99bb/go.mod h1:8dTX+tlTqPcn+7WQpytFK1HSkSEq6+YfVwjbHiJlNBI=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=