implement azureclient from go-common

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

Author: mblaschke

go.mod

@@ -3,23 +3,23 @@ module github.com/webdevops/azure-resourcegraph-exporter
 go 1.18
 
 require (
-github.com/Azure/azure-sdk-for-go v63.3.0+incompatible
-github.com/Azure/go-autorest/autorest v0.11.26
-github.com/Azure/go-autorest/autorest/azure/auth v0.5.11
+github.com/Azure/azure-sdk-for-go v64.1.0+incompatible
+github.com/Azure/go-autorest/autorest/to v0.4.0
 github.com/google/uuid v1.3.0
 github.com/jessevdk/go-flags v1.5.0
 github.com/patrickmn/go-cache v2.1.0+incompatible
-github.com/prometheus/client_golang v1.12.1
+github.com/prometheus/client_golang v1.12.2
 github.com/sirupsen/logrus v1.8.1
-github.com/webdevops/go-common v0.0.0-20220410190409-7b8e84fab0bf
+github.com/webdevops/go-common v0.0.0-20220522185207-16fd48b07ed7
 )
 
 require (
 github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
+github.com/Azure/go-autorest/autorest v0.11.27 // indirect
+github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
+github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
 github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
 github.com/Azure/go-autorest/logger v0.2.1 // indirect
 github.com/Azure/go-autorest/tracing v0.6.0 // indirect
@@ -33,8 +33,9 @@ require (
 github.com/prometheus/client_model v0.2.0 // indirect
 github.com/prometheus/common v0.34.0 // indirect
 github.com/prometheus/procfs v0.7.3 // indirect
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+github.com/remeh/sizedwaitgroup v1.0.0 // indirect
+golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 google.golang.org/protobuf v1.28.0 // indirect
 gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -31,15 +31,16 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-sdk-for-go v63.3.0+incompatible h1:INepVujzUrmArRZjDLHbtER+FkvCoEwyRCXGqOlmDII=
-github.com/Azure/azure-sdk-for-go v63.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v64.1.0+incompatible h1:FpsZmWR9FfEr9hP6K9S7RP0EkSFgGd6P1F2scHtbhnU=
+github.com/Azure/azure-sdk-for-go v64.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc=
-github.com/Azure/go-autorest/autorest v0.11.26 h1:W/MzvoAiFfL5h4nq81wm7axvITgbnOoifXXGkFrgF1g=
-github.com/Azure/go-autorest/autorest v0.11.26/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
-github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ=
+github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=
+github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U=
 github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
+github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg=
+github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA=
 github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg=
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 h1:0W/yGmFdTIT77fvdlGZ0LMISoLHFJ7Tx4U0yeB+uFs4=
@@ -203,8 +204,9 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
+github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -222,6 +224,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E=
+github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -234,8 +238,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/webdevops/go-common v0.0.0-20220410190409-7b8e84fab0bf h1:BRQKngpSxlV193KCrstZrbNOuS1PVfv5W43UjbapphI=
-github.com/webdevops/go-common v0.0.0-20220410190409-7b8e84fab0bf/go.mod h1:StsDbNavo/7SyvTBMzsqaiTy0rK3wIF1dSJk5vqOaws=
+github.com/webdevops/go-common v0.0.0-20220522185207-16fd48b07ed7 h1:9v7kCgTcLcRFMRcQIDCoQZdZplwSJFe/XKxQdJv9gfA=
+github.com/webdevops/go-common v0.0.0-20220522185207-16fd48b07ed7/go.mod h1:StsDbNavo/7SyvTBMzsqaiTy0rK3wIF1dSJk5vqOaws=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -252,8 +256,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0=
+golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -373,8 +377,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

main.go

@@ -10,15 +10,12 @@ import (
 "strings"
 "time"
 
-"github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/subscriptions"
-"github.com/Azure/go-autorest/autorest"
-"github.com/Azure/go-autorest/autorest/azure"
-"github.com/Azure/go-autorest/autorest/azure/auth"
 "github.com/google/uuid"
 "github.com/jessevdk/go-flags"
 cache "github.com/patrickmn/go-cache"
 "github.com/prometheus/client_golang/prometheus/promhttp"
 log "github.com/sirupsen/logrus"
+azureCommon "github.com/webdevops/go-common/azure"
 "github.com/webdevops/go-common/prometheus/azuretracing"
 "github.com/webdevops/go-common/prometheus/kusto"
 
@@ -37,9 +34,7 @@ var (
 
 Config kusto.Config
 
-AzureAuthorizer autorest.Authorizer
-AzureSubscriptions []subscriptions.Subscription
-AzureEnvironment azure.Environment
+AzureClient *azureCommon.Client
 
 metricCache *cache.Cache
 
@@ -126,20 +121,14 @@ func readConfig() {
 }
 }
 
-// Init and build Azure authorzier
 func initAzureConnection() {
 var err error
-
-// setup azure authorizer
-AzureAuthorizer, err = auth.NewAuthorizerFromEnvironment()
+AzureClient, err = azureCommon.NewClientFromEnvironment(*opts.Azure.Environment, log.StandardLogger())
 if err != nil {
-log.Panic(err)
+log.Panic(err.Error())
 }
 
-AzureEnvironment, err = azure.EnvironmentFromName(*opts.Azure.Environment)
-if err != nil {
-log.Panic(err)
-}
+AzureClient.SetUserAgent(UserAgent + gitTag)
 }
 
 // start and handle prometheus handler
@@ -151,6 +140,13 @@ func startHttpServer() {
 }
 })
 
+// readyz
+http.HandleFunc("/readyz", func(w http.ResponseWriter, r *http.Request) {
+if _, err := fmt.Fprint(w, "Ok"); err != nil {
+log.Error(err)
+}
+})
+
 // report
 reportTmpl := template.Must(template.ParseFiles("./templates/query.html"))
 http.HandleFunc("/query", func(w http.ResponseWriter, r *http.Request) {
@@ -185,11 +181,3 @@ func startHttpServer() {
 
 log.Fatal(http.ListenAndServe(opts.ServerBind, nil))
 }
-
-func decorateAzureAutoRest(client *autorest.Client) {
-client.Authorizer = AzureAuthorizer
-if err := client.AddToUserAgent(UserAgent + gitTag); err != nil {
-log.Panic(err)
-}
-azuretracing.DecorateAzureAutoRestClient(client)
-}

probe.go

@@ -7,14 +7,15 @@ import (
 "time"
 
 resourcegraph "github.com/Azure/azure-sdk-for-go/services/resourcegraph/mgmt/2019-04-01/resourcegraph"
+"github.com/Azure/go-autorest/autorest/to"
 "github.com/prometheus/client_golang/prometheus"
 "github.com/prometheus/client_golang/prometheus/promhttp"
 log "github.com/sirupsen/logrus"
 "github.com/webdevops/go-common/prometheus/kusto"
 )
 
 const (
-RESOURCEGRAPH_QUERY_OPTIONS_TOP = 1000
+ResourceGraphQueryOptionsTop = 1000
 )
 
 func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
@@ -43,13 +44,17 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 ctx := context.Background()
 
 defaultSubscriptions := []string{}
-for _, subscription := range AzureSubscriptions {
-defaultSubscriptions = append(defaultSubscriptions, *subscription.SubscriptionID)
+if subscriptionList, err := AzureClient.ListCachedSubscriptionsWithFilter(ctx, opts.Azure.Subscription...); err == nil {
+for _, subscription := range subscriptionList {
+defaultSubscriptions = append(defaultSubscriptions, to.String(subscription.SubscriptionID))
+}
+} else {
+probeLogger.Panic(err)
 }
 
 // Create and authorize a ResourceGraph client
-resourcegraphClient := resourcegraph.NewWithBaseURI(AzureEnvironment.ResourceManagerEndpoint)
-decorateAzureAutoRest(&resourcegraphClient.Client)
+resourceGraphClient := resourcegraph.NewWithBaseURI(AzureClient.Environment.ResourceManagerEndpoint)
+AzureClient.DecorateAzureAutorest(&resourceGraphClient.Client)
 
 metricList := kusto.MetricList{}
 metricList.Init()
@@ -86,7 +91,7 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 queryConfig.Subscriptions = &defaultSubscriptions
 }
 
-requestQueryTop := int32(RESOURCEGRAPH_QUERY_OPTIONS_TOP)
+requestQueryTop := int32(ResourceGraphQueryOptionsTop)
 requestQuerySkip := int32(0)
 
 // Set options
@@ -108,7 +113,7 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 
 prometheusQueryRequests.With(prometheus.Labels{"module": moduleName, "metric": queryConfig.Metric}).Inc()
 
-var results, queryErr = resourcegraphClient.Resources(ctx, Request)
+var results, queryErr = resourceGraphClient.Resources(ctx, Request)
 if results.TotalRecords != nil {
 resultTotalRecords = int32(*results.TotalRecords)
 }